From 52e65e208e2bd7b0a55e4c7e5fa73f607934b572 Mon Sep 17 00:00:00 2001 From: agilbert1412 Date: Fri, 15 Mar 2024 15:05:14 +0300 Subject: [PATCH 01/22] Stardew Valley: 5.x.x - The Allsanity Update (#2764) Major Content update for Stardew Valley, including the following features - Major performance improvements all across the Stardew Valley apworld, including a significant reduction in the test time - Randomized Farm Type - Bundles rework (Remixed Bundles and Missing Bundle!) - New Settings: * Shipsanity - Shipping individual items * Monstersanity - Slaying monsters * Cooksanity - Cooking individual recipes * Chefsanity - Learning individual recipes * Craftsanity - Crafting individual items - New Goals: * Protector of the Valley - Complete every monster slayer goal * Full Shipment - Ship every item * Craftmaster - Craft every item * Gourmet Chef - Cook every recipe * Legend - Earn 10 000 000g * Mystery of the Stardrops - Find every stardrop (Maguffin Hunt) * Allsanity - Complete every check in your slot - Building Shuffle: Cheaper options - Tool Shuffle: Cheaper options - Money rework - New traps - New isolated checks and items, including the farm cave, the movie theater, etc - Mod Support: SVE [Albrekka] - Mod Support: Distant Lands [Albrekka] - Mod Support: Hat Mouse Lacey [Albrekka] - Mod Support: Boarding House [Albrekka] Co-authored-by: Witchybun Co-authored-by: Witchybun <96719127+Witchybun@users.noreply.github.com> Co-authored-by: Jouramie Co-authored-by: Alchav <59858495+Alchav@users.noreply.github.com> --- worlds/stardew_valley/__init__.py | 286 +- worlds/stardew_valley/bundles.py | 254 - .../{test/checks => bundles}/__init__.py | 0 worlds/stardew_valley/bundles/bundle.py | 163 + worlds/stardew_valley/bundles/bundle_item.py | 73 + worlds/stardew_valley/bundles/bundle_room.py | 24 + worlds/stardew_valley/bundles/bundles.py | 80 + worlds/stardew_valley/data/bundle_data.py | 1184 +++-- worlds/stardew_valley/data/common_data.py | 9 - worlds/stardew_valley/data/craftable_data.py | 313 ++ worlds/stardew_valley/data/crops.csv | 81 +- worlds/stardew_valley/data/crops_data.py | 22 +- worlds/stardew_valley/data/fish_data.py | 221 +- worlds/stardew_valley/data/game_item.py | 13 - worlds/stardew_valley/data/items.csv | 497 +- worlds/stardew_valley/data/locations.csv | 4230 ++++++++++++----- worlds/stardew_valley/data/monster_data.py | 177 +- worlds/stardew_valley/data/museum_data.py | 284 +- worlds/stardew_valley/data/recipe_data.py | 169 +- worlds/stardew_valley/data/recipe_source.py | 149 + .../data/shipsanity_unimplemented_items.csv | 0 worlds/stardew_valley/data/villagers_data.py | 161 +- .../stardew_valley/docs/en_Stardew Valley.md | 111 +- worlds/stardew_valley/docs/setup_en.md | 14 +- worlds/stardew_valley/early_items.py | 65 + worlds/stardew_valley/items.py | 501 +- worlds/stardew_valley/locations.py | 260 +- worlds/stardew_valley/logic.py | 1626 ------- worlds/stardew_valley/logic/__init__.py | 0 worlds/stardew_valley/logic/ability_logic.py | 46 + worlds/stardew_valley/logic/action_logic.py | 40 + worlds/stardew_valley/logic/animal_logic.py | 59 + worlds/stardew_valley/logic/arcade_logic.py | 34 + worlds/stardew_valley/logic/artisan_logic.py | 53 + worlds/stardew_valley/logic/base_logic.py | 50 + worlds/stardew_valley/logic/buff_logic.py | 23 + worlds/stardew_valley/logic/building_logic.py | 95 + worlds/stardew_valley/logic/bundle_logic.py | 66 + worlds/stardew_valley/logic/combat_logic.py | 57 + worlds/stardew_valley/logic/cooking_logic.py | 108 + worlds/stardew_valley/logic/crafting_logic.py | 111 + worlds/stardew_valley/logic/crop_logic.py | 72 + worlds/stardew_valley/logic/farming_logic.py | 41 + worlds/stardew_valley/logic/fishing_logic.py | 100 + worlds/stardew_valley/logic/gift_logic.py | 20 + worlds/stardew_valley/logic/has_logic.py | 34 + worlds/stardew_valley/logic/logic.py | 673 +++ .../logic/logic_and_mods_design.md | 58 + worlds/stardew_valley/logic/mine_logic.py | 86 + worlds/stardew_valley/logic/money_logic.py | 99 + worlds/stardew_valley/logic/monster_logic.py | 69 + worlds/stardew_valley/logic/museum_logic.py | 80 + worlds/stardew_valley/logic/pet_logic.py | 50 + worlds/stardew_valley/logic/quest_logic.py | 128 + worlds/stardew_valley/logic/received_logic.py | 35 + worlds/stardew_valley/logic/region_logic.py | 65 + .../logic/relationship_logic.py | 185 + worlds/stardew_valley/logic/season_logic.py | 44 + worlds/stardew_valley/logic/shipping_logic.py | 60 + worlds/stardew_valley/logic/skill_logic.py | 172 + .../logic/special_order_logic.py | 111 + worlds/stardew_valley/logic/time_logic.py | 38 + worlds/stardew_valley/logic/tool_logic.py | 81 + .../logic/traveling_merchant_logic.py | 26 + worlds/stardew_valley/logic/wallet_logic.py | 19 + worlds/stardew_valley/mods/logic/buildings.py | 16 - .../mods/logic/buildings_logic.py | 28 + worlds/stardew_valley/mods/logic/deepwoods.py | 35 - .../mods/logic/deepwoods_logic.py | 73 + .../mods/logic/elevator_logic.py | 18 + .../stardew_valley/mods/logic/item_logic.py | 289 ++ worlds/stardew_valley/mods/logic/magic.py | 80 - .../stardew_valley/mods/logic/magic_logic.py | 82 + worlds/stardew_valley/mods/logic/mod_logic.py | 21 + .../mods/logic/mod_skills_levels.py | 21 + worlds/stardew_valley/mods/logic/quests.py | 31 - .../stardew_valley/mods/logic/quests_logic.py | 128 + worlds/stardew_valley/mods/logic/skills.py | 94 - .../stardew_valley/mods/logic/skills_logic.py | 110 + .../mods/logic/skullcavernelevator.py | 10 - .../mods/logic/special_orders.py | 24 - .../mods/logic/special_orders_logic.py | 76 + worlds/stardew_valley/mods/logic/sve_logic.py | 55 + worlds/stardew_valley/mods/mod_data.py | 10 +- .../mods/mod_monster_locations.py | 40 + worlds/stardew_valley/mods/mod_regions.py | 242 +- worlds/stardew_valley/options.py | 244 +- worlds/stardew_valley/presets.py | 80 +- worlds/stardew_valley/region_classes.py | 9 + worlds/stardew_valley/regions.py | 410 +- worlds/stardew_valley/requirements.txt | 2 +- worlds/stardew_valley/rules.py | 989 ++-- worlds/stardew_valley/scripts/update_data.py | 10 +- worlds/stardew_valley/stardew_rule.py | 384 -- .../stardew_valley/stardew_rule/__init__.py | 4 + worlds/stardew_valley/stardew_rule/base.py | 448 ++ .../stardew_rule/indirect_connection.py | 39 + worlds/stardew_valley/stardew_rule/literal.py | 62 + .../stardew_valley/stardew_rule/protocol.py | 30 + worlds/stardew_valley/stardew_rule/state.py | 140 + .../strings/animal_product_names.py | 34 +- .../strings/ap_names/ap_weapon_names.py | 7 + .../ap_names/community_upgrade_names.py | 4 + .../strings/ap_names/event_names.py | 6 + .../strings/ap_names/mods/mod_items.py | 50 + .../strings/artisan_good_names.py | 4 + worlds/stardew_valley/strings/bundle_names.py | 80 + .../stardew_valley/strings/craftable_names.py | 183 +- worlds/stardew_valley/strings/crop_names.py | 23 + .../stardew_valley/strings/currency_names.py | 13 + .../strings/decoration_names.py | 2 + .../stardew_valley/strings/entrance_names.py | 142 + .../strings/festival_check_names.py | 5 + worlds/stardew_valley/strings/fish_names.py | 98 +- worlds/stardew_valley/strings/flower_names.py | 6 +- worlds/stardew_valley/strings/food_names.py | 91 +- .../strings/forageable_names.py | 26 + worlds/stardew_valley/strings/gift_names.py | 12 +- worlds/stardew_valley/strings/goal_names.py | 7 + .../strings/ingredient_names.py | 1 + .../stardew_valley/strings/machine_names.py | 13 +- worlds/stardew_valley/strings/metal_names.py | 112 +- .../strings/monster_drop_names.py | 11 + .../stardew_valley/strings/monster_names.py | 67 + .../stardew_valley/strings/quality_names.py | 63 + worlds/stardew_valley/strings/quest_names.py | 17 +- worlds/stardew_valley/strings/region_names.py | 124 + worlds/stardew_valley/strings/season_names.py | 4 +- worlds/stardew_valley/strings/seed_names.py | 38 +- worlds/stardew_valley/strings/skill_names.py | 3 + .../strings/special_order_names.py | 9 +- worlds/stardew_valley/strings/spells.py | 2 +- .../stardew_valley/strings/villager_names.py | 22 +- .../strings/wallet_item_names.py | 5 + worlds/stardew_valley/strings/weapon_names.py | 1 - worlds/stardew_valley/test/TestBundles.py | 29 +- worlds/stardew_valley/test/TestCrops.py | 20 + .../stardew_valley/test/TestDynamicGoals.py | 108 + worlds/stardew_valley/test/TestGeneration.py | 1030 +++- worlds/stardew_valley/test/TestItemLink.py | 4 +- worlds/stardew_valley/test/TestItems.py | 112 +- worlds/stardew_valley/test/TestLogic.py | 90 +- .../test/TestLogicSimplification.py | 57 - .../test/TestMultiplePlayers.py | 92 + worlds/stardew_valley/test/TestOptionFlags.py | 105 + worlds/stardew_valley/test/TestOptions.py | 134 +- .../stardew_valley/test/TestOptionsPairs.py | 56 + worlds/stardew_valley/test/TestPresets.py | 21 + worlds/stardew_valley/test/TestRegions.py | 151 +- worlds/stardew_valley/test/TestRules.py | 671 ++- worlds/stardew_valley/test/TestStardewRule.py | 244 + .../stardew_valley/test/TestStartInventory.py | 41 + worlds/stardew_valley/test/__init__.py | 426 +- .../stardew_valley/test/assertion/__init__.py | 5 + .../test/assertion/goal_assert.py | 55 + .../test/assertion/mod_assert.py | 26 + .../test/assertion/option_assert.py | 96 + .../test/assertion/rule_assert.py | 17 + .../test/assertion/rule_explain.py | 102 + .../test/assertion/world_assert.py | 83 + .../stardew_valley/test/checks/goal_checks.py | 55 - .../test/checks/option_checks.py | 72 - .../test/checks/world_checks.py | 33 - .../stardew_valley/test/long/TestModsLong.py | 84 +- .../test/long/TestOptionsLong.py | 68 +- .../test/long/TestPreRolledRandomness.py | 25 + .../test/long/TestRandomWorlds.py | 74 +- .../stardew_valley/test/long/option_names.py | 28 +- .../test/mods/TestBiggerBackpack.py | 20 +- .../stardew_valley/test/mods/TestModFish.py | 226 + .../test/mods/TestModVillagers.py | 132 + worlds/stardew_valley/test/mods/TestMods.py | 152 +- .../test/performance/TestPerformance.py | 276 ++ .../test/performance/__init__.py | 0 .../test/stability/StabilityOutputScript.py | 32 + .../test/stability/TestStability.py | 52 + .../stardew_valley/test/stability/__init__.py | 0 177 files changed, 17865 insertions(+), 6913 deletions(-) delete mode 100644 worlds/stardew_valley/bundles.py rename worlds/stardew_valley/{test/checks => bundles}/__init__.py (100%) create mode 100644 worlds/stardew_valley/bundles/bundle.py create mode 100644 worlds/stardew_valley/bundles/bundle_item.py create mode 100644 worlds/stardew_valley/bundles/bundle_room.py create mode 100644 worlds/stardew_valley/bundles/bundles.py delete mode 100644 worlds/stardew_valley/data/common_data.py create mode 100644 worlds/stardew_valley/data/craftable_data.py delete mode 100644 worlds/stardew_valley/data/game_item.py create mode 100644 worlds/stardew_valley/data/recipe_source.py create mode 100644 worlds/stardew_valley/data/shipsanity_unimplemented_items.csv create mode 100644 worlds/stardew_valley/early_items.py delete mode 100644 worlds/stardew_valley/logic.py create mode 100644 worlds/stardew_valley/logic/__init__.py create mode 100644 worlds/stardew_valley/logic/ability_logic.py create mode 100644 worlds/stardew_valley/logic/action_logic.py create mode 100644 worlds/stardew_valley/logic/animal_logic.py create mode 100644 worlds/stardew_valley/logic/arcade_logic.py create mode 100644 worlds/stardew_valley/logic/artisan_logic.py create mode 100644 worlds/stardew_valley/logic/base_logic.py create mode 100644 worlds/stardew_valley/logic/buff_logic.py create mode 100644 worlds/stardew_valley/logic/building_logic.py create mode 100644 worlds/stardew_valley/logic/bundle_logic.py create mode 100644 worlds/stardew_valley/logic/combat_logic.py create mode 100644 worlds/stardew_valley/logic/cooking_logic.py create mode 100644 worlds/stardew_valley/logic/crafting_logic.py create mode 100644 worlds/stardew_valley/logic/crop_logic.py create mode 100644 worlds/stardew_valley/logic/farming_logic.py create mode 100644 worlds/stardew_valley/logic/fishing_logic.py create mode 100644 worlds/stardew_valley/logic/gift_logic.py create mode 100644 worlds/stardew_valley/logic/has_logic.py create mode 100644 worlds/stardew_valley/logic/logic.py create mode 100644 worlds/stardew_valley/logic/logic_and_mods_design.md create mode 100644 worlds/stardew_valley/logic/mine_logic.py create mode 100644 worlds/stardew_valley/logic/money_logic.py create mode 100644 worlds/stardew_valley/logic/monster_logic.py create mode 100644 worlds/stardew_valley/logic/museum_logic.py create mode 100644 worlds/stardew_valley/logic/pet_logic.py create mode 100644 worlds/stardew_valley/logic/quest_logic.py create mode 100644 worlds/stardew_valley/logic/received_logic.py create mode 100644 worlds/stardew_valley/logic/region_logic.py create mode 100644 worlds/stardew_valley/logic/relationship_logic.py create mode 100644 worlds/stardew_valley/logic/season_logic.py create mode 100644 worlds/stardew_valley/logic/shipping_logic.py create mode 100644 worlds/stardew_valley/logic/skill_logic.py create mode 100644 worlds/stardew_valley/logic/special_order_logic.py create mode 100644 worlds/stardew_valley/logic/time_logic.py create mode 100644 worlds/stardew_valley/logic/tool_logic.py create mode 100644 worlds/stardew_valley/logic/traveling_merchant_logic.py create mode 100644 worlds/stardew_valley/logic/wallet_logic.py delete mode 100644 worlds/stardew_valley/mods/logic/buildings.py create mode 100644 worlds/stardew_valley/mods/logic/buildings_logic.py delete mode 100644 worlds/stardew_valley/mods/logic/deepwoods.py create mode 100644 worlds/stardew_valley/mods/logic/deepwoods_logic.py create mode 100644 worlds/stardew_valley/mods/logic/elevator_logic.py create mode 100644 worlds/stardew_valley/mods/logic/item_logic.py delete mode 100644 worlds/stardew_valley/mods/logic/magic.py create mode 100644 worlds/stardew_valley/mods/logic/magic_logic.py create mode 100644 worlds/stardew_valley/mods/logic/mod_logic.py create mode 100644 worlds/stardew_valley/mods/logic/mod_skills_levels.py delete mode 100644 worlds/stardew_valley/mods/logic/quests.py create mode 100644 worlds/stardew_valley/mods/logic/quests_logic.py delete mode 100644 worlds/stardew_valley/mods/logic/skills.py create mode 100644 worlds/stardew_valley/mods/logic/skills_logic.py delete mode 100644 worlds/stardew_valley/mods/logic/skullcavernelevator.py delete mode 100644 worlds/stardew_valley/mods/logic/special_orders.py create mode 100644 worlds/stardew_valley/mods/logic/special_orders_logic.py create mode 100644 worlds/stardew_valley/mods/logic/sve_logic.py create mode 100644 worlds/stardew_valley/mods/mod_monster_locations.py delete mode 100644 worlds/stardew_valley/stardew_rule.py create mode 100644 worlds/stardew_valley/stardew_rule/__init__.py create mode 100644 worlds/stardew_valley/stardew_rule/base.py create mode 100644 worlds/stardew_valley/stardew_rule/indirect_connection.py create mode 100644 worlds/stardew_valley/stardew_rule/literal.py create mode 100644 worlds/stardew_valley/stardew_rule/protocol.py create mode 100644 worlds/stardew_valley/stardew_rule/state.py create mode 100644 worlds/stardew_valley/strings/ap_names/ap_weapon_names.py create mode 100644 worlds/stardew_valley/strings/ap_names/community_upgrade_names.py create mode 100644 worlds/stardew_valley/strings/ap_names/event_names.py create mode 100644 worlds/stardew_valley/strings/ap_names/mods/mod_items.py create mode 100644 worlds/stardew_valley/strings/bundle_names.py create mode 100644 worlds/stardew_valley/strings/currency_names.py create mode 100644 worlds/stardew_valley/strings/decoration_names.py create mode 100644 worlds/stardew_valley/strings/monster_names.py create mode 100644 worlds/stardew_valley/strings/quality_names.py create mode 100644 worlds/stardew_valley/test/TestCrops.py create mode 100644 worlds/stardew_valley/test/TestDynamicGoals.py delete mode 100644 worlds/stardew_valley/test/TestLogicSimplification.py create mode 100644 worlds/stardew_valley/test/TestMultiplePlayers.py create mode 100644 worlds/stardew_valley/test/TestOptionFlags.py create mode 100644 worlds/stardew_valley/test/TestOptionsPairs.py create mode 100644 worlds/stardew_valley/test/TestPresets.py create mode 100644 worlds/stardew_valley/test/TestStardewRule.py create mode 100644 worlds/stardew_valley/test/TestStartInventory.py create mode 100644 worlds/stardew_valley/test/assertion/__init__.py create mode 100644 worlds/stardew_valley/test/assertion/goal_assert.py create mode 100644 worlds/stardew_valley/test/assertion/mod_assert.py create mode 100644 worlds/stardew_valley/test/assertion/option_assert.py create mode 100644 worlds/stardew_valley/test/assertion/rule_assert.py create mode 100644 worlds/stardew_valley/test/assertion/rule_explain.py create mode 100644 worlds/stardew_valley/test/assertion/world_assert.py delete mode 100644 worlds/stardew_valley/test/checks/goal_checks.py delete mode 100644 worlds/stardew_valley/test/checks/option_checks.py delete mode 100644 worlds/stardew_valley/test/checks/world_checks.py create mode 100644 worlds/stardew_valley/test/long/TestPreRolledRandomness.py create mode 100644 worlds/stardew_valley/test/mods/TestModFish.py create mode 100644 worlds/stardew_valley/test/mods/TestModVillagers.py create mode 100644 worlds/stardew_valley/test/performance/TestPerformance.py create mode 100644 worlds/stardew_valley/test/performance/__init__.py create mode 100644 worlds/stardew_valley/test/stability/StabilityOutputScript.py create mode 100644 worlds/stardew_valley/test/stability/TestStability.py create mode 100644 worlds/stardew_valley/test/stability/__init__.py diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py index aa825af302eb..e25fd8eb9a58 100644 --- a/worlds/stardew_valley/__init__.py +++ b/worlds/stardew_valley/__init__.py @@ -1,21 +1,28 @@ import logging -from typing import Dict, Any, Iterable, Optional, Union, Set, List +from typing import Dict, Any, Iterable, Optional, Union, List, TextIO -from BaseClasses import Region, Entrance, Location, Item, Tutorial, CollectionState, ItemClassification, MultiWorld, Group as ItemLinkGroup +from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification, MultiWorld from Options import PerGameCommonOptions from worlds.AutoWorld import World, WebWorld from . import rules -from .bundles import get_all_bundles, Bundle +from .bundles.bundle_room import BundleRoom +from .bundles.bundles import get_all_bundles +from .early_items import setup_early_items from .items import item_table, create_items, ItemData, Group, items_by_group, get_all_filler_items, remove_limited_amount_packs -from .locations import location_table, create_locations, LocationData -from .logic import StardewLogic, StardewRule, True_, MAX_MONTHS +from .locations import location_table, create_locations, LocationData, locations_by_tag +from .logic.bundle_logic import BundleLogic +from .logic.logic import StardewLogic +from .logic.time_logic import MAX_MONTHS from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, BundlePrice, NumberOfLuckBuffs, NumberOfMovementBuffs, \ - BackpackProgression, BuildingProgression, ExcludeGingerIsland, TrapItems + BackpackProgression, BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization from .presets import sv_options_presets from .regions import create_regions from .rules import set_rules -from worlds.generic.Rules import set_rule +from .stardew_rule import True_, StardewRule, HasProgressionPercent +from .strings.ap_names.event_names import Event +from .strings.entrance_names import Entrance as EntranceName from .strings.goal_names import Goal as GoalName +from .strings.region_names import Region as RegionName client_version = 0 @@ -59,6 +66,15 @@ class StardewValleyWorld(World): item_name_to_id = {name: data.code for name, data in item_table.items()} location_name_to_id = {name: data.code for name, data in location_table.items()} + item_name_groups = { + group.name.replace("_", " ").title() + (" Group" if group.name.replace("_", " ").title() in item_table else ""): + [item.name for item in items] for group, items in items_by_group.items() + } + location_name_groups = { + group.name.replace("_", " ").title() + (" Group" if group.name.replace("_", " ").title() in locations_by_tag else ""): + [location.name for location in locations] for group, locations in locations_by_tag.items() + } + data_version = 3 required_client_version = (0, 4, 0) @@ -67,24 +83,21 @@ class StardewValleyWorld(World): logic: StardewLogic web = StardewWebWorld() - modified_bundles: Dict[str, Bundle] + modified_bundles: List[BundleRoom] randomized_entrances: Dict[str, str] - all_progression_items: Set[str] + total_progression_items: int + + # all_progression_items: Dict[str, int] # If you need to debug total_progression_items, uncommenting this will help tremendously - def __init__(self, world: MultiWorld, player: int): - super().__init__(world, player) - self.all_progression_items = set() + def __init__(self, multiworld: MultiWorld, player: int): + super().__init__(multiworld, player) self.filler_item_pool_names = [] + self.total_progression_items = 0 + # self.all_progression_items = dict() def generate_early(self): self.force_change_options_if_incompatible() - self.logic = StardewLogic(self.player, self.options) - self.modified_bundles = get_all_bundles(self.multiworld.random, - self.logic, - self.options.bundle_randomization, - self.options.bundle_price) - def force_change_options_if_incompatible(self): goal_is_walnut_hunter = self.options.goal == Goal.option_greatest_walnut_hunter goal_is_perfection = self.options.goal == Goal.option_perfection @@ -94,7 +107,8 @@ def force_change_options_if_incompatible(self): self.options.exclude_ginger_island.value = ExcludeGingerIsland.option_false goal_name = self.options.goal.current_key player_name = self.multiworld.player_name[self.player] - logging.warning(f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})") + logging.warning( + f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})") def create_regions(self): def create_region(name: str, exits: Iterable[str]) -> Region: @@ -102,15 +116,19 @@ def create_region(name: str, exits: Iterable[str]) -> Region: region.exits = [Entrance(self.player, exit_name, region) for exit_name in exits] return region - world_regions, self.randomized_entrances = create_regions(create_region, self.multiworld.random, self.options) + world_regions, world_entrances, self.randomized_entrances = create_regions(create_region, self.random, self.options) + + self.logic = StardewLogic(self.player, self.options, world_regions.keys()) + self.modified_bundles = get_all_bundles(self.random, + self.logic, + self.options) def add_location(name: str, code: Optional[int], region: str): region = world_regions[region] location = StardewLocation(self.player, name, code, region) - location.access_rule = lambda _: True region.locations.append(location) - create_locations(add_location, self.options, self.multiworld.random) + create_locations(add_location, self.modified_bundles, self.options, self.random) self.multiworld.regions.extend(world_regions.values()) def create_items(self): @@ -128,16 +146,16 @@ def create_items(self): for location in self.multiworld.get_locations(self.player) if not location.event]) - created_items = create_items(self.create_item, locations_count, items_to_exclude, self.options, - self.multiworld.random) + created_items = create_items(self.create_item, self.delete_item, locations_count, items_to_exclude, self.options, + self.random) self.multiworld.itempool += created_items - self.setup_early_items() - self.setup_month_events() + setup_early_items(self.multiworld, self.options, self.player, self.random) + self.setup_player_events() self.setup_victory() - def precollect_starting_season(self) -> Optional[StardewItem]: + def precollect_starting_season(self): if self.options.season_randomization == SeasonRandomization.option_progressive: return @@ -145,7 +163,7 @@ def precollect_starting_season(self) -> Optional[StardewItem]: if self.options.season_randomization == SeasonRandomization.option_disabled: for season in season_pool: - self.multiworld.push_precollected(self.create_item(season)) + self.multiworld.push_precollected(self.create_starting_item(season)) return if [item for item in self.multiworld.precollected_items[self.player] @@ -155,75 +173,128 @@ def precollect_starting_season(self) -> Optional[StardewItem]: if self.options.season_randomization == SeasonRandomization.option_randomized_not_winter: season_pool = [season for season in season_pool if season.name != "Winter"] - starting_season = self.create_item(self.multiworld.random.choice(season_pool)) + starting_season = self.create_starting_item(self.random.choice(season_pool)) self.multiworld.push_precollected(starting_season) - def setup_early_items(self): - if (self.options.building_progression == - BuildingProgression.option_progressive_early_shipping_bin): - self.multiworld.early_items[self.player]["Shipping Bin"] = 1 + def setup_player_events(self): + self.setup_construction_events() + self.setup_quest_events() + self.setup_action_events() - if self.options.backpack_progression == BackpackProgression.option_early_progressive: - self.multiworld.early_items[self.player]["Progressive Backpack"] = 1 + def setup_construction_events(self): + can_construct_buildings = LocationData(None, RegionName.carpenter, Event.can_construct_buildings) + self.create_event_location(can_construct_buildings, True_(), Event.can_construct_buildings) - def setup_month_events(self): - for i in range(0, MAX_MONTHS): - month_end = LocationData(None, "Stardew Valley", f"Month End {i + 1}") - if i == 0: - self.create_event_location(month_end, True_(), "Month End") - continue + def setup_quest_events(self): + start_dark_talisman_quest = LocationData(None, RegionName.railroad, Event.start_dark_talisman_quest) + self.create_event_location(start_dark_talisman_quest, self.logic.wallet.has_rusty_key(), Event.start_dark_talisman_quest) - self.create_event_location(month_end, self.logic.received("Month End", i).simplify(), "Month End") + def setup_action_events(self): + can_ship_event = LocationData(None, RegionName.shipping, Event.can_ship_items) + self.create_event_location(can_ship_event, True_(), Event.can_ship_items) + can_shop_pierre_event = LocationData(None, RegionName.pierre_store, Event.can_shop_at_pierre) + self.create_event_location(can_shop_pierre_event, True_(), Event.can_shop_at_pierre) def setup_victory(self): if self.options.goal == Goal.option_community_center: self.create_event_location(location_table[GoalName.community_center], - self.logic.can_complete_community_center().simplify(), - "Victory") + self.logic.bundle.can_complete_community_center, + Event.victory) elif self.options.goal == Goal.option_grandpa_evaluation: self.create_event_location(location_table[GoalName.grandpa_evaluation], - self.logic.can_finish_grandpa_evaluation().simplify(), - "Victory") + self.logic.can_finish_grandpa_evaluation(), + Event.victory) elif self.options.goal == Goal.option_bottom_of_the_mines: self.create_event_location(location_table[GoalName.bottom_of_the_mines], - self.logic.can_mine_to_floor(120).simplify(), - "Victory") + True_(), + Event.victory) elif self.options.goal == Goal.option_cryptic_note: self.create_event_location(location_table[GoalName.cryptic_note], - self.logic.can_complete_quest("Cryptic Note").simplify(), - "Victory") + self.logic.quest.can_complete_quest("Cryptic Note"), + Event.victory) elif self.options.goal == Goal.option_master_angler: self.create_event_location(location_table[GoalName.master_angler], - self.logic.can_catch_every_fish().simplify(), - "Victory") + self.logic.fishing.can_catch_every_fish_in_slot(self.get_all_location_names()), + Event.victory) elif self.options.goal == Goal.option_complete_collection: self.create_event_location(location_table[GoalName.complete_museum], - self.logic.can_complete_museum().simplify(), - "Victory") + self.logic.museum.can_complete_museum(), + Event.victory) elif self.options.goal == Goal.option_full_house: self.create_event_location(location_table[GoalName.full_house], - (self.logic.has_children(2) & self.logic.can_reproduce()).simplify(), - "Victory") + (self.logic.relationship.has_children(2) & self.logic.relationship.can_reproduce()), + Event.victory) elif self.options.goal == Goal.option_greatest_walnut_hunter: self.create_event_location(location_table[GoalName.greatest_walnut_hunter], - self.logic.has_walnut(130).simplify(), - "Victory") + self.logic.has_walnut(130), + Event.victory) + elif self.options.goal == Goal.option_protector_of_the_valley: + self.create_event_location(location_table[GoalName.protector_of_the_valley], + self.logic.monster.can_complete_all_monster_slaying_goals(), + Event.victory) + elif self.options.goal == Goal.option_full_shipment: + self.create_event_location(location_table[GoalName.full_shipment], + self.logic.shipping.can_ship_everything_in_slot(self.get_all_location_names()), + Event.victory) + elif self.options.goal == Goal.option_gourmet_chef: + self.create_event_location(location_table[GoalName.gourmet_chef], + self.logic.cooking.can_cook_everything, + Event.victory) + elif self.options.goal == Goal.option_craft_master: + self.create_event_location(location_table[GoalName.craft_master], + self.logic.crafting.can_craft_everything, + Event.victory) + elif self.options.goal == Goal.option_legend: + self.create_event_location(location_table[GoalName.legend], + self.logic.money.can_have_earned_total(10_000_000), + Event.victory) + elif self.options.goal == Goal.option_mystery_of_the_stardrops: + self.create_event_location(location_table[GoalName.mystery_of_the_stardrops], + self.logic.has_all_stardrops(), + Event.victory) + elif self.options.goal == Goal.option_allsanity: + self.create_event_location(location_table[GoalName.allsanity], + HasProgressionPercent(self.player, 100), + Event.victory) elif self.options.goal == Goal.option_perfection: self.create_event_location(location_table[GoalName.perfection], - self.logic.has_everything(self.all_progression_items).simplify(), - "Victory") + HasProgressionPercent(self.player, 100), + Event.victory) + + self.multiworld.completion_condition[self.player] = lambda state: state.has(Event.victory, self.player) + + def get_all_location_names(self) -> List[str]: + return list(location.name for location in self.multiworld.get_locations(self.player)) + + def create_item(self, item: Union[str, ItemData], override_classification: ItemClassification = None) -> StardewItem: + if isinstance(item, str): + item = item_table[item] + + if override_classification is None: + override_classification = item.classification + + if override_classification == ItemClassification.progression and item.name != Event.victory: + self.total_progression_items += 1 + # if item.name not in self.all_progression_items: + # self.all_progression_items[item.name] = 0 + # self.all_progression_items[item.name] += 1 + return StardewItem(item.name, override_classification, item.code, self.player) - self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player) + def delete_item(self, item: Item): + if item.classification & ItemClassification.progression: + self.total_progression_items -= 1 + # if item.name in self.all_progression_items: + # self.all_progression_items[item.name] -= 1 - def create_item(self, item: Union[str, ItemData]) -> StardewItem: + def create_starting_item(self, item: Union[str, ItemData]) -> StardewItem: if isinstance(item, str): item = item_table[item] - if item.classification == ItemClassification.progression: - self.all_progression_items.add(item.name) return StardewItem(item.name, item.classification, item.code, self.player) - def create_event_location(self, location_data: LocationData, rule: StardewRule, item: Optional[str] = None): + def create_event_location(self, location_data: LocationData, rule: StardewRule = None, item: Optional[str] = None): + if rule is None: + rule = True_() if item is None: item = location_data.name @@ -235,37 +306,6 @@ def create_event_location(self, location_data: LocationData, rule: StardewRule, def set_rules(self): set_rules(self) - self.force_first_month_once_all_early_items_are_found() - - def force_first_month_once_all_early_items_are_found(self): - """ - The Fill algorithm sweeps all event when calculating the early location. This causes an issue where - location only locked behind event are considered early, which they are not really... - - This patches the issue, by adding a dependency to the first month end on all early items, so all the locations - that depends on it will not be considered early. This requires at least one early item to be progression, or - it just won't work... - """ - - early_items = [] - for player, item_count in self.multiworld.early_items.items(): - for item, count in item_count.items(): - if self.multiworld.worlds[player].create_item(item).advancement: - early_items.append((player, item, count)) - - for item, count in self.multiworld.local_early_items[self.player].items(): - if self.create_item(item).advancement: - early_items.append((self.player, item, count)) - - def first_month_require_all_early_items(state: CollectionState) -> bool: - for player, item, count in early_items: - if not state.has(item, player, count): - return False - - return True - - first_month_end = self.multiworld.get_location("Month End 1", self.player) - set_rule(first_month_end, first_month_require_all_early_items) def generate_basic(self): pass @@ -283,13 +323,12 @@ def generate_filler_item_pool_names(self): def get_filler_item_rules(self): if self.player in self.multiworld.groups: - link_group: ItemLinkGroup = self.multiworld.groups[self.player] + link_group = self.multiworld.groups[self.player] include_traps = True exclude_island = False for player in link_group["players"]: player_options = self.multiworld.worlds[player].options if self.multiworld.game[player] != self.game: - continue if player_options.trap_items == TrapItems.option_no_traps: include_traps = False @@ -299,24 +338,57 @@ def get_filler_item_rules(self): else: return self.options.trap_items != TrapItems.option_no_traps, self.options.exclude_ginger_island == ExcludeGingerIsland.option_true - def fill_slot_data(self) -> Dict[str, Any]: + def write_spoiler_header(self, spoiler_handle: TextIO) -> None: + """Write to the spoiler header. If individual it's right at the end of that player's options, + if as stage it's right under the common header before per-player options.""" + self.add_entrances_to_spoiler_log() + + def write_spoiler(self, spoiler_handle: TextIO) -> None: + """Write to the spoiler "middle", this is after the per-player options and before locations, + meant for useful or interesting info.""" + self.add_bundles_to_spoiler_log(spoiler_handle) - modified_bundles = {} - for bundle_key in self.modified_bundles: - key, value = self.modified_bundles[bundle_key].to_pair() - modified_bundles[key] = value + def add_bundles_to_spoiler_log(self, spoiler_handle: TextIO): + if self.options.bundle_randomization == BundleRandomization.option_vanilla: + return + player_name = self.multiworld.get_player_name(self.player) + spoiler_handle.write(f"\n\nCommunity Center ({player_name}):\n") + for room in self.modified_bundles: + for bundle in room.bundles: + spoiler_handle.write(f"\t[{room.name}] {bundle.name} ({bundle.number_required} required):\n") + for i, item in enumerate(bundle.items): + if "Basic" in item.quality: + quality = "" + else: + quality = f" ({item.quality.split(' ')[0]})" + spoiler_handle.write(f"\t\t{item.amount}x {item.item_name}{quality}\n") + + def add_entrances_to_spoiler_log(self): + if self.options.entrance_randomization == EntranceRandomization.option_disabled: + return + for original_entrance, replaced_entrance in self.randomized_entrances.items(): + self.multiworld.spoiler.set_entrance(original_entrance, replaced_entrance, "entrance", self.player) - excluded_options = [BundleRandomization, BundlePrice, NumberOfMovementBuffs, NumberOfLuckBuffs] + def fill_slot_data(self) -> Dict[str, Any]: + bundles = dict() + for room in self.modified_bundles: + bundles[room.name] = dict() + for bundle in room.bundles: + bundles[room.name][bundle.name] = {"number_required": bundle.number_required} + for i, item in enumerate(bundle.items): + bundles[room.name][bundle.name][i] = f"{item.item_name}|{item.amount}|{item.quality}" + + excluded_options = [BundleRandomization, NumberOfMovementBuffs, NumberOfLuckBuffs] excluded_option_names = [option.internal_name for option in excluded_options] generic_option_names = [option_name for option_name in PerGameCommonOptions.type_hints] excluded_option_names.extend(generic_option_names) included_option_names: List[str] = [option_name for option_name in self.options_dataclass.type_hints if option_name not in excluded_option_names] slot_data = self.options.as_dict(*included_option_names) slot_data.update({ - "seed": self.multiworld.per_slot_randoms[self.player].randrange(1000000000), # Seed should be max 9 digits + "seed": self.random.randrange(1000000000), # Seed should be max 9 digits "randomized_entrances": self.randomized_entrances, - "modified_bundles": modified_bundles, - "client_version": "4.0.0", + "modified_bundles": bundles, + "client_version": "5.0.0", }) return slot_data diff --git a/worlds/stardew_valley/bundles.py b/worlds/stardew_valley/bundles.py deleted file mode 100644 index 4af21542a4ec..000000000000 --- a/worlds/stardew_valley/bundles.py +++ /dev/null @@ -1,254 +0,0 @@ -from random import Random -from typing import List, Dict, Union - -from .data.bundle_data import * -from .logic import StardewLogic -from .options import BundleRandomization, BundlePrice - -vanilla_bundles = { - "Pantry/0": "Spring Crops/O 465 20/24 1 0 188 1 0 190 1 0 192 1 0/0", - "Pantry/1": "Summer Crops/O 621 1/256 1 0 260 1 0 258 1 0 254 1 0/3", - "Pantry/2": "Fall Crops/BO 10 1/270 1 0 272 1 0 276 1 0 280 1 0/2", - "Pantry/3": "Quality Crops/BO 15 1/24 5 2 254 5 2 276 5 2 270 5 2/6/3", - "Pantry/4": "Animal/BO 16 1/186 1 0 182 1 0 174 1 0 438 1 0 440 1 0 442 1 0/4/5", - # 639 1 0 640 1 0 641 1 0 642 1 0 643 1 0 - "Pantry/5": "Artisan/BO 12 1/432 1 0 428 1 0 426 1 0 424 1 0 340 1 0 344 1 0 613 1 0 634 1 0 635 1 0 636 1 0 637 1 0 638 1 0/1/6", - "Crafts Room/13": "Spring Foraging/O 495 30/16 1 0 18 1 0 20 1 0 22 1 0/0", - "Crafts Room/14": "Summer Foraging/O 496 30/396 1 0 398 1 0 402 1 0/3", - "Crafts Room/15": "Fall Foraging/O 497 30/404 1 0 406 1 0 408 1 0 410 1 0/2", - "Crafts Room/16": "Winter Foraging/O 498 30/412 1 0 414 1 0 416 1 0 418 1 0/6", - "Crafts Room/17": "Construction/BO 114 1/388 99 0 388 99 0 390 99 0 709 10 0/4", - "Crafts Room/19": "Exotic Foraging/O 235 5/88 1 0 90 1 0 78 1 0 420 1 0 422 1 0 724 1 0 725 1 0 726 1 0 257 1 0/1/5", - "Fish Tank/6": "River Fish/O 685 30/145 1 0 143 1 0 706 1 0 699 1 0/6", - "Fish Tank/7": "Lake Fish/O 687 1/136 1 0 142 1 0 700 1 0 698 1 0/0", - "Fish Tank/8": "Ocean Fish/O 690 5/131 1 0 130 1 0 150 1 0 701 1 0/5", - "Fish Tank/9": "Night Fishing/R 516 1/140 1 0 132 1 0 148 1 0/1", - "Fish Tank/10": "Specialty Fish/O 242 5/128 1 0 156 1 0 164 1 0 734 1 0/4", - "Fish Tank/11": "Crab Pot/O 710 3/715 1 0 716 1 0 717 1 0 718 1 0 719 1 0 720 1 0 721 1 0 722 1 0 723 1 0 372 1 0/1/5", - "Boiler Room/20": "Blacksmith's/BO 13 1/334 1 0 335 1 0 336 1 0/2", - "Boiler Room/21": "Geologist's/O 749 5/80 1 0 86 1 0 84 1 0 82 1 0/1", - "Boiler Room/22": "Adventurer's/R 518 1/766 99 0 767 10 0 768 1 0 769 1 0/1/2", - "Vault/23": "2,500g/O 220 3/-1 2500 2500/4", - "Vault/24": "5,000g/O 369 30/-1 5000 5000/2", - "Vault/25": "10,000g/BO 9 1/-1 10000 10000/3", - "Vault/26": "25,000g/BO 21 1/-1 25000 25000/1", - "Bulletin Board/31": "Chef's/O 221 3/724 1 0 259 1 0 430 1 0 376 1 0 228 1 0 194 1 0/4", - "Bulletin Board/32": "Field Research/BO 20 1/422 1 0 392 1 0 702 1 0 536 1 0/5", - "Bulletin Board/33": "Enchanter's/O 336 5/725 1 0 348 1 0 446 1 0 637 1 0/1", - "Bulletin Board/34": "Dye/BO 25 1/420 1 0 397 1 0 421 1 0 444 1 0 62 1 0 266 1 0/6", - "Bulletin Board/35": "Fodder/BO 104 1/262 10 0 178 10 0 613 3 0/3", - # "Abandoned Joja Mart/36": "The Missing//348 1 1 807 1 0 74 1 0 454 5 2 795 1 2 445 1 0/1/5" -} - - -class Bundle: - room: str - sprite: str - original_name: str - name: str - rewards: List[str] - requirements: List[BundleItem] - color: str - number_required: int - - def __init__(self, key: str, value: str): - key_parts = key.split("/") - self.room = key_parts[0] - self.sprite = key_parts[1] - - value_parts = value.split("/") - self.original_name = value_parts[0] - self.name = value_parts[0] - self.rewards = self.parse_stardew_objects(value_parts[1]) - self.requirements = self.parse_stardew_bundle_items(value_parts[2]) - self.color = value_parts[3] - if len(value_parts) > 4: - self.number_required = int(value_parts[4]) - else: - self.number_required = len(self.requirements) - - def __repr__(self): - return f"{self.original_name} -> {repr(self.requirements)}" - - def get_name_with_bundle(self) -> str: - return f"{self.original_name} Bundle" - - def to_pair(self) -> (str, str): - key = f"{self.room}/{self.sprite}" - str_rewards = "" - for reward in self.rewards: - str_rewards += f" {reward}" - str_rewards = str_rewards.strip() - str_requirements = "" - for requirement in self.requirements: - str_requirements += f" {requirement.item.item_id} {requirement.amount} {requirement.quality}" - str_requirements = str_requirements.strip() - value = f"{self.name}/{str_rewards}/{str_requirements}/{self.color}/{self.number_required}" - return key, value - - def remove_rewards(self): - self.rewards = [] - - def change_number_required(self, difference: int): - self.number_required = min(len(self.requirements), max(1, self.number_required + difference)) - if len(self.requirements) == 1 and self.requirements[0].item.item_id == -1: - one_fifth = self.requirements[0].amount / 5 - new_amount = int(self.requirements[0].amount + (difference * one_fifth)) - self.requirements[0] = BundleItem.money_bundle(new_amount) - thousand_amount = int(new_amount / 1000) - dollar_amount = str(new_amount % 1000) - while len(dollar_amount) < 3: - dollar_amount = f"0{dollar_amount}" - self.name = f"{thousand_amount},{dollar_amount}g" - - def randomize_requirements(self, random: Random, - potential_requirements: Union[List[BundleItem], List[List[BundleItem]]]): - if not potential_requirements: - return - - number_to_generate = len(self.requirements) - self.requirements.clear() - if number_to_generate > len(potential_requirements): - choices: Union[BundleItem, List[BundleItem]] = random.choices(potential_requirements, k=number_to_generate) - else: - choices: Union[BundleItem, List[BundleItem]] = random.sample(potential_requirements, number_to_generate) - for choice in choices: - if isinstance(choice, BundleItem): - self.requirements.append(choice) - else: - self.requirements.append(random.choice(choice)) - - def assign_requirements(self, new_requirements: List[BundleItem]) -> List[BundleItem]: - number_to_generate = len(self.requirements) - self.requirements.clear() - for requirement in new_requirements: - self.requirements.append(requirement) - if len(self.requirements) >= number_to_generate: - return new_requirements[number_to_generate:] - - @staticmethod - def parse_stardew_objects(string_objects: str) -> List[str]: - objects = [] - if len(string_objects) < 5: - return objects - rewards_parts = string_objects.split(" ") - for index in range(0, len(rewards_parts), 3): - objects.append(f"{rewards_parts[index]} {rewards_parts[index + 1]} {rewards_parts[index + 2]}") - return objects - - @staticmethod - def parse_stardew_bundle_items(string_objects: str) -> List[BundleItem]: - bundle_items = [] - parts = string_objects.split(" ") - for index in range(0, len(parts), 3): - item_id = int(parts[index]) - bundle_item = BundleItem(all_bundle_items_by_id[item_id].item, - int(parts[index + 1]), - int(parts[index + 2])) - bundle_items.append(bundle_item) - return bundle_items - - # Shuffling the Vault doesn't really work with the stardew system in place - # shuffle_vault_amongst_themselves(random, bundles) - - -def get_all_bundles(random: Random, logic: StardewLogic, randomization: BundleRandomization, price: BundlePrice) -> Dict[str, Bundle]: - bundles = {} - for bundle_key in vanilla_bundles: - bundle_value = vanilla_bundles[bundle_key] - bundle = Bundle(bundle_key, bundle_value) - bundles[bundle.get_name_with_bundle()] = bundle - - if randomization == BundleRandomization.option_thematic: - shuffle_bundles_thematically(random, bundles) - elif randomization == BundleRandomization.option_shuffled: - shuffle_bundles_completely(random, logic, bundles) - - price_difference = 0 - if price == BundlePrice.option_very_cheap: - price_difference = -2 - elif price == BundlePrice.option_cheap: - price_difference = -1 - elif price == BundlePrice.option_expensive: - price_difference = 1 - - for bundle_key in bundles: - bundles[bundle_key].remove_rewards() - bundles[bundle_key].change_number_required(price_difference) - - return bundles - - -def shuffle_bundles_completely(random: Random, logic: StardewLogic, bundles: Dict[str, Bundle]): - total_required_item_number = sum(len(bundle.requirements) for bundle in bundles.values()) - quality_crops_items_set = set(quality_crops_items) - all_bundle_items_without_quality_and_money = [item - for item in all_bundle_items_except_money - if item not in quality_crops_items_set] + \ - random.sample(quality_crops_items, 10) - choices = random.sample(all_bundle_items_without_quality_and_money, total_required_item_number - 4) - - items_sorted = sorted(choices, key=lambda x: logic.item_rules[x.item.name].get_difficulty()) - - keys = sorted(bundles.keys()) - random.shuffle(keys) - - for key in keys: - if not bundles[key].original_name.endswith("00g"): - items_sorted = bundles[key].assign_requirements(items_sorted) - - -def shuffle_bundles_thematically(random: Random, bundles: Dict[str, Bundle]): - shuffle_crafts_room_bundle_thematically(random, bundles) - shuffle_pantry_bundle_thematically(random, bundles) - shuffle_fish_tank_thematically(random, bundles) - shuffle_boiler_room_thematically(random, bundles) - shuffle_bulletin_board_thematically(random, bundles) - - -def shuffle_crafts_room_bundle_thematically(random: Random, bundles: Dict[str, Bundle]): - bundles["Spring Foraging Bundle"].randomize_requirements(random, spring_foraging_items) - bundles["Summer Foraging Bundle"].randomize_requirements(random, summer_foraging_items) - bundles["Fall Foraging Bundle"].randomize_requirements(random, fall_foraging_items) - bundles["Winter Foraging Bundle"].randomize_requirements(random, winter_foraging_items) - bundles["Exotic Foraging Bundle"].randomize_requirements(random, exotic_foraging_items) - bundles["Construction Bundle"].randomize_requirements(random, construction_items) - - -def shuffle_pantry_bundle_thematically(random: Random, bundles: Dict[str, Bundle]): - bundles["Spring Crops Bundle"].randomize_requirements(random, spring_crop_items) - bundles["Summer Crops Bundle"].randomize_requirements(random, summer_crops_items) - bundles["Fall Crops Bundle"].randomize_requirements(random, fall_crops_items) - bundles["Quality Crops Bundle"].randomize_requirements(random, quality_crops_items) - bundles["Animal Bundle"].randomize_requirements(random, animal_product_items) - bundles["Artisan Bundle"].randomize_requirements(random, artisan_goods_items) - - -def shuffle_fish_tank_thematically(random: Random, bundles: Dict[str, Bundle]): - bundles["River Fish Bundle"].randomize_requirements(random, river_fish_items) - bundles["Lake Fish Bundle"].randomize_requirements(random, lake_fish_items) - bundles["Ocean Fish Bundle"].randomize_requirements(random, ocean_fish_items) - bundles["Night Fishing Bundle"].randomize_requirements(random, night_fish_items) - bundles["Crab Pot Bundle"].randomize_requirements(random, crab_pot_items) - bundles["Specialty Fish Bundle"].randomize_requirements(random, specialty_fish_items) - - -def shuffle_boiler_room_thematically(random: Random, bundles: Dict[str, Bundle]): - bundles["Blacksmith's Bundle"].randomize_requirements(random, blacksmith_items) - bundles["Geologist's Bundle"].randomize_requirements(random, geologist_items) - bundles["Adventurer's Bundle"].randomize_requirements(random, adventurer_items) - - -def shuffle_bulletin_board_thematically(random: Random, bundles: Dict[str, Bundle]): - bundles["Chef's Bundle"].randomize_requirements(random, chef_items) - bundles["Dye Bundle"].randomize_requirements(random, dye_items) - bundles["Field Research Bundle"].randomize_requirements(random, field_research_items) - bundles["Fodder Bundle"].randomize_requirements(random, fodder_items) - bundles["Enchanter's Bundle"].randomize_requirements(random, enchanter_items) - - -def shuffle_vault_amongst_themselves(random: Random, bundles: Dict[str, Bundle]): - bundles["2,500g Bundle"].randomize_requirements(random, vault_bundle_items) - bundles["5,000g Bundle"].randomize_requirements(random, vault_bundle_items) - bundles["10,000g Bundle"].randomize_requirements(random, vault_bundle_items) - bundles["25,000g Bundle"].randomize_requirements(random, vault_bundle_items) diff --git a/worlds/stardew_valley/test/checks/__init__.py b/worlds/stardew_valley/bundles/__init__.py similarity index 100% rename from worlds/stardew_valley/test/checks/__init__.py rename to worlds/stardew_valley/bundles/__init__.py diff --git a/worlds/stardew_valley/bundles/bundle.py b/worlds/stardew_valley/bundles/bundle.py new file mode 100644 index 000000000000..199826b96bc8 --- /dev/null +++ b/worlds/stardew_valley/bundles/bundle.py @@ -0,0 +1,163 @@ +from dataclasses import dataclass +from random import Random +from typing import List + +from .bundle_item import BundleItem +from ..options import BundlePrice, StardewValleyOptions, ExcludeGingerIsland, FestivalLocations +from ..strings.currency_names import Currency + + +@dataclass +class Bundle: + room: str + name: str + items: List[BundleItem] + number_required: int + + def __repr__(self): + return f"{self.name} -> {self.number_required} from {repr(self.items)}" + + +@dataclass +class BundleTemplate: + room: str + name: str + items: List[BundleItem] + number_possible_items: int + number_required_items: int + + def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int, number_required_items: int): + self.room = room + self.name = name + self.items = items + self.number_possible_items = number_possible_items + self.number_required_items = number_required_items + + @staticmethod + def extend_from(template, items: List[BundleItem]): + return BundleTemplate(template.room, template.name, items, template.number_possible_items, template.number_required_items) + + def create_bundle(self, bundle_price_option: BundlePrice, random: Random, options: StardewValleyOptions) -> Bundle: + if bundle_price_option == BundlePrice.option_minimum: + number_required = 1 + elif bundle_price_option == BundlePrice.option_maximum: + number_required = 8 + else: + number_required = self.number_required_items + bundle_price_option.value + number_required = max(1, number_required) + filtered_items = [item for item in self.items if item.can_appear(options)] + number_items = len(filtered_items) + number_chosen_items = self.number_possible_items + if number_chosen_items < number_required: + number_chosen_items = number_required + + if number_chosen_items > number_items: + chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items) + else: + chosen_items = random.sample(filtered_items, number_chosen_items) + return Bundle(self.room, self.name, chosen_items, number_required) + + def can_appear(self, options: StardewValleyOptions) -> bool: + return True + + +class CurrencyBundleTemplate(BundleTemplate): + item: BundleItem + + def __init__(self, room: str, name: str, item: BundleItem): + super().__init__(room, name, [item], 1, 1) + self.item = item + + def create_bundle(self, bundle_price_option: BundlePrice, random: Random, options: StardewValleyOptions) -> Bundle: + currency_amount = self.get_currency_amount(bundle_price_option) + return Bundle(self.room, self.name, [BundleItem(self.item.item_name, currency_amount)], 1) + + def get_currency_amount(self, bundle_price_option: BundlePrice): + if bundle_price_option == BundlePrice.option_minimum: + price_multiplier = 0.1 + elif bundle_price_option == BundlePrice.option_maximum: + price_multiplier = 4 + else: + price_multiplier = round(1 + (bundle_price_option.value * 0.4), 2) + + currency_amount = int(self.item.amount * price_multiplier) + return currency_amount + + def can_appear(self, options: StardewValleyOptions) -> bool: + if options.exclude_ginger_island == ExcludeGingerIsland.option_true: + if self.item.item_name == Currency.qi_gem or self.item.item_name == Currency.golden_walnut or self.item.item_name == Currency.cinder_shard: + return False + if options.festival_locations == FestivalLocations.option_disabled: + if self.item.item_name == Currency.star_token: + return False + return True + + +class MoneyBundleTemplate(CurrencyBundleTemplate): + + def __init__(self, room: str, item: BundleItem): + super().__init__(room, "", item) + + def create_bundle(self, bundle_price_option: BundlePrice, random: Random, options: StardewValleyOptions) -> Bundle: + currency_amount = self.get_currency_amount(bundle_price_option) + currency_name = "g" + if currency_amount >= 1000: + unit_amount = currency_amount % 1000 + unit_amount = "000" if unit_amount == 0 else unit_amount + currency_display = f"{currency_amount // 1000},{unit_amount}" + else: + currency_display = f"{currency_amount}" + name = f"{currency_display}{currency_name} Bundle" + return Bundle(self.room, name, [BundleItem(self.item.item_name, currency_amount)], 1) + + def get_currency_amount(self, bundle_price_option: BundlePrice): + if bundle_price_option == BundlePrice.option_minimum: + price_multiplier = 0.1 + elif bundle_price_option == BundlePrice.option_maximum: + price_multiplier = 4 + else: + price_multiplier = round(1 + (bundle_price_option.value * 0.4), 2) + currency_amount = int(self.item.amount * price_multiplier) + return currency_amount + + +class IslandBundleTemplate(BundleTemplate): + def can_appear(self, options: StardewValleyOptions) -> bool: + return options.exclude_ginger_island == ExcludeGingerIsland.option_false + + +class FestivalBundleTemplate(BundleTemplate): + def can_appear(self, options: StardewValleyOptions) -> bool: + return options.festival_locations != FestivalLocations.option_disabled + + +class DeepBundleTemplate(BundleTemplate): + categories: List[List[BundleItem]] + + def __init__(self, room: str, name: str, categories: List[List[BundleItem]], number_possible_items: int, number_required_items: int): + super().__init__(room, name, [], number_possible_items, number_required_items) + self.categories = categories + + def create_bundle(self, bundle_price_option: BundlePrice, random: Random, options: StardewValleyOptions) -> Bundle: + if bundle_price_option == BundlePrice.option_minimum: + number_required = 1 + elif bundle_price_option == BundlePrice.option_maximum: + number_required = 8 + else: + number_required = self.number_required_items + bundle_price_option.value + number_categories = len(self.categories) + number_chosen_categories = self.number_possible_items + if number_chosen_categories < number_required: + number_chosen_categories = number_required + + if number_chosen_categories > number_categories: + chosen_categories = self.categories + random.choices(self.categories, k=number_chosen_categories - number_categories) + else: + chosen_categories = random.sample(self.categories, number_chosen_categories) + + chosen_items = [] + for category in chosen_categories: + filtered_items = [item for item in category if item.can_appear(options)] + chosen_items.append(random.choice(filtered_items)) + + return Bundle(self.room, self.name, chosen_items, number_required) diff --git a/worlds/stardew_valley/bundles/bundle_item.py b/worlds/stardew_valley/bundles/bundle_item.py new file mode 100644 index 000000000000..8aaa67c5f242 --- /dev/null +++ b/worlds/stardew_valley/bundles/bundle_item.py @@ -0,0 +1,73 @@ +from __future__ import annotations + +from abc import ABC, abstractmethod +from dataclasses import dataclass + +from ..options import StardewValleyOptions, ExcludeGingerIsland, FestivalLocations +from ..strings.crop_names import Fruit +from ..strings.currency_names import Currency +from ..strings.quality_names import CropQuality, FishQuality, ForageQuality + + +class BundleItemSource(ABC): + @abstractmethod + def can_appear(self, options: StardewValleyOptions) -> bool: + ... + + +class VanillaItemSource(BundleItemSource): + def can_appear(self, options: StardewValleyOptions) -> bool: + return True + + +class IslandItemSource(BundleItemSource): + def can_appear(self, options: StardewValleyOptions) -> bool: + return options.exclude_ginger_island == ExcludeGingerIsland.option_false + + +class FestivalItemSource(BundleItemSource): + def can_appear(self, options: StardewValleyOptions) -> bool: + return options.festival_locations != FestivalLocations.option_disabled + + +@dataclass(frozen=True, order=True) +class BundleItem: + class Sources: + vanilla = VanillaItemSource() + island = IslandItemSource() + festival = FestivalItemSource() + + item_name: str + amount: int = 1 + quality: str = CropQuality.basic + source: BundleItemSource = Sources.vanilla + + @staticmethod + def money_bundle(amount: int) -> BundleItem: + return BundleItem(Currency.money, amount) + + def as_amount(self, amount: int) -> BundleItem: + return BundleItem(self.item_name, amount, self.quality, self.source) + + def as_quality(self, quality: str) -> BundleItem: + return BundleItem(self.item_name, self.amount, quality, self.source) + + def as_quality_crop(self) -> BundleItem: + amount = 5 + difficult_crops = [Fruit.sweet_gem_berry, Fruit.ancient_fruit] + if self.item_name in difficult_crops: + amount = 1 + return self.as_quality(CropQuality.gold).as_amount(amount) + + def as_quality_fish(self) -> BundleItem: + return self.as_quality(FishQuality.gold) + + def as_quality_forage(self) -> BundleItem: + return self.as_quality(ForageQuality.gold) + + def __repr__(self): + quality = "" if self.quality == CropQuality.basic else self.quality + return f"{self.amount} {quality} {self.item_name}" + + def can_appear(self, options: StardewValleyOptions) -> bool: + return self.source.can_appear(options) diff --git a/worlds/stardew_valley/bundles/bundle_room.py b/worlds/stardew_valley/bundles/bundle_room.py new file mode 100644 index 000000000000..a5cdb89144f5 --- /dev/null +++ b/worlds/stardew_valley/bundles/bundle_room.py @@ -0,0 +1,24 @@ +from dataclasses import dataclass +from random import Random +from typing import List + +from .bundle import Bundle, BundleTemplate +from ..options import BundlePrice, StardewValleyOptions + + +@dataclass +class BundleRoom: + name: str + bundles: List[Bundle] + + +@dataclass +class BundleRoomTemplate: + name: str + bundles: List[BundleTemplate] + number_bundles: int + + def create_bundle_room(self, bundle_price_option: BundlePrice, random: Random, options: StardewValleyOptions): + filtered_bundles = [bundle for bundle in self.bundles if bundle.can_appear(options)] + chosen_bundles = random.sample(filtered_bundles, self.number_bundles) + return BundleRoom(self.name, [bundle.create_bundle(bundle_price_option, random, options) for bundle in chosen_bundles]) diff --git a/worlds/stardew_valley/bundles/bundles.py b/worlds/stardew_valley/bundles/bundles.py new file mode 100644 index 000000000000..260ee17cbe82 --- /dev/null +++ b/worlds/stardew_valley/bundles/bundles.py @@ -0,0 +1,80 @@ +from random import Random +from typing import List + +from .bundle_room import BundleRoom +from ..data.bundle_data import pantry_vanilla, crafts_room_vanilla, fish_tank_vanilla, boiler_room_vanilla, bulletin_board_vanilla, vault_vanilla, \ + pantry_thematic, crafts_room_thematic, fish_tank_thematic, boiler_room_thematic, bulletin_board_thematic, vault_thematic, pantry_remixed, \ + crafts_room_remixed, fish_tank_remixed, boiler_room_remixed, bulletin_board_remixed, vault_remixed, all_bundle_items_except_money, \ + abandoned_joja_mart_thematic, abandoned_joja_mart_vanilla, abandoned_joja_mart_remixed +from ..logic.logic import StardewLogic +from ..options import BundleRandomization, StardewValleyOptions, ExcludeGingerIsland + + +def get_all_bundles(random: Random, logic: StardewLogic, options: StardewValleyOptions) -> List[BundleRoom]: + if options.bundle_randomization == BundleRandomization.option_vanilla: + return get_vanilla_bundles(random, options) + elif options.bundle_randomization == BundleRandomization.option_thematic: + return get_thematic_bundles(random, options) + elif options.bundle_randomization == BundleRandomization.option_remixed: + return get_remixed_bundles(random, options) + elif options.bundle_randomization == BundleRandomization.option_shuffled: + return get_shuffled_bundles(random, logic, options) + + raise NotImplementedError + + +def get_vanilla_bundles(random: Random, options: StardewValleyOptions) -> List[BundleRoom]: + pantry = pantry_vanilla.create_bundle_room(options.bundle_price, random, options) + crafts_room = crafts_room_vanilla.create_bundle_room(options.bundle_price, random, options) + fish_tank = fish_tank_vanilla.create_bundle_room(options.bundle_price, random, options) + boiler_room = boiler_room_vanilla.create_bundle_room(options.bundle_price, random, options) + bulletin_board = bulletin_board_vanilla.create_bundle_room(options.bundle_price, random, options) + vault = vault_vanilla.create_bundle_room(options.bundle_price, random, options) + abandoned_joja_mart = abandoned_joja_mart_vanilla.create_bundle_room(options.bundle_price, random, options) + return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart] + + +def get_thematic_bundles(random: Random, options: StardewValleyOptions) -> List[BundleRoom]: + pantry = pantry_thematic.create_bundle_room(options.bundle_price, random, options) + crafts_room = crafts_room_thematic.create_bundle_room(options.bundle_price, random, options) + fish_tank = fish_tank_thematic.create_bundle_room(options.bundle_price, random, options) + boiler_room = boiler_room_thematic.create_bundle_room(options.bundle_price, random, options) + bulletin_board = bulletin_board_thematic.create_bundle_room(options.bundle_price, random, options) + vault = vault_thematic.create_bundle_room(options.bundle_price, random, options) + abandoned_joja_mart = abandoned_joja_mart_thematic.create_bundle_room(options.bundle_price, random, options) + return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart] + + +def get_remixed_bundles(random: Random, options: StardewValleyOptions) -> List[BundleRoom]: + pantry = pantry_remixed.create_bundle_room(options.bundle_price, random, options) + crafts_room = crafts_room_remixed.create_bundle_room(options.bundle_price, random, options) + fish_tank = fish_tank_remixed.create_bundle_room(options.bundle_price, random, options) + boiler_room = boiler_room_remixed.create_bundle_room(options.bundle_price, random, options) + bulletin_board = bulletin_board_remixed.create_bundle_room(options.bundle_price, random, options) + vault = vault_remixed.create_bundle_room(options.bundle_price, random, options) + abandoned_joja_mart = abandoned_joja_mart_remixed.create_bundle_room(options.bundle_price, random, options) + return [pantry, crafts_room, fish_tank, boiler_room, bulletin_board, vault, abandoned_joja_mart] + + +def get_shuffled_bundles(random: Random, logic: StardewLogic, options: StardewValleyOptions) -> List[BundleRoom]: + valid_bundle_items = [bundle_item for bundle_item in all_bundle_items_except_money if bundle_item.can_appear(options)] + + rooms = [room for room in get_remixed_bundles(random, options) if room.name != "Vault"] + required_items = 0 + for room in rooms: + for bundle in room.bundles: + required_items += len(bundle.items) + random.shuffle(room.bundles) + random.shuffle(rooms) + + chosen_bundle_items = random.sample(valid_bundle_items, required_items) + sorted_bundle_items = sorted(chosen_bundle_items, key=lambda x: logic.has(x.item_name).get_difficulty()) + for room in rooms: + for bundle in room.bundles: + num_items = len(bundle.items) + bundle.items = sorted_bundle_items[:num_items] + sorted_bundle_items = sorted_bundle_items[num_items:] + + vault = vault_remixed.create_bundle_room(options.bundle_price, random, options) + return [*rooms, vault] + diff --git a/worlds/stardew_valley/data/bundle_data.py b/worlds/stardew_valley/data/bundle_data.py index 183383ccbf3a..7e7a08c16b37 100644 --- a/worlds/stardew_valley/data/bundle_data.py +++ b/worlds/stardew_valley/data/bundle_data.py @@ -1,419 +1,777 @@ -from dataclasses import dataclass - -from . import fish_data -from .common_data import quality_dict -from .game_item import GameItem -from .museum_data import Mineral - -@dataclass(frozen=True) -class BundleItem: - item: GameItem - amount: int - quality: int - - @staticmethod - def item_bundle(name: str, item_id: int, amount: int, quality: int): - return BundleItem(GameItem(name, item_id), amount, quality) - - @staticmethod - def money_bundle(amount: int): - return BundleItem.item_bundle("Money", -1, amount, amount) - - def as_amount(self, amount: int): - return BundleItem.item_bundle(self.item.name, self.item.item_id, amount, self.quality) - - def as_quality(self, quality: int): - return BundleItem.item_bundle(self.item.name, self.item.item_id, self.amount, quality) - - def as_gold_quality(self): - return self.as_quality(2) - - def as_quality_crop(self): - amount = 5 - difficult_crops = ["Sweet Gem Berry", "Ancient Fruit"] - if self.item.name in difficult_crops: - amount = 1 - return self.as_gold_quality().as_amount(amount) - - def is_gold_quality(self) -> bool: - return self.quality >= 2 - - def __repr__(self): - return f"{self.amount} {quality_dict[self.quality]} {self.item.name}" - - def __lt__(self, other): - return self.item < other.item - - -wild_horseradish = BundleItem.item_bundle("Wild Horseradish", 16, 1, 0) -daffodil = BundleItem.item_bundle("Daffodil", 18, 1, 0) -leek = BundleItem.item_bundle("Leek", 20, 1, 0) -dandelion = BundleItem.item_bundle("Dandelion", 22, 1, 0) -morel = BundleItem.item_bundle("Morel", 257, 1, 0) -common_mushroom = BundleItem.item_bundle("Common Mushroom", 404, 1, 0) -salmonberry = BundleItem.item_bundle("Salmonberry", 296, 1, 0) -spring_onion = BundleItem.item_bundle("Spring Onion", 399, 1, 0) - -grape = BundleItem.item_bundle("Grape", 398, 1, 0) -spice_berry = BundleItem.item_bundle("Spice Berry", 396, 1, 0) -sweet_pea = BundleItem.item_bundle("Sweet Pea", 402, 1, 0) -red_mushroom = BundleItem.item_bundle("Red Mushroom", 420, 1, 0) -fiddlehead_fern = BundleItem.item_bundle("Fiddlehead Fern", 259, 1, 0) - -wild_plum = BundleItem.item_bundle("Wild Plum", 406, 1, 0) -hazelnut = BundleItem.item_bundle("Hazelnut", 408, 1, 0) -blackberry = BundleItem.item_bundle("Blackberry", 410, 1, 0) -chanterelle = BundleItem.item_bundle("Chanterelle", 281, 1, 0) - -winter_root = BundleItem.item_bundle("Winter Root", 412, 1, 0) -crystal_fruit = BundleItem.item_bundle("Crystal Fruit", 414, 1, 0) -snow_yam = BundleItem.item_bundle("Snow Yam", 416, 1, 0) -crocus = BundleItem.item_bundle("Crocus", 418, 1, 0) -holly = BundleItem.item_bundle("Holly", 283, 1, 0) - -coconut = BundleItem.item_bundle("Coconut", 88, 1, 0) -cactus_fruit = BundleItem.item_bundle("Cactus Fruit", 90, 1, 0) -cave_carrot = BundleItem.item_bundle("Cave Carrot", 78, 1, 0) -purple_mushroom = BundleItem.item_bundle("Purple Mushroom", 422, 1, 0) -maple_syrup = BundleItem.item_bundle("Maple Syrup", 724, 1, 0) -oak_resin = BundleItem.item_bundle("Oak Resin", 725, 1, 0) -pine_tar = BundleItem.item_bundle("Pine Tar", 726, 1, 0) -nautilus_shell = BundleItem.item_bundle("Nautilus Shell", 392, 1, 0) -coral = BundleItem.item_bundle("Coral", 393, 1, 0) -sea_urchin = BundleItem.item_bundle("Sea Urchin", 397, 1, 0) -rainbow_shell = BundleItem.item_bundle("Rainbow Shell", 394, 1, 0) -clam = BundleItem(fish_data.clam, 1, 0) -cockle = BundleItem(fish_data.cockle, 1, 0) -mussel = BundleItem(fish_data.mussel, 1, 0) -oyster = BundleItem(fish_data.oyster, 1, 0) -seaweed = BundleItem.item_bundle("Seaweed", 152, 1, 0) - -wood = BundleItem.item_bundle("Wood", 388, 99, 0) -stone = BundleItem.item_bundle("Stone", 390, 99, 0) -hardwood = BundleItem.item_bundle("Hardwood", 709, 10, 0) -clay = BundleItem.item_bundle("Clay", 330, 10, 0) -fiber = BundleItem.item_bundle("Fiber", 771, 99, 0) - -blue_jazz = BundleItem.item_bundle("Blue Jazz", 597, 1, 0) -cauliflower = BundleItem.item_bundle("Cauliflower", 190, 1, 0) -green_bean = BundleItem.item_bundle("Green Bean", 188, 1, 0) -kale = BundleItem.item_bundle("Kale", 250, 1, 0) -parsnip = BundleItem.item_bundle("Parsnip", 24, 1, 0) -potato = BundleItem.item_bundle("Potato", 192, 1, 0) -strawberry = BundleItem.item_bundle("Strawberry", 400, 1, 0) -tulip = BundleItem.item_bundle("Tulip", 591, 1, 0) -unmilled_rice = BundleItem.item_bundle("Unmilled Rice", 271, 1, 0) -blueberry = BundleItem.item_bundle("Blueberry", 258, 1, 0) -corn = BundleItem.item_bundle("Corn", 270, 1, 0) -hops = BundleItem.item_bundle("Hops", 304, 1, 0) -hot_pepper = BundleItem.item_bundle("Hot Pepper", 260, 1, 0) -melon = BundleItem.item_bundle("Melon", 254, 1, 0) -poppy = BundleItem.item_bundle("Poppy", 376, 1, 0) -radish = BundleItem.item_bundle("Radish", 264, 1, 0) -summer_spangle = BundleItem.item_bundle("Summer Spangle", 593, 1, 0) -sunflower = BundleItem.item_bundle("Sunflower", 421, 1, 0) -tomato = BundleItem.item_bundle("Tomato", 256, 1, 0) -wheat = BundleItem.item_bundle("Wheat", 262, 1, 0) -hay = BundleItem.item_bundle("Hay", 178, 1, 0) -amaranth = BundleItem.item_bundle("Amaranth", 300, 1, 0) -bok_choy = BundleItem.item_bundle("Bok Choy", 278, 1, 0) -cranberries = BundleItem.item_bundle("Cranberries", 282, 1, 0) -eggplant = BundleItem.item_bundle("Eggplant", 272, 1, 0) -fairy_rose = BundleItem.item_bundle("Fairy Rose", 595, 1, 0) -pumpkin = BundleItem.item_bundle("Pumpkin", 276, 1, 0) -yam = BundleItem.item_bundle("Yam", 280, 1, 0) -sweet_gem_berry = BundleItem.item_bundle("Sweet Gem Berry", 417, 1, 0) -rhubarb = BundleItem.item_bundle("Rhubarb", 252, 1, 0) -beet = BundleItem.item_bundle("Beet", 284, 1, 0) -red_cabbage = BundleItem.item_bundle("Red Cabbage", 266, 1, 0) -artichoke = BundleItem.item_bundle("Artichoke", 274, 1, 0) - -egg = BundleItem.item_bundle("Egg", 176, 1, 0) -large_egg = BundleItem.item_bundle("Large Egg", 174, 1, 0) -brown_egg = BundleItem.item_bundle("Egg (Brown)", 180, 1, 0) -large_brown_egg = BundleItem.item_bundle("Large Egg (Brown)", 182, 1, 0) -wool = BundleItem.item_bundle("Wool", 440, 1, 0) -milk = BundleItem.item_bundle("Milk", 184, 1, 0) -large_milk = BundleItem.item_bundle("Large Milk", 186, 1, 0) -goat_milk = BundleItem.item_bundle("Goat Milk", 436, 1, 0) -large_goat_milk = BundleItem.item_bundle("Large Goat Milk", 438, 1, 0) -truffle = BundleItem.item_bundle("Truffle", 430, 1, 0) -duck_feather = BundleItem.item_bundle("Duck Feather", 444, 1, 0) -duck_egg = BundleItem.item_bundle("Duck Egg", 442, 1, 0) -rabbit_foot = BundleItem.item_bundle("Rabbit's Foot", 446, 1, 0) - -truffle_oil = BundleItem.item_bundle("Truffle Oil", 432, 1, 0) -cloth = BundleItem.item_bundle("Cloth", 428, 1, 0) -goat_cheese = BundleItem.item_bundle("Goat Cheese", 426, 1, 0) -cheese = BundleItem.item_bundle("Cheese", 424, 1, 0) -honey = BundleItem.item_bundle("Honey", 340, 1, 0) -beer = BundleItem.item_bundle("Beer", 346, 1, 0) -juice = BundleItem.item_bundle("Juice", 350, 1, 0) -mead = BundleItem.item_bundle("Mead", 459, 1, 0) -pale_ale = BundleItem.item_bundle("Pale Ale", 303, 1, 0) -wine = BundleItem.item_bundle("Wine", 348, 1, 0) -jelly = BundleItem.item_bundle("Jelly", 344, 1, 0) -pickles = BundleItem.item_bundle("Pickles", 342, 1, 0) -caviar = BundleItem.item_bundle("Caviar", 445, 1, 0) -aged_roe = BundleItem.item_bundle("Aged Roe", 447, 1, 0) -apple = BundleItem.item_bundle("Apple", 613, 1, 0) -apricot = BundleItem.item_bundle("Apricot", 634, 1, 0) -orange = BundleItem.item_bundle("Orange", 635, 1, 0) -peach = BundleItem.item_bundle("Peach", 636, 1, 0) -pomegranate = BundleItem.item_bundle("Pomegranate", 637, 1, 0) -cherry = BundleItem.item_bundle("Cherry", 638, 1, 0) -lobster = BundleItem(fish_data.lobster, 1, 0) -crab = BundleItem(fish_data.crab, 1, 0) -shrimp = BundleItem(fish_data.shrimp, 1, 0) -crayfish = BundleItem(fish_data.crayfish, 1, 0) -snail = BundleItem(fish_data.snail, 1, 0) -periwinkle = BundleItem(fish_data.periwinkle, 1, 0) -trash = BundleItem.item_bundle("Trash", 168, 1, 0) -driftwood = BundleItem.item_bundle("Driftwood", 169, 1, 0) -soggy_newspaper = BundleItem.item_bundle("Soggy Newspaper", 172, 1, 0) -broken_cd = BundleItem.item_bundle("Broken CD", 171, 1, 0) -broken_glasses = BundleItem.item_bundle("Broken Glasses", 170, 1, 0) - -chub = BundleItem(fish_data.chub, 1, 0) -catfish = BundleItem(fish_data.catfish, 1, 0) -rainbow_trout = BundleItem(fish_data.rainbow_trout, 1, 0) -lingcod = BundleItem(fish_data.lingcod, 1, 0) -walleye = BundleItem(fish_data.walleye, 1, 0) -perch = BundleItem(fish_data.perch, 1, 0) -pike = BundleItem(fish_data.pike, 1, 0) -bream = BundleItem(fish_data.bream, 1, 0) -salmon = BundleItem(fish_data.salmon, 1, 0) -sunfish = BundleItem(fish_data.sunfish, 1, 0) -tiger_trout = BundleItem(fish_data.tiger_trout, 1, 0) -shad = BundleItem(fish_data.shad, 1, 0) -smallmouth_bass = BundleItem(fish_data.smallmouth_bass, 1, 0) -dorado = BundleItem(fish_data.dorado, 1, 0) -carp = BundleItem(fish_data.carp, 1, 0) -midnight_carp = BundleItem(fish_data.midnight_carp, 1, 0) -largemouth_bass = BundleItem(fish_data.largemouth_bass, 1, 0) -sturgeon = BundleItem(fish_data.sturgeon, 1, 0) -bullhead = BundleItem(fish_data.bullhead, 1, 0) -tilapia = BundleItem(fish_data.tilapia, 1, 0) -pufferfish = BundleItem(fish_data.pufferfish, 1, 0) -tuna = BundleItem(fish_data.tuna, 1, 0) -super_cucumber = BundleItem(fish_data.super_cucumber, 1, 0) -flounder = BundleItem(fish_data.flounder, 1, 0) -anchovy = BundleItem(fish_data.anchovy, 1, 0) -sardine = BundleItem(fish_data.sardine, 1, 0) -red_mullet = BundleItem(fish_data.red_mullet, 1, 0) -herring = BundleItem(fish_data.herring, 1, 0) -eel = BundleItem(fish_data.eel, 1, 0) -octopus = BundleItem(fish_data.octopus, 1, 0) -red_snapper = BundleItem(fish_data.red_snapper, 1, 0) -squid = BundleItem(fish_data.squid, 1, 0) -sea_cucumber = BundleItem(fish_data.sea_cucumber, 1, 0) -albacore = BundleItem(fish_data.albacore, 1, 0) -halibut = BundleItem(fish_data.halibut, 1, 0) -scorpion_carp = BundleItem(fish_data.scorpion_carp, 1, 0) -sandfish = BundleItem(fish_data.sandfish, 1, 0) -woodskip = BundleItem(fish_data.woodskip, 1, 0) -lava_eel = BundleItem(fish_data.lava_eel, 1, 0) -ice_pip = BundleItem(fish_data.ice_pip, 1, 0) -stonefish = BundleItem(fish_data.stonefish, 1, 0) -ghostfish = BundleItem(fish_data.ghostfish, 1, 0) - -wilted_bouquet = BundleItem.item_bundle("Wilted Bouquet", 277, 1, 0) -copper_bar = BundleItem.item_bundle("Copper Bar", 334, 2, 0) -iron_Bar = BundleItem.item_bundle("Iron Bar", 335, 2, 0) -gold_bar = BundleItem.item_bundle("Gold Bar", 336, 1, 0) -iridium_bar = BundleItem.item_bundle("Iridium Bar", 337, 1, 0) -refined_quartz = BundleItem.item_bundle("Refined Quartz", 338, 2, 0) -coal = BundleItem.item_bundle("Coal", 382, 5, 0) - -quartz = BundleItem(Mineral.quartz, 1, 0) -fire_quartz = BundleItem(Mineral.fire_quartz, 1, 0) -frozen_tear = BundleItem(Mineral.frozen_tear, 1, 0) -earth_crystal = BundleItem(Mineral.earth_crystal, 1, 0) -emerald = BundleItem(Mineral.emerald, 1, 0) -aquamarine = BundleItem(Mineral.aquamarine, 1, 0) -ruby = BundleItem(Mineral.ruby, 1, 0) -amethyst = BundleItem(Mineral.amethyst, 1, 0) -topaz = BundleItem(Mineral.topaz, 1, 0) -jade = BundleItem(Mineral.jade, 1, 0) - -slime = BundleItem.item_bundle("Slime", 766, 99, 0) -bug_meat = BundleItem.item_bundle("Bug Meat", 684, 10, 0) -bat_wing = BundleItem.item_bundle("Bat Wing", 767, 10, 0) -solar_essence = BundleItem.item_bundle("Solar Essence", 768, 1, 0) -void_essence = BundleItem.item_bundle("Void Essence", 769, 1, 0) - -maki_roll = BundleItem.item_bundle("Maki Roll", 228, 1, 0) -fried_egg = BundleItem.item_bundle("Fried Egg", 194, 1, 0) -omelet = BundleItem.item_bundle("Omelet", 195, 1, 0) -pizza = BundleItem.item_bundle("Pizza", 206, 1, 0) -hashbrowns = BundleItem.item_bundle("Hashbrowns", 210, 1, 0) -pancakes = BundleItem.item_bundle("Pancakes", 211, 1, 0) -bread = BundleItem.item_bundle("Bread", 216, 1, 0) -tortilla = BundleItem.item_bundle("Tortilla", 229, 1, 0) -triple_shot_espresso = BundleItem.item_bundle("Triple Shot Espresso", 253, 1, 0) -farmer_s_lunch = BundleItem.item_bundle("Farmer's Lunch", 240, 1, 0) -survival_burger = BundleItem.item_bundle("Survival Burger", 241, 1, 0) -dish_o_the_sea = BundleItem.item_bundle("Dish O' The Sea", 242, 1, 0) -miner_s_treat = BundleItem.item_bundle("Miner's Treat", 243, 1, 0) -roots_platter = BundleItem.item_bundle("Roots Platter", 244, 1, 0) -salad = BundleItem.item_bundle("Salad", 196, 1, 0) -cheese_cauliflower = BundleItem.item_bundle("Cheese Cauliflower", 197, 1, 0) -parsnip_soup = BundleItem.item_bundle("Parsnip Soup", 199, 1, 0) -fried_mushroom = BundleItem.item_bundle("Fried Mushroom", 205, 1, 0) -salmon_dinner = BundleItem.item_bundle("Salmon Dinner", 212, 1, 0) -pepper_poppers = BundleItem.item_bundle("Pepper Poppers", 215, 1, 0) -spaghetti = BundleItem.item_bundle("Spaghetti", 224, 1, 0) -sashimi = BundleItem.item_bundle("Sashimi", 227, 1, 0) -blueberry_tart = BundleItem.item_bundle("Blueberry Tart", 234, 1, 0) -algae_soup = BundleItem.item_bundle("Algae Soup", 456, 1, 0) -pale_broth = BundleItem.item_bundle("Pale Broth", 457, 1, 0) -chowder = BundleItem.item_bundle("Chowder", 727, 1, 0) -green_algae = BundleItem.item_bundle("Green Algae", 153, 1, 0) -white_algae = BundleItem.item_bundle("White Algae", 157, 1, 0) -geode = BundleItem.item_bundle("Geode", 535, 1, 0) -frozen_geode = BundleItem.item_bundle("Frozen Geode", 536, 1, 0) -magma_geode = BundleItem.item_bundle("Magma Geode", 537, 1, 0) -omni_geode = BundleItem.item_bundle("Omni Geode", 749, 1, 0) - -spring_foraging_items = [wild_horseradish, daffodil, leek, dandelion, salmonberry, spring_onion] -summer_foraging_items = [grape, spice_berry, sweet_pea, fiddlehead_fern, rainbow_shell] -fall_foraging_items = [common_mushroom, wild_plum, hazelnut, blackberry] -winter_foraging_items = [winter_root, crystal_fruit, snow_yam, crocus, holly, nautilus_shell] -exotic_foraging_items = [coconut, cactus_fruit, cave_carrot, red_mushroom, purple_mushroom, - maple_syrup, oak_resin, pine_tar, morel, coral, - sea_urchin, clam, cockle, mussel, oyster, seaweed] -construction_items = [wood, stone, hardwood, clay, fiber] - -# TODO coffee_bean, garlic, rhubarb, tea_leaves -spring_crop_items = [blue_jazz, cauliflower, green_bean, kale, parsnip, potato, strawberry, tulip, unmilled_rice] -# TODO red_cabbage, starfruit, ancient_fruit, pineapple, taro_root -summer_crops_items = [blueberry, corn, hops, hot_pepper, melon, poppy, - radish, summer_spangle, sunflower, tomato, wheat] -# TODO artichoke, beet -fall_crops_items = [corn, sunflower, wheat, amaranth, bok_choy, cranberries, - eggplant, fairy_rose, grape, pumpkin, yam, sweet_gem_berry] -all_crops_items = sorted({*spring_crop_items, *summer_crops_items, *fall_crops_items}) -quality_crops_items = [item.as_quality_crop() for item in all_crops_items] -# TODO void_egg, dinosaur_egg, ostrich_egg, golden_egg -animal_product_items = [egg, large_egg, brown_egg, large_brown_egg, wool, milk, large_milk, - goat_milk, large_goat_milk, truffle, duck_feather, duck_egg, rabbit_foot] -# TODO coffee, green_tea -artisan_goods_items = [truffle_oil, cloth, goat_cheese, cheese, honey, beer, juice, mead, pale_ale, wine, jelly, - pickles, caviar, aged_roe, apple, apricot, orange, peach, pomegranate, cherry] - -river_fish_items = [chub, catfish, rainbow_trout, lingcod, walleye, perch, pike, bream, - salmon, sunfish, tiger_trout, shad, smallmouth_bass, dorado] -lake_fish_items = [chub, rainbow_trout, lingcod, walleye, perch, carp, midnight_carp, largemouth_bass, sturgeon, bullhead] -ocean_fish_items = [tilapia, pufferfish, tuna, super_cucumber, flounder, anchovy, sardine, red_mullet, - herring, eel, octopus, red_snapper, squid, sea_cucumber, albacore, halibut] -night_fish_items = [walleye, bream, super_cucumber, eel, squid, midnight_carp] -# TODO void_salmon -specialty_fish_items = [scorpion_carp, sandfish, woodskip, pufferfish, eel, octopus, - squid, lava_eel, ice_pip, stonefish, ghostfish, dorado] -crab_pot_items = [lobster, clam, crab, cockle, mussel, shrimp, oyster, crayfish, snail, - periwinkle, trash, driftwood, soggy_newspaper, broken_cd, broken_glasses] - -# TODO radioactive_bar -blacksmith_items = [wilted_bouquet, copper_bar, iron_Bar, gold_bar, iridium_bar, refined_quartz, coal] -geologist_items = [quartz, earth_crystal, frozen_tear, fire_quartz, emerald, aquamarine, ruby, amethyst, topaz, jade] -adventurer_items = [slime, bug_meat, bat_wing, solar_essence, void_essence, coal] - -chef_items = [maki_roll, fried_egg, omelet, pizza, hashbrowns, pancakes, bread, tortilla, triple_shot_espresso, - farmer_s_lunch, survival_burger, dish_o_the_sea, miner_s_treat, roots_platter, salad, - cheese_cauliflower, parsnip_soup, fried_mushroom, salmon_dinner, pepper_poppers, spaghetti, - sashimi, blueberry_tart, algae_soup, pale_broth, chowder] - -dwarf_scroll_1 = BundleItem.item_bundle("Dwarf Scroll I", 96, 1, 0) -dwarf_scroll_2 = BundleItem.item_bundle("Dwarf Scroll II", 97, 1, 0) -dwarf_scroll_3 = BundleItem.item_bundle("Dwarf Scroll III", 98, 1, 0) -dwarf_scroll_4 = BundleItem.item_bundle("Dwarf Scroll IV", 99, 1, 0) -elvish_jewelry = BundleItem.item_bundle("Elvish Jewelry", 104, 1, 0) -ancient_drum = BundleItem.item_bundle("Ancient Drum", 123, 1, 0) -dried_starfish = BundleItem.item_bundle("Dried Starfish", 116, 1, 0) - +from ..bundles.bundle import BundleTemplate, IslandBundleTemplate, DeepBundleTemplate, CurrencyBundleTemplate, MoneyBundleTemplate, FestivalBundleTemplate +from ..bundles.bundle_item import BundleItem +from ..bundles.bundle_room import BundleRoomTemplate +from ..strings.animal_product_names import AnimalProduct +from ..strings.artisan_good_names import ArtisanGood +from ..strings.bundle_names import CCRoom, BundleName +from ..strings.craftable_names import Fishing, Craftable, Bomb +from ..strings.crop_names import Fruit, Vegetable +from ..strings.currency_names import Currency +from ..strings.fertilizer_names import Fertilizer, RetainingSoil, SpeedGro +from ..strings.fish_names import Fish, WaterItem, Trash +from ..strings.flower_names import Flower +from ..strings.food_names import Beverage, Meal +from ..strings.forageable_names import Forageable +from ..strings.geode_names import Geode +from ..strings.gift_names import Gift +from ..strings.ingredient_names import Ingredient +from ..strings.material_names import Material +from ..strings.metal_names import MetalBar, Artifact, Fossil, Ore, Mineral +from ..strings.monster_drop_names import Loot +from ..strings.quality_names import ForageQuality, ArtisanQuality, FishQuality +from ..strings.seed_names import Seed + +wild_horseradish = BundleItem(Forageable.wild_horseradish) +daffodil = BundleItem(Forageable.daffodil) +leek = BundleItem(Forageable.leek) +dandelion = BundleItem(Forageable.dandelion) +morel = BundleItem(Forageable.morel) +common_mushroom = BundleItem(Forageable.common_mushroom) +salmonberry = BundleItem(Forageable.salmonberry) +spring_onion = BundleItem(Forageable.spring_onion) + +grape = BundleItem(Fruit.grape) +spice_berry = BundleItem(Forageable.spice_berry) +sweet_pea = BundleItem(Forageable.sweet_pea) +red_mushroom = BundleItem(Forageable.red_mushroom) +fiddlehead_fern = BundleItem(Forageable.fiddlehead_fern) + +wild_plum = BundleItem(Forageable.wild_plum) +hazelnut = BundleItem(Forageable.hazelnut) +blackberry = BundleItem(Forageable.blackberry) +chanterelle = BundleItem(Forageable.chanterelle) + +winter_root = BundleItem(Forageable.winter_root) +crystal_fruit = BundleItem(Forageable.crystal_fruit) +snow_yam = BundleItem(Forageable.snow_yam) +crocus = BundleItem(Forageable.crocus) +holly = BundleItem(Forageable.holly) + +coconut = BundleItem(Forageable.coconut) +cactus_fruit = BundleItem(Forageable.cactus_fruit) +cave_carrot = BundleItem(Forageable.cave_carrot) +purple_mushroom = BundleItem(Forageable.purple_mushroom) +maple_syrup = BundleItem(ArtisanGood.maple_syrup) +oak_resin = BundleItem(ArtisanGood.oak_resin) +pine_tar = BundleItem(ArtisanGood.pine_tar) +nautilus_shell = BundleItem(WaterItem.nautilus_shell) +coral = BundleItem(WaterItem.coral) +sea_urchin = BundleItem(WaterItem.sea_urchin) +rainbow_shell = BundleItem(Forageable.rainbow_shell) +clam = BundleItem(Fish.clam) +cockle = BundleItem(Fish.cockle) +mussel = BundleItem(Fish.mussel) +oyster = BundleItem(Fish.oyster) +seaweed = BundleItem(WaterItem.seaweed) + +wood = BundleItem(Material.wood, 99) +stone = BundleItem(Material.stone, 99) +hardwood = BundleItem(Material.hardwood, 10) +clay = BundleItem(Material.clay, 10) +fiber = BundleItem(Material.fiber, 99) + +blue_jazz = BundleItem(Flower.blue_jazz) +cauliflower = BundleItem(Vegetable.cauliflower) +green_bean = BundleItem(Vegetable.green_bean) +kale = BundleItem(Vegetable.kale) +parsnip = BundleItem(Vegetable.parsnip) +potato = BundleItem(Vegetable.potato) +strawberry = BundleItem(Fruit.strawberry, source=BundleItem.Sources.festival) +tulip = BundleItem(Flower.tulip) +unmilled_rice = BundleItem(Vegetable.unmilled_rice) +coffee_bean = BundleItem(Seed.coffee) +garlic = BundleItem(Vegetable.garlic) +blueberry = BundleItem(Fruit.blueberry) +corn = BundleItem(Vegetable.corn) +hops = BundleItem(Vegetable.hops) +hot_pepper = BundleItem(Fruit.hot_pepper) +melon = BundleItem(Fruit.melon) +poppy = BundleItem(Flower.poppy) +radish = BundleItem(Vegetable.radish) +summer_spangle = BundleItem(Flower.summer_spangle) +sunflower = BundleItem(Flower.sunflower) +tomato = BundleItem(Vegetable.tomato) +wheat = BundleItem(Vegetable.wheat) +hay = BundleItem(Forageable.hay) +amaranth = BundleItem(Vegetable.amaranth) +bok_choy = BundleItem(Vegetable.bok_choy) +cranberries = BundleItem(Fruit.cranberries) +eggplant = BundleItem(Vegetable.eggplant) +fairy_rose = BundleItem(Flower.fairy_rose) +pumpkin = BundleItem(Vegetable.pumpkin) +yam = BundleItem(Vegetable.yam) +sweet_gem_berry = BundleItem(Fruit.sweet_gem_berry) +rhubarb = BundleItem(Fruit.rhubarb) +beet = BundleItem(Vegetable.beet) +red_cabbage = BundleItem(Vegetable.red_cabbage) +starfruit = BundleItem(Fruit.starfruit) +artichoke = BundleItem(Vegetable.artichoke) +pineapple = BundleItem(Fruit.pineapple, source=BundleItem.Sources.island) +taro_root = BundleItem(Vegetable.taro_root, source=BundleItem.Sources.island, ) + +egg = BundleItem(AnimalProduct.egg) +large_egg = BundleItem(AnimalProduct.large_egg) +brown_egg = BundleItem(AnimalProduct.brown_egg) +large_brown_egg = BundleItem(AnimalProduct.large_brown_egg) +wool = BundleItem(AnimalProduct.wool) +milk = BundleItem(AnimalProduct.milk) +large_milk = BundleItem(AnimalProduct.large_milk) +goat_milk = BundleItem(AnimalProduct.goat_milk) +large_goat_milk = BundleItem(AnimalProduct.large_goat_milk) +truffle = BundleItem(AnimalProduct.truffle) +duck_feather = BundleItem(AnimalProduct.duck_feather) +duck_egg = BundleItem(AnimalProduct.duck_egg) +rabbit_foot = BundleItem(AnimalProduct.rabbit_foot) +dinosaur_egg = BundleItem(AnimalProduct.dinosaur_egg) +void_egg = BundleItem(AnimalProduct.void_egg) +ostrich_egg = BundleItem(AnimalProduct.ostrich_egg, source=BundleItem.Sources.island, ) +golden_egg = BundleItem(AnimalProduct.golden_egg) + +truffle_oil = BundleItem(ArtisanGood.truffle_oil) +cloth = BundleItem(ArtisanGood.cloth) +goat_cheese = BundleItem(ArtisanGood.goat_cheese) +cheese = BundleItem(ArtisanGood.cheese) +honey = BundleItem(ArtisanGood.honey) +beer = BundleItem(Beverage.beer) +juice = BundleItem(ArtisanGood.juice) +mead = BundleItem(ArtisanGood.mead) +pale_ale = BundleItem(ArtisanGood.pale_ale) +wine = BundleItem(ArtisanGood.wine) +jelly = BundleItem(ArtisanGood.jelly) +pickles = BundleItem(ArtisanGood.pickles) +caviar = BundleItem(ArtisanGood.caviar) +aged_roe = BundleItem(ArtisanGood.aged_roe) +roe = BundleItem(AnimalProduct.roe) +squid_ink = BundleItem(AnimalProduct.squid_ink) +coffee = BundleItem(Beverage.coffee) +green_tea = BundleItem(ArtisanGood.green_tea) +apple = BundleItem(Fruit.apple) +apricot = BundleItem(Fruit.apricot) +orange = BundleItem(Fruit.orange) +peach = BundleItem(Fruit.peach) +pomegranate = BundleItem(Fruit.pomegranate) +cherry = BundleItem(Fruit.cherry) +banana = BundleItem(Fruit.banana, source=BundleItem.Sources.island) +mango = BundleItem(Fruit.mango, source=BundleItem.Sources.island) + +basic_fertilizer = BundleItem(Fertilizer.basic, 100) +quality_fertilizer = BundleItem(Fertilizer.quality, 20) +deluxe_fertilizer = BundleItem(Fertilizer.deluxe, 5, source=BundleItem.Sources.island) +basic_retaining_soil = BundleItem(RetainingSoil.basic, 80) +quality_retaining_soil = BundleItem(RetainingSoil.quality, 50) +deluxe_retaining_soil = BundleItem(RetainingSoil.deluxe, 20, source=BundleItem.Sources.island) +speed_gro = BundleItem(SpeedGro.basic, 40) +deluxe_speed_gro = BundleItem(SpeedGro.deluxe, 20) +hyper_speed_gro = BundleItem(SpeedGro.hyper, 5, source=BundleItem.Sources.island) +tree_fertilizer = BundleItem(Fertilizer.tree, 20) + +lobster = BundleItem(Fish.lobster) +crab = BundleItem(Fish.crab) +shrimp = BundleItem(Fish.shrimp) +crayfish = BundleItem(Fish.crayfish) +snail = BundleItem(Fish.snail) +periwinkle = BundleItem(Fish.periwinkle) +trash = BundleItem(Trash.trash) +driftwood = BundleItem(Trash.driftwood) +soggy_newspaper = BundleItem(Trash.soggy_newspaper) +broken_cd = BundleItem(Trash.broken_cd) +broken_glasses = BundleItem(Trash.broken_glasses) + +chub = BundleItem(Fish.chub) +catfish = BundleItem(Fish.catfish) +rainbow_trout = BundleItem(Fish.rainbow_trout) +lingcod = BundleItem(Fish.lingcod) +walleye = BundleItem(Fish.walleye) +perch = BundleItem(Fish.perch) +pike = BundleItem(Fish.pike) +bream = BundleItem(Fish.bream) +salmon = BundleItem(Fish.salmon) +sunfish = BundleItem(Fish.sunfish) +tiger_trout = BundleItem(Fish.tiger_trout) +shad = BundleItem(Fish.shad) +smallmouth_bass = BundleItem(Fish.smallmouth_bass) +dorado = BundleItem(Fish.dorado) +carp = BundleItem(Fish.carp) +midnight_carp = BundleItem(Fish.midnight_carp) +largemouth_bass = BundleItem(Fish.largemouth_bass) +sturgeon = BundleItem(Fish.sturgeon) +bullhead = BundleItem(Fish.bullhead) +tilapia = BundleItem(Fish.tilapia) +pufferfish = BundleItem(Fish.pufferfish) +tuna = BundleItem(Fish.tuna) +super_cucumber = BundleItem(Fish.super_cucumber) +flounder = BundleItem(Fish.flounder) +anchovy = BundleItem(Fish.anchovy) +sardine = BundleItem(Fish.sardine) +red_mullet = BundleItem(Fish.red_mullet) +herring = BundleItem(Fish.herring) +eel = BundleItem(Fish.eel) +octopus = BundleItem(Fish.octopus) +red_snapper = BundleItem(Fish.red_snapper) +squid = BundleItem(Fish.squid) +sea_cucumber = BundleItem(Fish.sea_cucumber) +albacore = BundleItem(Fish.albacore) +halibut = BundleItem(Fish.halibut) +scorpion_carp = BundleItem(Fish.scorpion_carp) +sandfish = BundleItem(Fish.sandfish) +woodskip = BundleItem(Fish.woodskip) +lava_eel = BundleItem(Fish.lava_eel) +ice_pip = BundleItem(Fish.ice_pip) +stonefish = BundleItem(Fish.stonefish) +ghostfish = BundleItem(Fish.ghostfish) + +bouquet = BundleItem(Gift.bouquet) +wilted_bouquet = BundleItem(Gift.wilted_bouquet) +copper_bar = BundleItem(MetalBar.copper) +iron_Bar = BundleItem(MetalBar.iron) +gold_bar = BundleItem(MetalBar.gold) +iridium_bar = BundleItem(MetalBar.iridium) +refined_quartz = BundleItem(MetalBar.quartz) +coal = BundleItem(Material.coal, 5) +iridium_ore = BundleItem(Ore.iridium) +gold_ore = BundleItem(Ore.gold) +iron_ore = BundleItem(Ore.iron) +copper_ore = BundleItem(Ore.copper) +battery_pack = BundleItem(ArtisanGood.battery_pack) + +quartz = BundleItem(Mineral.quartz) +fire_quartz = BundleItem(Mineral.fire_quartz) +frozen_tear = BundleItem(Mineral.frozen_tear) +earth_crystal = BundleItem(Mineral.earth_crystal) +emerald = BundleItem(Mineral.emerald) +aquamarine = BundleItem(Mineral.aquamarine) +ruby = BundleItem(Mineral.ruby) +amethyst = BundleItem(Mineral.amethyst) +topaz = BundleItem(Mineral.topaz) +jade = BundleItem(Mineral.jade) + +slime = BundleItem(Loot.slime, 99) +bug_meat = BundleItem(Loot.bug_meat, 10) +bat_wing = BundleItem(Loot.bat_wing, 10) +solar_essence = BundleItem(Loot.solar_essence) +void_essence = BundleItem(Loot.void_essence) + +petrified_slime = BundleItem(Mineral.petrified_slime) +blue_slime_egg = BundleItem(Loot.blue_slime_egg) +red_slime_egg = BundleItem(Loot.red_slime_egg) +purple_slime_egg = BundleItem(Loot.purple_slime_egg) +green_slime_egg = BundleItem(Loot.green_slime_egg) +tiger_slime_egg = BundleItem(Loot.tiger_slime_egg, source=BundleItem.Sources.island) + +cherry_bomb = BundleItem(Bomb.cherry_bomb, 5) +bomb = BundleItem(Bomb.bomb, 2) +mega_bomb = BundleItem(Bomb.mega_bomb) +explosive_ammo = BundleItem(Craftable.explosive_ammo, 5) + +maki_roll = BundleItem(Meal.maki_roll) +fried_egg = BundleItem(Meal.fried_egg) +omelet = BundleItem(Meal.omelet) +pizza = BundleItem(Meal.pizza) +hashbrowns = BundleItem(Meal.hashbrowns) +pancakes = BundleItem(Meal.pancakes) +bread = BundleItem(Meal.bread) +tortilla = BundleItem(Meal.tortilla) +triple_shot_espresso = BundleItem(Beverage.triple_shot_espresso) +farmer_s_lunch = BundleItem(Meal.farmer_lunch) +survival_burger = BundleItem(Meal.survival_burger) +dish_o_the_sea = BundleItem(Meal.dish_o_the_sea) +miner_s_treat = BundleItem(Meal.miners_treat) +roots_platter = BundleItem(Meal.roots_platter) +salad = BundleItem(Meal.salad) +cheese_cauliflower = BundleItem(Meal.cheese_cauliflower) +parsnip_soup = BundleItem(Meal.parsnip_soup) +fried_mushroom = BundleItem(Meal.fried_mushroom) +salmon_dinner = BundleItem(Meal.salmon_dinner) +pepper_poppers = BundleItem(Meal.pepper_poppers) +spaghetti = BundleItem(Meal.spaghetti) +sashimi = BundleItem(Meal.sashimi) +blueberry_tart = BundleItem(Meal.blueberry_tart) +algae_soup = BundleItem(Meal.algae_soup) +pale_broth = BundleItem(Meal.pale_broth) +chowder = BundleItem(Meal.chowder) +cookie = BundleItem(Meal.cookie) +ancient_doll = BundleItem(Artifact.ancient_doll) +ice_cream = BundleItem(Meal.ice_cream) +cranberry_candy = BundleItem(Meal.cranberry_candy) +ginger_ale = BundleItem(Beverage.ginger_ale, source=BundleItem.Sources.island) +pink_cake = BundleItem(Meal.pink_cake) +plum_pudding = BundleItem(Meal.plum_pudding) +chocolate_cake = BundleItem(Meal.chocolate_cake) +rhubarb_pie = BundleItem(Meal.rhubarb_pie) +shrimp_cocktail = BundleItem(Meal.shrimp_cocktail) +pina_colada = BundleItem(Beverage.pina_colada, source=BundleItem.Sources.island) + +green_algae = BundleItem(WaterItem.green_algae) +white_algae = BundleItem(WaterItem.white_algae) +geode = BundleItem(Geode.geode) +frozen_geode = BundleItem(Geode.frozen) +magma_geode = BundleItem(Geode.magma) +omni_geode = BundleItem(Geode.omni) +sap = BundleItem(Material.sap) + +dwarf_scroll_1 = BundleItem(Artifact.dwarf_scroll_i) +dwarf_scroll_2 = BundleItem(Artifact.dwarf_scroll_ii) +dwarf_scroll_3 = BundleItem(Artifact.dwarf_scroll_iii) +dwarf_scroll_4 = BundleItem(Artifact.dwarf_scroll_iv) +elvish_jewelry = BundleItem(Artifact.elvish_jewelry) +ancient_drum = BundleItem(Artifact.ancient_drum) +dried_starfish = BundleItem(Fossil.dried_starfish) +bone_fragment = BundleItem(Fossil.bone_fragment) + +golden_mask = BundleItem(Artifact.golden_mask) +golden_relic = BundleItem(Artifact.golden_relic) +dwarf_gadget = BundleItem(Artifact.dwarf_gadget) +dwarvish_helm = BundleItem(Artifact.dwarvish_helm) +prehistoric_handaxe = BundleItem(Artifact.prehistoric_handaxe) +bone_flute = BundleItem(Artifact.bone_flute) +anchor = BundleItem(Artifact.anchor) +prehistoric_tool = BundleItem(Artifact.prehistoric_tool) +chicken_statue = BundleItem(Artifact.chicken_statue) +rusty_cog = BundleItem(Artifact.rusty_cog) +rusty_spur = BundleItem(Artifact.rusty_spur) +rusty_spoon = BundleItem(Artifact.rusty_spoon) +ancient_sword = BundleItem(Artifact.ancient_sword) +ornamental_fan = BundleItem(Artifact.ornamental_fan) +chipped_amphora = BundleItem(Artifact.chipped_amphora) + +prehistoric_scapula = BundleItem(Fossil.prehistoric_scapula) +prehistoric_tibia = BundleItem(Fossil.prehistoric_tibia) +prehistoric_skull = BundleItem(Fossil.prehistoric_skull) +skeletal_hand = BundleItem(Fossil.skeletal_hand) +prehistoric_rib = BundleItem(Fossil.prehistoric_rib) +prehistoric_vertebra = BundleItem(Fossil.prehistoric_vertebra) +skeletal_tail = BundleItem(Fossil.skeletal_tail) +nautilus_fossil = BundleItem(Fossil.nautilus_fossil) +amphibian_fossil = BundleItem(Fossil.amphibian_fossil) +palm_fossil = BundleItem(Fossil.palm_fossil) +trilobite = BundleItem(Fossil.trilobite) + +dinosaur_mayo = BundleItem(ArtisanGood.dinosaur_mayonnaise) +void_mayo = BundleItem(ArtisanGood.void_mayonnaise) +prismatic_shard = BundleItem(Mineral.prismatic_shard) +diamond = BundleItem(Mineral.diamond) +ancient_fruit = BundleItem(Fruit.ancient_fruit) +void_salmon = BundleItem(Fish.void_salmon) +tea_leaves = BundleItem(Vegetable.tea_leaves) +blobfish = BundleItem(Fish.blobfish) +spook_fish = BundleItem(Fish.spook_fish) +lionfish = BundleItem(Fish.lionfish, source=BundleItem.Sources.island) +blue_discus = BundleItem(Fish.blue_discus, source=BundleItem.Sources.island) +stingray = BundleItem(Fish.stingray, source=BundleItem.Sources.island) +spookfish = BundleItem(Fish.spookfish) +midnight_squid = BundleItem(Fish.midnight_squid) + +angler = BundleItem(Fish.angler) +crimsonfish = BundleItem(Fish.crimsonfish) +mutant_carp = BundleItem(Fish.mutant_carp) +glacierfish = BundleItem(Fish.glacierfish) +legend = BundleItem(Fish.legend) + +spinner = BundleItem(Fishing.spinner) +dressed_spinner = BundleItem(Fishing.dressed_spinner) +trap_bobber = BundleItem(Fishing.trap_bobber) +cork_bobber = BundleItem(Fishing.cork_bobber) +lead_bobber = BundleItem(Fishing.lead_bobber) +treasure_hunter = BundleItem(Fishing.treasure_hunter) +barbed_hook = BundleItem(Fishing.barbed_hook) +curiosity_lure = BundleItem(Fishing.curiosity_lure) +quality_bobber = BundleItem(Fishing.quality_bobber) +bait = BundleItem(Fishing.bait, 100) +magnet = BundleItem(Fishing.magnet) +wild_bait = BundleItem(Fishing.wild_bait, 10) +magic_bait = BundleItem(Fishing.magic_bait, 5, source=BundleItem.Sources.island) +pearl = BundleItem(Gift.pearl) + +ginger = BundleItem(Forageable.ginger, source=BundleItem.Sources.island) +magma_cap = BundleItem(Forageable.magma_cap, source=BundleItem.Sources.island) + +wheat_flour = BundleItem(Ingredient.wheat_flour) +sugar = BundleItem(Ingredient.sugar) +vinegar = BundleItem(Ingredient.vinegar) + +# Crafts Room +spring_foraging_items_vanilla = [wild_horseradish, daffodil, leek, dandelion] +spring_foraging_items_thematic = [*spring_foraging_items_vanilla, spring_onion, salmonberry, morel] +spring_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.spring_foraging, spring_foraging_items_vanilla, 4, 4) +spring_foraging_bundle_thematic = BundleTemplate.extend_from(spring_foraging_bundle_vanilla, spring_foraging_items_thematic) + +summer_foraging_items_vanilla = [grape, spice_berry, sweet_pea] +summer_foraging_items_thematic = [*summer_foraging_items_vanilla, fiddlehead_fern, red_mushroom, rainbow_shell] +summer_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.summer_foraging, summer_foraging_items_vanilla, 3, 3) +summer_foraging_bundle_thematic = BundleTemplate.extend_from(summer_foraging_bundle_vanilla, summer_foraging_items_thematic) + +fall_foraging_items_vanilla = [common_mushroom, wild_plum, hazelnut, blackberry] +fall_foraging_items_thematic = [*fall_foraging_items_vanilla, chanterelle] +fall_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.fall_foraging, fall_foraging_items_vanilla, 4, 4) +fall_foraging_bundle_thematic = BundleTemplate.extend_from(fall_foraging_bundle_vanilla, fall_foraging_items_thematic) + +winter_foraging_items_vanilla = [winter_root, crystal_fruit, snow_yam, crocus] +winter_foraging_items_thematic = [*winter_foraging_items_vanilla, holly, nautilus_shell] +winter_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.winter_foraging, winter_foraging_items_vanilla, 4, 4) +winter_foraging_bundle_thematic = BundleTemplate.extend_from(winter_foraging_bundle_vanilla, winter_foraging_items_thematic) + +construction_items_vanilla = [wood, stone, hardwood] +construction_items_thematic = [*construction_items_vanilla, clay, fiber, sap.as_amount(50)] +construction_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.construction, construction_items_vanilla, 4, 4) +construction_bundle_thematic = BundleTemplate.extend_from(construction_bundle_vanilla, construction_items_thematic) + +exotic_foraging_items_vanilla = [coconut, cactus_fruit, cave_carrot, red_mushroom, purple_mushroom, maple_syrup, oak_resin, pine_tar, morel] +exotic_foraging_items_thematic = [*exotic_foraging_items_vanilla, coral, sea_urchin, clam, cockle, mussel, oyster, seaweed] +exotic_foraging_bundle_vanilla = BundleTemplate(CCRoom.crafts_room, BundleName.exotic_foraging, exotic_foraging_items_vanilla, 9, 5) +exotic_foraging_bundle_thematic = BundleTemplate.extend_from(exotic_foraging_bundle_vanilla, exotic_foraging_items_thematic) + +beach_foraging_items = [nautilus_shell, coral, sea_urchin, rainbow_shell, clam, cockle, mussel, oyster, seaweed] +beach_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.beach_foraging, beach_foraging_items, 4, 4) + +mines_foraging_items = [quartz, earth_crystal, frozen_tear, fire_quartz, red_mushroom, purple_mushroom, cave_carrot] +mines_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.mines_foraging, mines_foraging_items, 4, 4) + +desert_foraging_items = [cactus_fruit.as_quality(ForageQuality.gold), cactus_fruit.as_amount(5), coconut.as_quality(ForageQuality.gold), coconut.as_amount(5)] +desert_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.desert_foraging, desert_foraging_items, 2, 2) + +island_foraging_items = [ginger.as_amount(5), magma_cap.as_quality(ForageQuality.gold), magma_cap.as_amount(5), + fiddlehead_fern.as_quality(ForageQuality.gold), fiddlehead_fern.as_amount(5)] +island_foraging_bundle = IslandBundleTemplate(CCRoom.crafts_room, BundleName.island_foraging, island_foraging_items, 2, 2) + +sticky_items = [sap.as_amount(500), sap.as_amount(500)] +sticky_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.sticky, sticky_items, 1, 1) + +wild_medicine_items = [item.as_amount(5) for item in [purple_mushroom, fiddlehead_fern, white_algae, hops, blackberry, dandelion]] +wild_medicine_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.wild_medicine, wild_medicine_items, 4, 3) + +quality_foraging_items = sorted({item.as_quality(ForageQuality.gold).as_amount(1) + for item in + [*spring_foraging_items_thematic, *summer_foraging_items_thematic, *fall_foraging_items_thematic, + *winter_foraging_items_thematic, *beach_foraging_items, *desert_foraging_items, magma_cap]}) +quality_foraging_bundle = BundleTemplate(CCRoom.crafts_room, BundleName.quality_foraging, quality_foraging_items, 4, 3) + +crafts_room_bundles_vanilla = [spring_foraging_bundle_vanilla, summer_foraging_bundle_vanilla, fall_foraging_bundle_vanilla, + winter_foraging_bundle_vanilla, construction_bundle_vanilla, exotic_foraging_bundle_vanilla] +crafts_room_bundles_thematic = [spring_foraging_bundle_thematic, summer_foraging_bundle_thematic, fall_foraging_bundle_thematic, + winter_foraging_bundle_thematic, construction_bundle_thematic, exotic_foraging_bundle_thematic] +crafts_room_bundles_remixed = [*crafts_room_bundles_thematic, beach_foraging_bundle, mines_foraging_bundle, desert_foraging_bundle, + island_foraging_bundle, sticky_bundle, wild_medicine_bundle, quality_foraging_bundle] +crafts_room_vanilla = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_vanilla, 6) +crafts_room_thematic = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_thematic, 6) +crafts_room_remixed = BundleRoomTemplate(CCRoom.crafts_room, crafts_room_bundles_remixed, 6) + +# Pantry +spring_crops_items_vanilla = [parsnip, green_bean, cauliflower, potato] +spring_crops_items_thematic = [*spring_crops_items_vanilla, blue_jazz, coffee_bean, garlic, kale, rhubarb, strawberry, tulip, unmilled_rice] +spring_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.spring_crops, spring_crops_items_vanilla, 4, 4) +spring_crops_bundle_thematic = BundleTemplate.extend_from(spring_crops_bundle_vanilla, spring_crops_items_thematic) + +summer_crops_items_vanilla = [tomato, hot_pepper, blueberry, melon] +summer_crops_items_thematic = [*summer_crops_items_vanilla, corn, hops, poppy, radish, red_cabbage, starfruit, summer_spangle, sunflower, wheat] +summer_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.summer_crops, summer_crops_items_vanilla, 4, 4) +summer_crops_bundle_thematic = BundleTemplate.extend_from(summer_crops_bundle_vanilla, summer_crops_items_thematic) + +fall_crops_items_vanilla = [corn, eggplant, pumpkin, yam] +fall_crops_items_thematic = [*fall_crops_items_vanilla, amaranth, artichoke, beet, bok_choy, cranberries, fairy_rose, grape, sunflower, wheat, sweet_gem_berry] +fall_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.fall_crops, fall_crops_items_vanilla, 4, 4) +fall_crops_bundle_thematic = BundleTemplate.extend_from(fall_crops_bundle_vanilla, fall_crops_items_thematic) + +all_crops_items = sorted({*spring_crops_items_thematic, *summer_crops_items_thematic, *fall_crops_items_thematic}) + +quality_crops_items_vanilla = [item.as_quality_crop() for item in [parsnip, melon, pumpkin, corn]] +quality_crops_items_thematic = [item.as_quality_crop() for item in all_crops_items] +quality_crops_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.quality_crops, quality_crops_items_vanilla, 4, 3) +quality_crops_bundle_thematic = BundleTemplate.extend_from(quality_crops_bundle_vanilla, quality_crops_items_thematic) + +animal_items_vanilla = [large_milk, large_brown_egg, large_egg, large_goat_milk, wool, duck_egg] +animal_items_thematic = [*animal_items_vanilla, egg, brown_egg, milk, goat_milk, truffle, + duck_feather, rabbit_foot, dinosaur_egg, void_egg, golden_egg, ostrich_egg] +animal_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.animal, animal_items_vanilla, 6, 5) +animal_bundle_thematic = BundleTemplate.extend_from(animal_bundle_vanilla, animal_items_thematic) + +artisan_items_vanilla = [truffle_oil, cloth, goat_cheese, cheese, honey, jelly, apple, apricot, orange, peach, pomegranate, cherry] +artisan_items_thematic = [*artisan_items_vanilla, beer, juice, mead, pale_ale, wine, pickles, caviar, aged_roe, coffee, green_tea, banana, mango] +artisan_bundle_vanilla = BundleTemplate(CCRoom.pantry, BundleName.artisan, artisan_items_vanilla, 12, 6) +artisan_bundle_thematic = BundleTemplate.extend_from(artisan_bundle_vanilla, artisan_items_thematic) + +rare_crops_items = [ancient_fruit, sweet_gem_berry] +rare_crops_bundle = BundleTemplate(CCRoom.pantry, BundleName.rare_crops, rare_crops_items, 2, 2) + +fish_farmer_items = [roe.as_amount(15), aged_roe.as_amount(15), squid_ink] +fish_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.fish_farmer, fish_farmer_items, 3, 2) + +garden_items = [tulip, blue_jazz, summer_spangle, sunflower, fairy_rose, poppy, bouquet] +garden_bundle = BundleTemplate(CCRoom.pantry, BundleName.garden, garden_items, 5, 4) + +brewer_items = [mead, pale_ale, wine, juice, green_tea, beer] +brewer_bundle = BundleTemplate(CCRoom.pantry, BundleName.brewer, brewer_items, 5, 4) + +orchard_items = [apple, apricot, orange, peach, pomegranate, cherry, banana, mango] +orchard_bundle = BundleTemplate(CCRoom.pantry, BundleName.orchard, orchard_items, 6, 4) + +island_crops_items = [pineapple, taro_root, banana, mango] +island_crops_bundle = IslandBundleTemplate(CCRoom.pantry, BundleName.island_crops, island_crops_items, 3, 3) + +agronomist_items = [basic_fertilizer, quality_fertilizer, deluxe_fertilizer, + basic_retaining_soil, quality_retaining_soil, deluxe_retaining_soil, + speed_gro, deluxe_speed_gro, hyper_speed_gro, tree_fertilizer] +agronomist_bundle = BundleTemplate(CCRoom.pantry, BundleName.agronomist, agronomist_items, 4, 3) + +slime_farmer_items = [slime.as_amount(99), petrified_slime.as_amount(10), blue_slime_egg, red_slime_egg, + purple_slime_egg, green_slime_egg, tiger_slime_egg] +slime_farmer_bundle = BundleTemplate(CCRoom.pantry, BundleName.slime_farmer, slime_farmer_items, 4, 3) + +pantry_bundles_vanilla = [spring_crops_bundle_vanilla, summer_crops_bundle_vanilla, fall_crops_bundle_vanilla, + quality_crops_bundle_vanilla, animal_bundle_vanilla, artisan_bundle_vanilla] +pantry_bundles_thematic = [spring_crops_bundle_thematic, summer_crops_bundle_thematic, fall_crops_bundle_thematic, + quality_crops_bundle_thematic, animal_bundle_thematic, artisan_bundle_thematic] +pantry_bundles_remixed = [*pantry_bundles_thematic, rare_crops_bundle, fish_farmer_bundle, garden_bundle, + brewer_bundle, orchard_bundle, island_crops_bundle, agronomist_bundle, slime_farmer_bundle] +pantry_vanilla = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_vanilla, 6) +pantry_thematic = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_thematic, 6) +pantry_remixed = BundleRoomTemplate(CCRoom.pantry, pantry_bundles_remixed, 6) + +# Fish Tank +river_fish_items_vanilla = [sunfish, catfish, shad, tiger_trout] +river_fish_items_thematic = [*river_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, pike, bream, salmon, smallmouth_bass, dorado] +river_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.river_fish, river_fish_items_vanilla, 4, 4) +river_fish_bundle_thematic = BundleTemplate.extend_from(river_fish_bundle_vanilla, river_fish_items_thematic) + +lake_fish_items_vanilla = [largemouth_bass, carp, bullhead, sturgeon] +lake_fish_items_thematic = [*lake_fish_items_vanilla, chub, rainbow_trout, lingcod, walleye, perch, midnight_carp] +lake_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.lake_fish, lake_fish_items_vanilla, 4, 4) +lake_fish_bundle_thematic = BundleTemplate.extend_from(lake_fish_bundle_vanilla, lake_fish_items_thematic) + +ocean_fish_items_vanilla = [sardine, tuna, red_snapper, tilapia] +ocean_fish_items_thematic = [*ocean_fish_items_vanilla, pufferfish, super_cucumber, flounder, anchovy, red_mullet, + herring, eel, octopus, squid, sea_cucumber, albacore, halibut] +ocean_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.ocean_fish, ocean_fish_items_vanilla, 4, 4) +ocean_fish_bundle_thematic = BundleTemplate.extend_from(ocean_fish_bundle_vanilla, ocean_fish_items_thematic) + +night_fish_items_vanilla = [walleye, bream, eel] +night_fish_items_thematic = [*night_fish_items_vanilla, super_cucumber, squid, midnight_carp, midnight_squid] +night_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.night_fish, night_fish_items_vanilla, 3, 3) +night_fish_bundle_thematic = BundleTemplate.extend_from(night_fish_bundle_vanilla, night_fish_items_thematic) + +crab_pot_items_vanilla = [lobster, crayfish, crab, cockle, mussel, shrimp, snail, periwinkle, oyster, clam] +crab_pot_trash_items = [trash, driftwood, soggy_newspaper, broken_cd, broken_glasses] +crab_pot_items_thematic = [*crab_pot_items_vanilla, *crab_pot_trash_items] +crab_pot_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.crab_pot, crab_pot_items_vanilla, 10, 5) +crab_pot_bundle_thematic = BundleTemplate.extend_from(crab_pot_bundle_vanilla, crab_pot_items_thematic) +trash_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.trash, crab_pot_trash_items, 4, 4) + +specialty_fish_items_vanilla = [pufferfish, ghostfish, sandfish, woodskip] +specialty_fish_items_thematic = [*specialty_fish_items_vanilla, scorpion_carp, eel, octopus, lava_eel, ice_pip, + stonefish, void_salmon, stingray, spookfish, midnight_squid] +specialty_fish_bundle_vanilla = BundleTemplate(CCRoom.fish_tank, BundleName.specialty_fish, specialty_fish_items_vanilla, 4, 4) +specialty_fish_bundle_thematic = BundleTemplate.extend_from(specialty_fish_bundle_vanilla, specialty_fish_items_thematic) + +spring_fish_items = [herring, halibut, shad, flounder, sunfish, sardine, catfish, anchovy, smallmouth_bass, eel, legend] +spring_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.spring_fish, spring_fish_items, 4, 4) + +summer_fish_items = [tuna, pike, red_mullet, sturgeon, red_snapper, super_cucumber, tilapia, pufferfish, rainbow_trout, + octopus, dorado, halibut, shad, flounder, sunfish, crimsonfish] +summer_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.summer_fish, summer_fish_items, 4, 4) + +fall_fish_items = [red_snapper, super_cucumber, tilapia, shad, sardine, catfish, anchovy, smallmouth_bass, eel, midnight_carp, + walleye, sea_cucumber, tiger_trout, albacore, salmon, angler] +fall_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.fall_fish, fall_fish_items, 4, 4) + +winter_fish_items = [perch, squid, lingcod, tuna, pike, red_mullet, sturgeon, red_snapper, herring, halibut, sardine, + midnight_carp, sea_cucumber, tiger_trout, albacore, glacierfish] +winter_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.winter_fish, winter_fish_items, 4, 4) + +rain_fish_items = [red_snapper, shad, catfish, eel, walleye] +rain_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.rain_fish, rain_fish_items, 3, 3) + +quality_fish_items = sorted({item.as_quality(FishQuality.gold) for item in [*river_fish_items_thematic, *lake_fish_items_thematic, *ocean_fish_items_thematic]}) +quality_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.quality_fish, quality_fish_items, 4, 4) + +master_fisher_items = [lava_eel, scorpion_carp, octopus, blobfish, lingcod, ice_pip, super_cucumber, stingray, void_salmon, pufferfish] +master_fisher_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.master_fisher, master_fisher_items, 4, 2) + +legendary_fish_items = [angler, legend, mutant_carp, crimsonfish, glacierfish] +legendary_fish_bundle = BundleTemplate(CCRoom.fish_tank, BundleName.legendary_fish, legendary_fish_items, 4, 2) + +island_fish_items = [lionfish, blue_discus, stingray] +island_fish_bundle = IslandBundleTemplate(CCRoom.fish_tank, BundleName.island_fish, island_fish_items, 3, 3) + +tackle_items = [spinner, dressed_spinner, trap_bobber, cork_bobber, lead_bobber, treasure_hunter, barbed_hook, curiosity_lure, quality_bobber] +tackle_bundle = IslandBundleTemplate(CCRoom.fish_tank, BundleName.tackle, tackle_items, 3, 2) + +bait_items = [bait, magnet, wild_bait, magic_bait] +bait_bundle = IslandBundleTemplate(CCRoom.fish_tank, BundleName.bait, bait_items, 2, 2) + +deep_fishing_items = [blobfish, spook_fish, midnight_squid, sea_cucumber, super_cucumber, octopus, pearl, seaweed] +deep_fishing_bundle = FestivalBundleTemplate(CCRoom.fish_tank, BundleName.deep_fishing, deep_fishing_items, 4, 3) + +fish_tank_bundles_vanilla = [river_fish_bundle_vanilla, lake_fish_bundle_vanilla, ocean_fish_bundle_vanilla, + night_fish_bundle_vanilla, crab_pot_bundle_vanilla, specialty_fish_bundle_vanilla] +fish_tank_bundles_thematic = [river_fish_bundle_thematic, lake_fish_bundle_thematic, ocean_fish_bundle_thematic, + night_fish_bundle_thematic, crab_pot_bundle_thematic, specialty_fish_bundle_thematic] +fish_tank_bundles_remixed = [*fish_tank_bundles_thematic, spring_fish_bundle, summer_fish_bundle, fall_fish_bundle, winter_fish_bundle, trash_bundle, + rain_fish_bundle, quality_fish_bundle, master_fisher_bundle, legendary_fish_bundle, tackle_bundle, bait_bundle] + +# In Remixed, the trash items are in the recycling bundle, so we don't use the thematic version of the crab pot bundle that added trash items to it +fish_tank_bundles_remixed.remove(crab_pot_bundle_thematic) +fish_tank_bundles_remixed.append(crab_pot_bundle_vanilla) +fish_tank_vanilla = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_vanilla, 6) +fish_tank_thematic = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_thematic, 6) +fish_tank_remixed = BundleRoomTemplate(CCRoom.fish_tank, fish_tank_bundles_remixed, 6) + +# Boiler Room +blacksmith_items_vanilla = [copper_bar, iron_Bar, gold_bar] +blacksmith_items_thematic = [*blacksmith_items_vanilla, iridium_bar, refined_quartz.as_amount(3), wilted_bouquet] +blacksmith_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.blacksmith, blacksmith_items_vanilla, 3, 3) +blacksmith_bundle_thematic = BundleTemplate.extend_from(blacksmith_bundle_vanilla, blacksmith_items_thematic) + +geologist_items_vanilla = [quartz, earth_crystal, frozen_tear, fire_quartz] +geologist_items_thematic = [*geologist_items_vanilla, emerald, aquamarine, ruby, amethyst, topaz, jade, diamond] +geologist_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.geologist, geologist_items_vanilla, 4, 4) +geologist_bundle_thematic = BundleTemplate.extend_from(geologist_bundle_vanilla, geologist_items_thematic) + +adventurer_items_vanilla = [slime, bat_wing, solar_essence, void_essence] +adventurer_items_thematic = [*adventurer_items_vanilla, bug_meat, coal, bone_fragment.as_amount(10)] +adventurer_bundle_vanilla = BundleTemplate(CCRoom.boiler_room, BundleName.adventurer, adventurer_items_vanilla, 4, 2) +adventurer_bundle_thematic = BundleTemplate.extend_from(adventurer_bundle_vanilla, adventurer_items_thematic) + +# Where to put radioactive bar? +treasure_hunter_items = [emerald, aquamarine, ruby, amethyst, topaz, jade, diamond] +treasure_hunter_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.treasure_hunter, treasure_hunter_items, 6, 5) + +engineer_items = [iridium_ore.as_amount(5), battery_pack, refined_quartz.as_amount(5), diamond] +engineer_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.engineer, engineer_items, 3, 3) + +demolition_items = [cherry_bomb, bomb, mega_bomb, explosive_ammo] +demolition_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.demolition, demolition_items, 3, 3) + +recycling_items = [stone, coal, iron_ore, wood, cloth, refined_quartz] +recycling_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.recycling, recycling_items, 4, 4) + +archaeologist_items = [golden_mask, golden_relic, ancient_drum, dwarf_gadget, dwarvish_helm, prehistoric_handaxe, bone_flute, anchor, prehistoric_tool, + chicken_statue, rusty_cog, rusty_spur, rusty_spoon, ancient_sword, ornamental_fan, elvish_jewelry, ancient_doll, chipped_amphora] +archaeologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.archaeologist, archaeologist_items, 6, 3) + +paleontologist_items = [prehistoric_scapula, prehistoric_tibia, prehistoric_skull, skeletal_hand, prehistoric_rib, prehistoric_vertebra, skeletal_tail, + nautilus_fossil, amphibian_fossil, palm_fossil, trilobite] +paleontologist_bundle = BundleTemplate(CCRoom.boiler_room, BundleName.paleontologist, paleontologist_items, 6, 3) + +boiler_room_bundles_vanilla = [blacksmith_bundle_vanilla, geologist_bundle_vanilla, adventurer_bundle_vanilla] +boiler_room_bundles_thematic = [blacksmith_bundle_thematic, geologist_bundle_thematic, adventurer_bundle_thematic] +boiler_room_bundles_remixed = [*boiler_room_bundles_thematic, treasure_hunter_bundle, engineer_bundle, + demolition_bundle, recycling_bundle, archaeologist_bundle, paleontologist_bundle] +boiler_room_vanilla = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_vanilla, 3) +boiler_room_thematic = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_thematic, 3) +boiler_room_remixed = BundleRoomTemplate(CCRoom.boiler_room, boiler_room_bundles_remixed, 3) + +# Bulletin Board +chef_items_vanilla = [maple_syrup, fiddlehead_fern, truffle, poppy, maki_roll, fried_egg] +# More recipes? +chef_items_thematic = [maki_roll, fried_egg, omelet, pizza, hashbrowns, pancakes, bread, tortilla, + farmer_s_lunch, survival_burger, dish_o_the_sea, miner_s_treat, roots_platter, salad, + cheese_cauliflower, parsnip_soup, fried_mushroom, salmon_dinner, pepper_poppers, spaghetti, + sashimi, blueberry_tart, algae_soup, pale_broth, chowder] +chef_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.chef, chef_items_vanilla, 6, 6) +chef_bundle_thematic = BundleTemplate.extend_from(chef_bundle_vanilla, chef_items_thematic) + +dye_items_vanilla = [red_mushroom, sea_urchin, sunflower, duck_feather, aquamarine, red_cabbage] dye_red_items = [cranberries, hot_pepper, radish, rhubarb, spaghetti, strawberry, tomato, tulip] dye_orange_items = [poppy, pumpkin, apricot, orange, spice_berry, winter_root] dye_yellow_items = [corn, parsnip, summer_spangle, sunflower] dye_green_items = [fiddlehead_fern, kale, artichoke, bok_choy, green_bean] dye_blue_items = [blueberry, blue_jazz, blackberry, crystal_fruit] dye_purple_items = [beet, crocus, eggplant, red_cabbage, sweet_pea] -dye_items = [dye_red_items, dye_orange_items, dye_yellow_items, dye_green_items, dye_blue_items, dye_purple_items] -field_research_items = [purple_mushroom, nautilus_shell, chub, geode, frozen_geode, magma_geode, omni_geode, - rainbow_shell, amethyst, bream, carp] -fodder_items = [wheat.as_amount(10), hay.as_amount(10), apple.as_amount(3), kale.as_amount(3), corn.as_amount(3), - green_bean.as_amount(3), potato.as_amount(3), green_algae.as_amount(5), white_algae.as_amount(3)] -enchanter_items = [oak_resin, wine, rabbit_foot, pomegranate, purple_mushroom, solar_essence, - super_cucumber, void_essence, fire_quartz, frozen_tear, jade] - -vault_2500_items = [BundleItem.money_bundle(2500)] -vault_5000_items = [BundleItem.money_bundle(5000)] -vault_10000_items = [BundleItem.money_bundle(10000)] -vault_25000_items = [BundleItem.money_bundle(25000)] - -crafts_room_bundle_items = [ - *spring_foraging_items, - *summer_foraging_items, - *fall_foraging_items, - *winter_foraging_items, - *exotic_foraging_items, - *construction_items, -] - -pantry_bundle_items = sorted({ - *spring_crop_items, - *summer_crops_items, - *fall_crops_items, - *quality_crops_items, - *animal_product_items, - *artisan_goods_items, -}) - -fish_tank_bundle_items = sorted({ - *river_fish_items, - *lake_fish_items, - *ocean_fish_items, - *night_fish_items, - *crab_pot_items, - *specialty_fish_items, -}) - -boiler_room_bundle_items = sorted({ - *blacksmith_items, - *geologist_items, - *adventurer_items, -}) - -bulletin_board_bundle_items = sorted({ - *chef_items, - *[item for dye_color_items in dye_items for item in dye_color_items], - *field_research_items, - *fodder_items, - *enchanter_items -}) - -vault_bundle_items = [ - *vault_2500_items, - *vault_5000_items, - *vault_10000_items, - *vault_25000_items, -] - -all_bundle_items_except_money = sorted({ - *crafts_room_bundle_items, - *pantry_bundle_items, - *fish_tank_bundle_items, - *boiler_room_bundle_items, - *bulletin_board_bundle_items, -}, key=lambda x: x.item.name) - -all_bundle_items = sorted({ - *crafts_room_bundle_items, - *pantry_bundle_items, - *fish_tank_bundle_items, - *boiler_room_bundle_items, - *bulletin_board_bundle_items, - *vault_bundle_items, -}, key=lambda x: x.item.name) - -all_bundle_items_by_name = {item.item.name: item for item in all_bundle_items} -all_bundle_items_by_id = {item.item.item_id: item for item in all_bundle_items} +dye_items_thematic = [dye_red_items, dye_orange_items, dye_yellow_items, dye_green_items, dye_blue_items, dye_purple_items] +dye_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_vanilla, 6, 6) +dye_bundle_thematic = DeepBundleTemplate(CCRoom.bulletin_board, BundleName.dye, dye_items_thematic, 6, 6) + +field_research_items_vanilla = [purple_mushroom, nautilus_shell, chub, frozen_geode] +field_research_items_thematic = [*field_research_items_vanilla, geode, magma_geode, omni_geode, + rainbow_shell, amethyst, bream, carp] +field_research_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.field_research, field_research_items_vanilla, 4, 4) +field_research_bundle_thematic = BundleTemplate.extend_from(field_research_bundle_vanilla, field_research_items_thematic) + +fodder_items_vanilla = [wheat.as_amount(10), hay.as_amount(10), apple.as_amount(3)] +fodder_items_thematic = [*fodder_items_vanilla, kale.as_amount(3), corn.as_amount(3), green_bean.as_amount(3), + potato.as_amount(3), green_algae.as_amount(5), white_algae.as_amount(3)] +fodder_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.fodder, fodder_items_vanilla, 3, 3) +fodder_bundle_thematic = BundleTemplate.extend_from(fodder_bundle_vanilla, fodder_items_thematic) + +enchanter_items_vanilla = [oak_resin, wine, rabbit_foot, pomegranate] +enchanter_items_thematic = [*enchanter_items_vanilla, purple_mushroom, solar_essence, + super_cucumber, void_essence, fire_quartz, frozen_tear, jade] +enchanter_bundle_vanilla = BundleTemplate(CCRoom.bulletin_board, BundleName.enchanter, enchanter_items_vanilla, 4, 4) +enchanter_bundle_thematic = BundleTemplate.extend_from(enchanter_bundle_vanilla, enchanter_items_thematic) + +children_items = [salmonberry.as_amount(10), cookie, ancient_doll, ice_cream, cranberry_candy, ginger_ale, + grape.as_amount(10), pink_cake, snail, fairy_rose, plum_pudding] +children_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.children, children_items, 4, 3) + +forager_items = [salmonberry.as_amount(50), blackberry.as_amount(50), wild_plum.as_amount(20), snow_yam.as_amount(20), + common_mushroom.as_amount(20), grape.as_amount(20), spring_onion.as_amount(20)] +forager_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.forager, forager_items, 3, 2) + +home_cook_items = [egg.as_amount(10), milk.as_amount(10), wheat_flour.as_amount(100), sugar.as_amount(100), vinegar.as_amount(100), + chocolate_cake, pancakes, rhubarb_pie] +home_cook_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.home_cook, home_cook_items, 3, 3) + +bartender_items = [shrimp_cocktail, triple_shot_espresso, ginger_ale, cranberry_candy, beer, pale_ale, pina_colada] +bartender_bundle = BundleTemplate(CCRoom.bulletin_board, BundleName.bartender, bartender_items, 3, 3) + +bulletin_board_bundles_vanilla = [chef_bundle_vanilla, dye_bundle_vanilla, field_research_bundle_vanilla, fodder_bundle_vanilla, enchanter_bundle_vanilla] +bulletin_board_bundles_thematic = [chef_bundle_thematic, dye_bundle_thematic, field_research_bundle_thematic, fodder_bundle_thematic, enchanter_bundle_thematic] +bulletin_board_bundles_remixed = [*bulletin_board_bundles_thematic, children_bundle, forager_bundle, home_cook_bundle, bartender_bundle] +bulletin_board_vanilla = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_vanilla, 5) +bulletin_board_thematic = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_thematic, 5) +bulletin_board_remixed = BundleRoomTemplate(CCRoom.bulletin_board, bulletin_board_bundles_remixed, 5) + +missing_bundle_items_vanilla = [wine.as_quality(ArtisanQuality.silver), dinosaur_mayo, prismatic_shard, caviar, + ancient_fruit.as_quality_crop(), void_salmon.as_quality(FishQuality.gold)] +missing_bundle_items_thematic = [*missing_bundle_items_vanilla, pale_ale.as_quality(ArtisanQuality.silver), beer.as_quality(ArtisanQuality.silver), + mead.as_quality(ArtisanQuality.silver), + cheese.as_quality(ArtisanQuality.silver), goat_cheese.as_quality(ArtisanQuality.silver), void_mayo, cloth, green_tea, + truffle_oil, diamond, + sweet_gem_berry.as_quality_crop(), starfruit.as_quality_crop(), + tea_leaves.as_amount(5), lava_eel.as_quality(FishQuality.gold), scorpion_carp.as_quality(FishQuality.gold), + blobfish.as_quality(FishQuality.gold)] +missing_bundle_vanilla = BundleTemplate(CCRoom.abandoned_joja_mart, BundleName.missing_bundle, missing_bundle_items_vanilla, 6, 5) +missing_bundle_thematic = BundleTemplate.extend_from(missing_bundle_vanilla, missing_bundle_items_thematic) + +abandoned_joja_mart_bundles_vanilla = [missing_bundle_vanilla] +abandoned_joja_mart_bundles_thematic = [missing_bundle_thematic] +abandoned_joja_mart_vanilla = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_vanilla, 1) +abandoned_joja_mart_thematic = BundleRoomTemplate(CCRoom.abandoned_joja_mart, abandoned_joja_mart_bundles_thematic, 1) +abandoned_joja_mart_remixed = abandoned_joja_mart_thematic + +# Make thematic with other currencies +vault_2500_gold = BundleItem.money_bundle(2500) +vault_5000_gold = BundleItem.money_bundle(5000) +vault_10000_gold = BundleItem.money_bundle(10000) +vault_25000_gold = BundleItem.money_bundle(25000) + +vault_2500_bundle = MoneyBundleTemplate(CCRoom.vault, vault_2500_gold) +vault_5000_bundle = MoneyBundleTemplate(CCRoom.vault, vault_5000_gold) +vault_10000_bundle = MoneyBundleTemplate(CCRoom.vault, vault_10000_gold) +vault_25000_bundle = MoneyBundleTemplate(CCRoom.vault, vault_25000_gold) + +vault_gambler_items = BundleItem(Currency.qi_coin, 10000) +vault_gambler_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.gambler, vault_gambler_items) + +vault_carnival_items = BundleItem(Currency.star_token, 2500, source=BundleItem.Sources.festival) +vault_carnival_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.carnival, vault_carnival_items) + +vault_walnut_hunter_items = BundleItem(Currency.golden_walnut, 25) +vault_walnut_hunter_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.walnut_hunter, vault_walnut_hunter_items) + +vault_qi_helper_items = BundleItem(Currency.qi_gem, 25, source=BundleItem.Sources.island) +vault_qi_helper_bundle = CurrencyBundleTemplate(CCRoom.vault, BundleName.qi_helper, vault_qi_helper_items) + +vault_bundles_vanilla = [vault_2500_bundle, vault_5000_bundle, vault_10000_bundle, vault_25000_bundle] +vault_bundles_thematic = vault_bundles_vanilla +vault_bundles_remixed = [*vault_bundles_vanilla, vault_gambler_bundle, vault_qi_helper_bundle, vault_carnival_bundle] # , vault_walnut_hunter_bundle +vault_vanilla = BundleRoomTemplate(CCRoom.vault, vault_bundles_vanilla, 4) +vault_thematic = BundleRoomTemplate(CCRoom.vault, vault_bundles_thematic, 4) +vault_remixed = BundleRoomTemplate(CCRoom.vault, vault_bundles_remixed, 4) + +all_bundle_items_except_money = [] +all_remixed_bundles = [*crafts_room_bundles_remixed, *pantry_bundles_remixed, *fish_tank_bundles_remixed, + *boiler_room_bundles_remixed, *bulletin_board_bundles_remixed, missing_bundle_thematic] +for bundle in all_remixed_bundles: + all_bundle_items_except_money.extend(bundle.items) + +all_bundle_items_by_name = {item.item_name: item for item in all_bundle_items_except_money} diff --git a/worlds/stardew_valley/data/common_data.py b/worlds/stardew_valley/data/common_data.py deleted file mode 100644 index 8a2d0f5eecfc..000000000000 --- a/worlds/stardew_valley/data/common_data.py +++ /dev/null @@ -1,9 +0,0 @@ -fishing_chest = "Fishing Chest" -secret_note = "Secret Note" - -quality_dict = { - 0: "", - 1: "Silver", - 2: "Gold", - 3: "Iridium" -} diff --git a/worlds/stardew_valley/data/craftable_data.py b/worlds/stardew_valley/data/craftable_data.py new file mode 100644 index 000000000000..bfb2d25ec6b8 --- /dev/null +++ b/worlds/stardew_valley/data/craftable_data.py @@ -0,0 +1,313 @@ +from typing import Dict, List, Optional + +from ..mods.mod_data import ModNames +from .recipe_source import RecipeSource, StarterSource, QueenOfSauceSource, ShopSource, SkillSource, FriendshipSource, ShopTradeSource, CutsceneSource, \ + ArchipelagoSource, LogicSource, SpecialOrderSource, FestivalShopSource, QuestSource +from ..strings.artisan_good_names import ArtisanGood +from ..strings.craftable_names import Bomb, Fence, Sprinkler, WildSeeds, Floor, Fishing, Ring, Consumable, Edible, Lighting, Storage, Furniture, Sign, Craftable, \ + ModEdible, ModCraftable, ModMachine, ModFloor, ModConsumable +from ..strings.crop_names import Fruit, Vegetable +from ..strings.currency_names import Currency +from ..strings.fertilizer_names import Fertilizer, RetainingSoil, SpeedGro +from ..strings.fish_names import Fish, WaterItem +from ..strings.flower_names import Flower +from ..strings.food_names import Meal +from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable +from ..strings.ingredient_names import Ingredient +from ..strings.machine_names import Machine +from ..strings.material_names import Material +from ..strings.metal_names import Ore, MetalBar, Fossil, Artifact, Mineral, ModFossil +from ..strings.monster_drop_names import Loot +from ..strings.quest_names import Quest +from ..strings.region_names import Region, SVERegion +from ..strings.seed_names import Seed, TreeSeed +from ..strings.skill_names import Skill, ModSkill +from ..strings.special_order_names import SpecialOrder +from ..strings.villager_names import NPC, ModNPC + + +class CraftingRecipe: + item: str + ingredients: Dict[str, int] + source: RecipeSource + mod_name: Optional[str] + + def __init__(self, item: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None): + self.item = item + self.ingredients = ingredients + self.source = source + self.mod_name = mod_name + + def __repr__(self): + return f"{self.item} (Source: {self.source} |" \ + f" Ingredients: {self.ingredients})" + + +all_crafting_recipes: List[CraftingRecipe] = [] + + +def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe: + source = FriendshipSource(friend, hearts) + return create_recipe(name, ingredients, source, mod_name) + + +def cutscene_recipe(name: str, region: str, friend: str, hearts: int, ingredients: Dict[str, int]) -> CraftingRecipe: + source = CutsceneSource(region, friend, hearts) + return create_recipe(name, ingredients, source) + + +def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe: + source = SkillSource(skill, level) + return create_recipe(name, ingredients, source, mod_name) + + +def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CraftingRecipe: + source = ShopSource(region, price) + return create_recipe(name, ingredients, source, mod_name) + + +def festival_shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int]) -> CraftingRecipe: + source = FestivalShopSource(region, price) + return create_recipe(name, ingredients, source) + + +def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: Dict[str, int]) -> CraftingRecipe: + source = ShopTradeSource(region, currency, price) + return create_recipe(name, ingredients, source) + + +def queen_of_sauce_recipe(name: str, year: int, season: str, day: int, ingredients: Dict[str, int]) -> CraftingRecipe: + source = QueenOfSauceSource(year, season, day) + return create_recipe(name, ingredients, source) + + +def quest_recipe(name: str, quest: str, ingredients: Dict[str, int]) -> CraftingRecipe: + source = QuestSource(quest) + return create_recipe(name, ingredients, source) + + +def special_order_recipe(name: str, special_order: str, ingredients: Dict[str, int]) -> CraftingRecipe: + source = SpecialOrderSource(special_order) + return create_recipe(name, ingredients, source) + + +def starter_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe: + source = StarterSource() + return create_recipe(name, ingredients, source) + + +def ap_recipe(name: str, ingredients: Dict[str, int], ap_item: str = None) -> CraftingRecipe: + if ap_item is None: + ap_item = f"{name} Recipe" + source = ArchipelagoSource(ap_item) + return create_recipe(name, ingredients, source) + + +def cellar_recipe(name: str, ingredients: Dict[str, int]) -> CraftingRecipe: + source = LogicSource("Cellar") + return create_recipe(name, ingredients, source) + + +def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None) -> CraftingRecipe: + recipe = CraftingRecipe(name, ingredients, source, mod_name) + all_crafting_recipes.append(recipe) + return recipe + + +cherry_bomb = skill_recipe(Bomb.cherry_bomb, Skill.mining, 1, {Ore.copper: 4, Material.coal: 1}) +bomb = skill_recipe(Bomb.bomb, Skill.mining, 6, {Ore.iron: 4, Material.coal: 1}) +mega_bomb = skill_recipe(Bomb.mega_bomb, Skill.mining, 8, {Ore.gold: 4, Loot.solar_essence: 1, Loot.void_essence: 1}) + +gate = starter_recipe(Fence.gate, {Material.wood: 10}) +wood_fence = starter_recipe(Fence.wood, {Material.wood: 2}) +stone_fence = skill_recipe(Fence.stone, Skill.farming, 2, {Material.stone: 2}) +iron_fence = skill_recipe(Fence.iron, Skill.farming, 4, {MetalBar.iron: 2}) +hardwood_fence = skill_recipe(Fence.hardwood, Skill.farming, 6, {Material.hardwood: 2}) + +sprinkler = skill_recipe(Sprinkler.basic, Skill.farming, 2, {MetalBar.copper: 1, MetalBar.iron: 1}) +quality_sprinkler = skill_recipe(Sprinkler.quality, Skill.farming, 6, {MetalBar.iron: 1, MetalBar.gold: 1, MetalBar.quartz: 1}) +iridium_sprinkler = skill_recipe(Sprinkler.iridium, Skill.farming, 9, {MetalBar.gold: 1, MetalBar.iridium: 1, ArtisanGood.battery_pack: 1}) + +bee_house = skill_recipe(Machine.bee_house, Skill.farming, 3, {Material.wood: 40, Material.coal: 8, MetalBar.iron: 1, ArtisanGood.maple_syrup: 1}) +cask = cellar_recipe(Machine.cask, {Material.wood: 40, Material.hardwood: 1}) +cheese_press = skill_recipe(Machine.cheese_press, Skill.farming, 6, {Material.wood: 45, Material.stone: 45, Material.hardwood: 10, MetalBar.copper: 1}) +keg = skill_recipe(Machine.keg, Skill.farming, 8, {Material.wood: 30, MetalBar.copper: 1, MetalBar.iron: 1, ArtisanGood.oak_resin: 1}) +loom = skill_recipe(Machine.loom, Skill.farming, 7, {Material.wood: 60, Material.fiber: 30, ArtisanGood.pine_tar: 1}) +mayonnaise_machine = skill_recipe(Machine.mayonnaise_machine, Skill.farming, 2, {Material.wood: 15, Material.stone: 15, Mineral.earth_crystal: 10, MetalBar.copper: 1}) +oil_maker = skill_recipe(Machine.oil_maker, Skill.farming, 8, {Loot.slime: 50, Material.hardwood: 20, MetalBar.gold: 1}) +preserves_jar = skill_recipe(Machine.preserves_jar, Skill.farming, 4, {Material.wood: 50, Material.stone: 40, Material.coal: 8}) + +basic_fertilizer = skill_recipe(Fertilizer.basic, Skill.farming, 1, {Material.sap: 2}) +quality_fertilizer = skill_recipe(Fertilizer.quality, Skill.farming, 9, {Material.sap: 2, Fish.any: 1}) +deluxe_fertilizer = ap_recipe(Fertilizer.deluxe, {MetalBar.iridium: 1, Material.sap: 40}) +basic_speed_gro = skill_recipe(SpeedGro.basic, Skill.farming, 3, {ArtisanGood.pine_tar: 1, Fish.clam: 1}) +deluxe_speed_gro = skill_recipe(SpeedGro.deluxe, Skill.farming, 8, {ArtisanGood.oak_resin: 1, WaterItem.coral: 1}) +hyper_speed_gro = ap_recipe(SpeedGro.hyper, {Ore.radioactive: 1, Fossil.bone_fragment: 3, Loot.solar_essence: 1}) +basic_retaining_soil = skill_recipe(RetainingSoil.basic, Skill.farming, 4, {Material.stone: 2}) +quality_retaining_soil = skill_recipe(RetainingSoil.quality, Skill.farming, 7, {Material.stone: 3, Material.clay: 1}) +deluxe_retaining_soil = shop_trade_recipe(RetainingSoil.deluxe, Region.island_trader, Currency.cinder_shard, 50, {Material.stone: 5, Material.fiber: 3, Material.clay: 1}) +tree_fertilizer = skill_recipe(Fertilizer.tree, Skill.foraging, 7, {Material.fiber: 5, Material.stone: 5}) + +spring_seeds = skill_recipe(WildSeeds.spring, Skill.foraging, 1, {Forageable.wild_horseradish: 1, Forageable.daffodil: 1, Forageable.leek: 1, Forageable.dandelion: 1}) +summer_seeds = skill_recipe(WildSeeds.summer, Skill.foraging, 4, {Forageable.spice_berry: 1, Fruit.grape: 1, Forageable.sweet_pea: 1}) +fall_seeds = skill_recipe(WildSeeds.fall, Skill.foraging, 6, {Forageable.common_mushroom: 1, Forageable.wild_plum: 1, Forageable.hazelnut: 1, Forageable.blackberry: 1}) +winter_seeds = skill_recipe(WildSeeds.winter, Skill.foraging, 7, {Forageable.winter_root: 1, Forageable.crystal_fruit: 1, Forageable.snow_yam: 1, Forageable.crocus: 1}) +ancient_seeds = ap_recipe(WildSeeds.ancient, {Artifact.ancient_seed: 1}) +grass_starter = shop_recipe(WildSeeds.grass_starter, Region.pierre_store, 1000, {Material.fiber: 10}) +for wild_seeds in [WildSeeds.spring, WildSeeds.summer, WildSeeds.fall, WildSeeds.winter]: + tea_sapling = cutscene_recipe(WildSeeds.tea_sapling, Region.sunroom, NPC.caroline, 2, {wild_seeds: 2, Material.fiber: 5, Material.wood: 5}) +fiber_seeds = special_order_recipe(WildSeeds.fiber, SpecialOrder.community_cleanup, {Seed.mixed: 1, Material.sap: 5, Material.clay: 1}) + +wood_floor = shop_recipe(Floor.wood, Region.carpenter, 100, {Material.wood: 1}) +rustic_floor = shop_recipe(Floor.rustic, Region.carpenter, 200, {Material.wood: 1}) +straw_floor = shop_recipe(Floor.straw, Region.carpenter, 200, {Material.wood: 1, Material.fiber: 1}) +weathered_floor = shop_recipe(Floor.weathered, Region.mines_dwarf_shop, 500, {Material.wood: 1}) +crystal_floor = shop_recipe(Floor.crystal, Region.sewer, 500, {MetalBar.quartz: 1}) +stone_floor = shop_recipe(Floor.stone, Region.carpenter, 100, {Material.stone: 1}) +stone_walkway_floor = shop_recipe(Floor.stone_walkway, Region.carpenter, 200, {Material.stone: 1}) +brick_floor = shop_recipe(Floor.brick, Region.carpenter, 500, {Material.clay: 2, Material.stone: 5}) +wood_path = starter_recipe(Floor.wood_path, {Material.wood: 1}) +gravel_path = starter_recipe(Floor.gravel_path, {Material.stone: 1}) +cobblestone_path = starter_recipe(Floor.cobblestone_path, {Material.stone: 1}) +stepping_stone_path = shop_recipe(Floor.stepping_stone_path, Region.carpenter, 100, {Material.stone: 1}) +crystal_path = shop_recipe(Floor.crystal_path, Region.carpenter, 200, {MetalBar.quartz: 1}) + +spinner = skill_recipe(Fishing.spinner, Skill.fishing, 6, {MetalBar.iron: 2}) +trap_bobber = skill_recipe(Fishing.trap_bobber, Skill.fishing, 6, {MetalBar.copper: 1, Material.sap: 10}) +cork_bobber = skill_recipe(Fishing.cork_bobber, Skill.fishing, 7, {Material.wood: 10, Material.hardwood: 5, Loot.slime: 10}) +quality_bobber = special_order_recipe(Fishing.quality_bobber, SpecialOrder.juicy_bugs_wanted, {MetalBar.copper: 1, Material.sap: 20, Loot.solar_essence: 5}) +treasure_hunter = skill_recipe(Fishing.treasure_hunter, Skill.fishing, 7, {MetalBar.gold: 2}) +dressed_spinner = skill_recipe(Fishing.dressed_spinner, Skill.fishing, 8, {MetalBar.iron: 2, ArtisanGood.cloth: 1}) +barbed_hook = skill_recipe(Fishing.barbed_hook, Skill.fishing, 8, {MetalBar.copper: 1, MetalBar.iron: 1, MetalBar.gold: 1}) +magnet = skill_recipe(Fishing.magnet, Skill.fishing, 9, {MetalBar.iron: 1}) +bait = skill_recipe(Fishing.bait, Skill.fishing, 2, {Loot.bug_meat: 1}) +wild_bait = cutscene_recipe(Fishing.wild_bait, Region.tent, NPC.linus, 4, {Material.fiber: 10, Loot.bug_meat: 5, Loot.slime: 5}) +magic_bait = ap_recipe(Fishing.magic_bait, {Ore.radioactive: 1, Loot.bug_meat: 3}) +crab_pot = skill_recipe(Machine.crab_pot, Skill.fishing, 3, {Material.wood: 40, MetalBar.iron: 3}) + +sturdy_ring = skill_recipe(Ring.sturdy_ring, Skill.combat, 1, {MetalBar.copper: 2, Loot.bug_meat: 25, Loot.slime: 25}) +warrior_ring = skill_recipe(Ring.warrior_ring, Skill.combat, 4, {MetalBar.iron: 10, Material.coal: 25, Mineral.frozen_tear: 10}) +ring_of_yoba = skill_recipe(Ring.ring_of_yoba, Skill.combat, 7, {MetalBar.gold: 5, MetalBar.iron: 5, Mineral.diamond: 1}) +thorns_ring = skill_recipe(Ring.thorns_ring, Skill.combat, 7, {Fossil.bone_fragment: 50, Material.stone: 50, MetalBar.gold: 1}) +glowstone_ring = skill_recipe(Ring.glowstone_ring, Skill.mining, 4, {Loot.solar_essence: 5, MetalBar.iron: 5}) +iridium_band = skill_recipe(Ring.iridium_band, Skill.combat, 9, {MetalBar.iridium: 5, Loot.solar_essence: 50, Loot.void_essence: 50}) +wedding_ring = shop_recipe(Ring.wedding_ring, Region.traveling_cart, 500, {MetalBar.iridium: 5, Mineral.prismatic_shard: 1}) + +field_snack = skill_recipe(Edible.field_snack, Skill.foraging, 1, {TreeSeed.acorn: 1, TreeSeed.maple: 1, TreeSeed.pine: 1}) +bug_steak = skill_recipe(Edible.bug_steak, Skill.combat, 1, {Loot.bug_meat: 10}) +life_elixir = skill_recipe(Edible.life_elixir, Skill.combat, 2, {Forageable.red_mushroom: 1, Forageable.purple_mushroom: 1, Forageable.morel: 1, Forageable.chanterelle: 1}) +oil_of_garlic = skill_recipe(Edible.oil_of_garlic, Skill.combat, 6, {Vegetable.garlic: 10, Ingredient.oil: 1}) + +monster_musk = special_order_recipe(Consumable.monster_musk, SpecialOrder.prismatic_jelly, {Loot.bat_wing: 30, Loot.slime: 30}) +fairy_dust = quest_recipe(Consumable.fairy_dust, Quest.the_pirates_wife, {Mineral.diamond: 1, Flower.fairy_rose: 1}) +warp_totem_beach = skill_recipe(Consumable.warp_totem_beach, Skill.foraging, 6, {Material.hardwood: 1, WaterItem.coral: 2, Material.fiber: 10}) +warp_totem_mountains = skill_recipe(Consumable.warp_totem_mountains, Skill.foraging, 7, {Material.hardwood: 1, MetalBar.iron: 1, Material.stone: 25}) +warp_totem_farm = skill_recipe(Consumable.warp_totem_farm, Skill.foraging, 8, {Material.hardwood: 1, ArtisanGood.honey: 1, Material.fiber: 20}) +warp_totem_desert = shop_trade_recipe(Consumable.warp_totem_desert, Region.desert, MetalBar.iridium, 10, {Material.hardwood: 2, Forageable.coconut: 1, Ore.iridium: 4}) +warp_totem_island = shop_recipe(Consumable.warp_totem_island, Region.volcano_dwarf_shop, 10000, {Material.hardwood: 5, Forageable.dragon_tooth: 1, Forageable.ginger: 1}) +rain_totem = skill_recipe(Consumable.rain_totem, Skill.foraging, 9, {Material.hardwood: 1, ArtisanGood.truffle_oil: 1, ArtisanGood.pine_tar: 5}) + +torch = starter_recipe(Lighting.torch, {Material.wood: 1, Material.sap: 2}) +campfire = starter_recipe(Lighting.campfire, {Material.stone: 10, Material.wood: 10, Material.fiber: 10}) +wooden_brazier = shop_recipe(Lighting.wooden_brazier, Region.carpenter, 250, {Material.wood: 10, Material.coal: 1, Material.fiber: 5}) +stone_brazier = shop_recipe(Lighting.stone_brazier, Region.carpenter, 400, {Material.stone: 10, Material.coal: 1, Material.fiber: 5}) +gold_brazier = shop_recipe(Lighting.gold_brazier, Region.carpenter, 1000, {MetalBar.gold: 1, Material.coal: 1, Material.fiber: 5}) +carved_brazier = shop_recipe(Lighting.carved_brazier, Region.carpenter, 2000, {Material.hardwood: 10, Material.coal: 1}) +stump_brazier = shop_recipe(Lighting.stump_brazier, Region.carpenter, 800, {Material.hardwood: 5, Material.coal: 1}) +barrel_brazier = shop_recipe(Lighting.barrel_brazier, Region.carpenter, 800, {Material.wood: 50, Loot.solar_essence: 1, Material.coal: 1}) +skull_brazier = shop_recipe(Lighting.skull_brazier, Region.carpenter, 3000, {Fossil.bone_fragment: 10}) +marble_brazier = shop_recipe(Lighting.marble_brazier, Region.carpenter, 5000, {Mineral.marble: 1, Mineral.aquamarine: 1, Material.stone: 100}) +wood_lamp_post = shop_recipe(Lighting.wood_lamp_post, Region.carpenter, 500, {Material.wood: 50, ArtisanGood.battery_pack: 1}) +iron_lamp_post = shop_recipe(Lighting.iron_lamp_post, Region.carpenter, 1000, {MetalBar.iron: 1, ArtisanGood.battery_pack: 1}) +jack_o_lantern = festival_shop_recipe(Lighting.jack_o_lantern, Region.spirit_eve, 2000, {Vegetable.pumpkin: 1, Lighting.torch: 1}) + +bone_mill = special_order_recipe(Machine.bone_mill, SpecialOrder.fragments_of_the_past, {Fossil.bone_fragment: 10, Material.clay: 3, Material.stone: 20}) +charcoal_kiln = skill_recipe(Machine.charcoal_kiln, Skill.foraging, 4, {Material.wood: 20, MetalBar.copper: 2}) +crystalarium = skill_recipe(Machine.crystalarium, Skill.mining, 9, {Material.stone: 99, MetalBar.gold: 5, MetalBar.iridium: 2, ArtisanGood.battery_pack: 1}) +furnace = skill_recipe(Machine.furnace, Skill.mining, 1, {Ore.copper: 20, Material.stone: 25}) +geode_crusher = special_order_recipe(Machine.geode_crusher, SpecialOrder.cave_patrol, {MetalBar.gold: 2, Material.stone: 50, Mineral.diamond: 1}) +heavy_tapper = ap_recipe(Machine.heavy_tapper, {Material.hardwood: 30, MetalBar.radioactive: 1}) +lightning_rod = skill_recipe(Machine.lightning_rod, Skill.foraging, 6, {MetalBar.iron: 1, MetalBar.quartz: 1, Loot.bat_wing: 5}) +ostrich_incubator = ap_recipe(Machine.ostrich_incubator, {Fossil.bone_fragment: 50, Material.hardwood: 50, Currency.cinder_shard: 20}) +recycling_machine = skill_recipe(Machine.recycling_machine, Skill.fishing, 4, {Material.wood: 25, Material.stone: 25, MetalBar.iron: 1}) +seed_maker = skill_recipe(Machine.seed_maker, Skill.farming, 9, {Material.wood: 25, Material.coal: 10, MetalBar.gold: 1}) +slime_egg_press = skill_recipe(Machine.slime_egg_press, Skill.combat, 6, {Material.coal: 25, Mineral.fire_quartz: 1, ArtisanGood.battery_pack: 1}) +slime_incubator = skill_recipe(Machine.slime_incubator, Skill.combat, 8, {MetalBar.iridium: 2, Loot.slime: 100}) +solar_panel = special_order_recipe(Machine.solar_panel, SpecialOrder.island_ingredients, {MetalBar.quartz: 10, MetalBar.iron: 5, MetalBar.gold: 5}) +tapper = skill_recipe(Machine.tapper, Skill.foraging, 3, {Material.wood: 40, MetalBar.copper: 2}) +worm_bin = skill_recipe(Machine.worm_bin, Skill.fishing, 8, {Material.hardwood: 25, MetalBar.gold: 1, MetalBar.iron: 1, Material.fiber: 50}) + +tub_o_flowers = festival_shop_recipe(Furniture.tub_o_flowers, Region.flower_dance, 2000, {Material.wood: 15, Seed.tulip: 1, Seed.jazz: 1, Seed.poppy: 1, Seed.spangle: 1}) +wicked_statue = shop_recipe(Furniture.wicked_statue, Region.sewer, 1000, {Material.stone: 25, Material.coal: 5}) +flute_block = cutscene_recipe(Furniture.flute_block, Region.carpenter, NPC.robin, 6, {Material.wood: 10, Ore.copper: 2, Material.fiber: 20}) +drum_block = cutscene_recipe(Furniture.drum_block, Region.carpenter, NPC.robin, 6, {Material.stone: 10, Ore.copper: 2, Material.fiber: 20}) + +chest = starter_recipe(Storage.chest, {Material.wood: 50}) +stone_chest = special_order_recipe(Storage.stone_chest, SpecialOrder.robins_resource_rush, {Material.stone: 50}) + +wood_sign = starter_recipe(Sign.wood, {Material.wood: 25}) +stone_sign = starter_recipe(Sign.stone, {Material.stone: 25}) +dark_sign = friendship_recipe(Sign.dark, NPC.krobus, 3, {Loot.bat_wing: 5, Fossil.bone_fragment: 5}) + +garden_pot = ap_recipe(Craftable.garden_pot, {Material.clay: 1, Material.stone: 10, MetalBar.quartz: 1}, "Greenhouse") +scarecrow = skill_recipe(Craftable.scarecrow, Skill.farming, 1, {Material.wood: 50, Material.coal: 1, Material.fiber: 20}) +deluxe_scarecrow = ap_recipe(Craftable.deluxe_scarecrow, {Material.wood: 50, Material.fiber: 40, Ore.iridium: 1}) +staircase = skill_recipe(Craftable.staircase, Skill.mining, 2, {Material.stone: 99}) +explosive_ammo = skill_recipe(Craftable.explosive_ammo, Skill.combat, 8, {MetalBar.iron: 1, Material.coal: 2}) +transmute_fe = skill_recipe(Craftable.transmute_fe, Skill.mining, 4, {MetalBar.copper: 3}) +transmute_au = skill_recipe(Craftable.transmute_au, Skill.mining, 7, {MetalBar.iron: 2}) +mini_jukebox = cutscene_recipe(Craftable.mini_jukebox, Region.saloon, NPC.gus, 5, {MetalBar.iron: 2, ArtisanGood.battery_pack: 1}) +mini_obelisk = special_order_recipe(Craftable.mini_obelisk, SpecialOrder.a_curious_substance, {Material.hardwood: 30, Loot.solar_essence: 20, MetalBar.gold: 3}) +farm_computer = special_order_recipe(Craftable.farm_computer, SpecialOrder.aquatic_overpopulation, {Artifact.dwarf_gadget: 1, ArtisanGood.battery_pack: 1, MetalBar.quartz: 10}) +hopper = ap_recipe(Craftable.hopper, {Material.hardwood: 10, MetalBar.iridium: 1, MetalBar.radioactive: 1}) +cookout_kit = skill_recipe(Craftable.cookout_kit, Skill.foraging, 9, {Material.wood: 15, Material.fiber: 10, Material.coal: 3}) + +travel_charm = shop_recipe(ModCraftable.travel_core, Region.adventurer_guild, 250, {Loot.solar_essence: 1, Loot.void_essence: 1}, ModNames.magic) +preservation_chamber = skill_recipe(ModMachine.preservation_chamber, ModSkill.archaeology, 2, {MetalBar.copper: 1, Material.wood: 15, ArtisanGood.oak_resin: 30}, + ModNames.archaeology) +preservation_chamber_h = skill_recipe(ModMachine.hardwood_preservation_chamber, ModSkill.archaeology, 7, {MetalBar.copper: 1, Material.hardwood: 15, + ArtisanGood.oak_resin: 30}, ModNames.archaeology) +grinder = skill_recipe(ModMachine.grinder, ModSkill.archaeology, 8, {Artifact.rusty_cog: 10, MetalBar.iron: 5, ArtisanGood.battery_pack: 1}, ModNames.archaeology) +ancient_battery = skill_recipe(ModMachine.ancient_battery, ModSkill.archaeology, 6, {Material.stone: 40, MetalBar.copper: 10, MetalBar.iron: 5}, + ModNames.archaeology) +glass_bazier = skill_recipe(ModCraftable.glass_bazier, ModSkill.archaeology, 1, {Artifact.glass_shards: 10}, ModNames.archaeology) +glass_path = skill_recipe(ModFloor.glass_path, ModSkill.archaeology, 1, {Artifact.glass_shards: 1}, ModNames.archaeology) +glass_fence = skill_recipe(ModCraftable.glass_fence, ModSkill.archaeology, 1, {Artifact.glass_shards: 5}, ModNames.archaeology) +bone_path = skill_recipe(ModFloor.bone_path, ModSkill.archaeology, 3, {Fossil.bone_fragment: 1}, ModNames.archaeology) +water_shifter = skill_recipe(ModCraftable.water_shifter, ModSkill.archaeology, 4, {Material.wood: 40, MetalBar.copper: 4}, ModNames.archaeology) +wooden_display = skill_recipe(ModCraftable.wooden_display, ModSkill.archaeology, 2, {Material.wood: 25}, ModNames.archaeology) +hardwood_display = skill_recipe(ModCraftable.hardwood_display, ModSkill.archaeology, 7, {Material.hardwood: 10}, ModNames.archaeology) +volcano_totem = skill_recipe(ModConsumable.volcano_totem, ModSkill.archaeology, 9, {Material.cinder_shard: 5, Artifact.rare_disc: 1, Artifact.dwarf_gadget: 1}, + ModNames.archaeology) +haste_elixir = shop_recipe(ModEdible.haste_elixir, SVERegion.alesia_shop, 35000, {Loot.void_essence: 35, SVEForage.void_soul: 5, Ingredient.sugar: 1, + Meal.spicy_eel: 1}, ModNames.sve) +hero_elixir = shop_recipe(ModEdible.hero_elixir, SVERegion.isaac_shop, 65000, {SVEForage.void_pebble: 3, SVEForage.void_soul: 5, Ingredient.oil: 1, + Loot.slime: 10}, ModNames.sve) +armor_elixir = shop_recipe(ModEdible.armor_elixir, SVERegion.alesia_shop, 50000, {Loot.solar_essence: 30, SVEForage.void_soul: 5, Ingredient.vinegar: 5, + Fossil.bone_fragment: 5}, ModNames.sve) +ginger_tincture = friendship_recipe(ModConsumable.ginger_tincture, ModNPC.goblin, 4, {DistantLandsForageable.brown_amanita: 1, Forageable.ginger: 5, + Material.cinder_shard: 1, DistantLandsForageable.swamp_herb: 1}, ModNames.distant_lands) + +neanderthal_skeleton = shop_recipe(ModCraftable.neanderthal_skeleton, Region.mines_dwarf_shop, 5000, + {ModFossil.neanderthal_skull: 1, ModFossil.neanderthal_ribs: 1, ModFossil.neanderthal_pelvis: 1, ModFossil.neanderthal_limb_bones: 1, + MetalBar.iron: 5, Material.hardwood: 10}, ModNames.boarding_house) +pterodactyl_skeleton_l = shop_recipe(ModCraftable.pterodactyl_skeleton_l, Region.mines_dwarf_shop, 5000, + {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_skull: 1, ModFossil.pterodactyl_l_wing_bone: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) +pterodactyl_skeleton_m = shop_recipe(ModCraftable.pterodactyl_skeleton_m, Region.mines_dwarf_shop, 5000, + {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_vertebra: 1, ModFossil.pterodactyl_ribs: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) +pterodactyl_skeleton_r = shop_recipe(ModCraftable.pterodactyl_skeleton_r, Region.mines_dwarf_shop, 5000, + {ModFossil.pterodactyl_phalange: 1, ModFossil.pterodactyl_claw: 1, ModFossil.pterodactyl_r_wing_bone: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) +trex_skeleton_l = shop_recipe(ModCraftable.trex_skeleton_l, Region.mines_dwarf_shop, 5000, + {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_tooth: 1, ModFossil.dinosaur_skull: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) +trex_skeleton_m = shop_recipe(ModCraftable.trex_skeleton_m, Region.mines_dwarf_shop, 5000, + {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_ribs: 1, ModFossil.dinosaur_claw: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) +trex_skeleton_r = shop_recipe(ModCraftable.trex_skeleton_r, Region.mines_dwarf_shop, 5000, + {ModFossil.dinosaur_vertebra: 1, ModFossil.dinosaur_femur: 1, ModFossil.dinosaur_pelvis: 1, + MetalBar.iron: 10, Material.hardwood: 15}, ModNames.boarding_house) + +all_crafting_recipes_by_name = {recipe.item: recipe for recipe in all_crafting_recipes} diff --git a/worlds/stardew_valley/data/crops.csv b/worlds/stardew_valley/data/crops.csv index e3d2dc8256db..0bf43a76764e 100644 --- a/worlds/stardew_valley/data/crops.csv +++ b/worlds/stardew_valley/data/crops.csv @@ -1,40 +1,41 @@ -crop,farm_growth_seasons,seed,seed_seasons,seed_regions -Amaranth,Fall,Amaranth Seeds,Fall,"Pierre's General Store,JojaMart" -Artichoke,Fall,Artichoke Seeds,Fall,"Pierre's General Store,JojaMart" -Beet,Fall,Beet Seeds,Fall,Oasis -Blue Jazz,Spring,Jazz Seeds,Spring,"Pierre's General Store,JojaMart" -Blueberry,Summer,Blueberry Seeds,Summer,"Pierre's General Store,JojaMart" -Bok Choy,Fall,Bok Choy Seeds,Fall,"Pierre's General Store,JojaMart" -Cactus Fruit,,Cactus Seeds,,Oasis -Cauliflower,Spring,Cauliflower Seeds,Spring,"Pierre's General Store,JojaMart" -Coffee Bean,"Spring,Summer",Coffee Bean,"Summer,Fall","Traveling Cart" -Corn,"Summer,Fall",Corn Seeds,"Summer,Fall","Pierre's General Store,JojaMart" -Cranberries,Fall,Cranberry Seeds,Fall,"Pierre's General Store,JojaMart" -Eggplant,Fall,Eggplant Seeds,Fall,"Pierre's General Store,JojaMart" -Fairy Rose,Fall,Fairy Seeds,Fall,"Pierre's General Store,JojaMart" -Garlic,Spring,Garlic Seeds,Spring,"Pierre's General Store,JojaMart" -Grape,Fall,Grape Starter,Fall,"Pierre's General Store,JojaMart" -Green Bean,Spring,Bean Starter,Spring,"Pierre's General Store,JojaMart" -Hops,Summer,Hops Starter,Summer,"Pierre's General Store,JojaMart" -Hot Pepper,Summer,Pepper Seeds,Summer,"Pierre's General Store,JojaMart" -Kale,Spring,Kale Seeds,Spring,"Pierre's General Store,JojaMart" -Melon,Summer,Melon Seeds,Summer,"Pierre's General Store,JojaMart" -Parsnip,Spring,Parsnip Seeds,Spring,"Pierre's General Store,JojaMart" -Pineapple,Summer,Pineapple Seeds,Summer,"Island Trader" -Poppy,Summer,Poppy Seeds,Summer,"Pierre's General Store,JojaMart" -Potato,Spring,Potato Seeds,Spring,"Pierre's General Store,JojaMart" -Pumpkin,Fall,Pumpkin Seeds,Fall,"Pierre's General Store,JojaMart" -Radish,Summer,Radish Seeds,Summer,"Pierre's General Store,JojaMart" -Red Cabbage,Summer,Red Cabbage Seeds,Summer,"Pierre's General Store,JojaMart" -Rhubarb,Spring,Rhubarb Seeds,Spring,Oasis -Starfruit,Summer,Starfruit Seeds,Summer,Oasis -Strawberry,Spring,Strawberry Seeds,Spring,"Pierre's General Store,JojaMart" -Summer Spangle,Summer,Spangle Seeds,Summer,"Pierre's General Store,JojaMart" -Sunflower,"Summer,Fall",Sunflower Seeds,"Summer,Fall","Pierre's General Store,JojaMart" -Sweet Gem Berry,Fall,Rare Seed,"Spring,Summer",Traveling Cart -Taro Root,Summer,Taro Tuber,Summer,"Island Trader" -Tomato,Summer,Tomato Seeds,Summer,"Pierre's General Store,JojaMart" -Tulip,Spring,Tulip Bulb,Spring,"Pierre's General Store,JojaMart" -Unmilled Rice,Spring,Rice Shoot,Spring,"Pierre's General Store,JojaMart" -Wheat,"Summer,Fall",Wheat Seeds,"Summer,Fall","Pierre's General Store,JojaMart" -Yam,Fall,Yam Seeds,Fall,"Pierre's General Store,JojaMart" +crop,farm_growth_seasons,seed,seed_seasons,seed_regions,requires_island +Amaranth,Fall,Amaranth Seeds,Fall,"Pierre's General Store",False +Artichoke,Fall,Artichoke Seeds,Fall,"Pierre's General Store",False +Beet,Fall,Beet Seeds,Fall,Oasis,False +Blue Jazz,Spring,Jazz Seeds,Spring,"Pierre's General Store",False +Blueberry,Summer,Blueberry Seeds,Summer,"Pierre's General Store",False +Bok Choy,Fall,Bok Choy Seeds,Fall,"Pierre's General Store",False +Cactus Fruit,,Cactus Seeds,,Oasis,False +Cauliflower,Spring,Cauliflower Seeds,Spring,"Pierre's General Store",False +Coffee Bean,"Spring,Summer",Coffee Bean,"Summer,Fall","Traveling Cart",False +Corn,"Summer,Fall",Corn Seeds,"Summer,Fall","Pierre's General Store",False +Cranberries,Fall,Cranberry Seeds,Fall,"Pierre's General Store",False +Eggplant,Fall,Eggplant Seeds,Fall,"Pierre's General Store",False +Fairy Rose,Fall,Fairy Seeds,Fall,"Pierre's General Store",False +Garlic,Spring,Garlic Seeds,Spring,"Pierre's General Store",False +Grape,Fall,Grape Starter,Fall,"Pierre's General Store",False +Green Bean,Spring,Bean Starter,Spring,"Pierre's General Store",False +Hops,Summer,Hops Starter,Summer,"Pierre's General Store",False +Hot Pepper,Summer,Pepper Seeds,Summer,"Pierre's General Store",False +Kale,Spring,Kale Seeds,Spring,"Pierre's General Store",False +Melon,Summer,Melon Seeds,Summer,"Pierre's General Store",False +Parsnip,Spring,Parsnip Seeds,Spring,"Pierre's General Store",False +Pineapple,Summer,Pineapple Seeds,Summer,"Island Trader",True +Poppy,Summer,Poppy Seeds,Summer,"Pierre's General Store",False +Potato,Spring,Potato Seeds,Spring,"Pierre's General Store",False +Qi Fruit,"Spring,Summer,Fall,Winter",Qi Bean,"Spring,Summer,Fall,Winter","Qi's Walnut Room",True +Pumpkin,Fall,Pumpkin Seeds,Fall,"Pierre's General Store",False +Radish,Summer,Radish Seeds,Summer,"Pierre's General Store",False +Red Cabbage,Summer,Red Cabbage Seeds,Summer,"Pierre's General Store",False +Rhubarb,Spring,Rhubarb Seeds,Spring,Oasis,False +Starfruit,Summer,Starfruit Seeds,Summer,Oasis,False +Strawberry,Spring,Strawberry Seeds,Spring,"Pierre's General Store",False +Summer Spangle,Summer,Spangle Seeds,Summer,"Pierre's General Store",False +Sunflower,"Summer,Fall",Sunflower Seeds,"Summer,Fall","Pierre's General Store",False +Sweet Gem Berry,Fall,Rare Seed,"Spring,Summer",Traveling Cart,False +Taro Root,Summer,Taro Tuber,Summer,"Island Trader",True +Tomato,Summer,Tomato Seeds,Summer,"Pierre's General Store",False +Tulip,Spring,Tulip Bulb,Spring,"Pierre's General Store",False +Unmilled Rice,Spring,Rice Shoot,Spring,"Pierre's General Store",False +Wheat,"Summer,Fall",Wheat Seeds,"Summer,Fall","Pierre's General Store",False +Yam,Fall,Yam Seeds,Fall,"Pierre's General Store",False diff --git a/worlds/stardew_valley/data/crops_data.py b/worlds/stardew_valley/data/crops_data.py index e798235060f2..7144ccfbcf9b 100644 --- a/worlds/stardew_valley/data/crops_data.py +++ b/worlds/stardew_valley/data/crops_data.py @@ -1,5 +1,5 @@ from dataclasses import dataclass -from typing import List +from typing import Tuple from .. import data @@ -7,14 +7,15 @@ @dataclass(frozen=True) class SeedItem: name: str - seasons: List[str] - regions: List[str] + seasons: Tuple[str] + regions: Tuple[str] + requires_island: bool @dataclass(frozen=True) class CropItem: name: str - farm_growth_seasons: List[str] + farm_growth_seasons: Tuple[str] seed: SeedItem @@ -32,13 +33,14 @@ def load_crop_csv(): for item in reader: seeds.append(SeedItem(item["seed"], - [season for season in item["seed_seasons"].split(",")] - if item["seed_seasons"] else [], - [region for region in item["seed_regions"].split(",")] - if item["seed_regions"] else [])) + tuple(season for season in item["seed_seasons"].split(",")) + if item["seed_seasons"] else tuple(), + tuple(region for region in item["seed_regions"].split(",")) + if item["seed_regions"] else tuple(), + item["requires_island"] == "True")) crops.append(CropItem(item["crop"], - [season for season in item["farm_growth_seasons"].split(",")] - if item["farm_growth_seasons"] else [], + tuple(season for season in item["farm_growth_seasons"].split(",")) + if item["farm_growth_seasons"] else tuple(), seeds[-1])) return crops, seeds diff --git a/worlds/stardew_valley/data/fish_data.py b/worlds/stardew_valley/data/fish_data.py index 91a4431c6552..aeb416733950 100644 --- a/worlds/stardew_valley/data/fish_data.py +++ b/worlds/stardew_valley/data/fish_data.py @@ -1,20 +1,24 @@ from dataclasses import dataclass -from typing import List, Tuple, Union, Optional +from typing import List, Tuple, Union, Optional, Set from . import season_data as season -from .game_item import GameItem -from ..strings.region_names import Region +from ..strings.fish_names import Fish, SVEFish, DistantLandsFish +from ..strings.region_names import Region, SVERegion +from ..mods.mod_data import ModNames @dataclass(frozen=True) -class FishItem(GameItem): +class FishItem: + name: str locations: Tuple[str] seasons: Tuple[str] difficulty: int - mod_name: Optional[str] + legendary: bool + extended_family: bool + mod_name: Optional[str] = None def __repr__(self): - return f"{self.name} [{self.item_id}] (Locations: {self.locations} |" \ + return f"{self.name} (Locations: {self.locations} |" \ f" Seasons: {self.seasons} |" \ f" Difficulty: {self.difficulty}) |" \ f"Mod: {self.mod_name}" @@ -39,92 +43,149 @@ def __repr__(self): ginger_island_river = (Region.island_west,) pirate_cove = (Region.pirate_cove,) +crimson_badlands = (SVERegion.crimson_badlands,) +shearwater = (SVERegion.shearwater,) +highlands = (SVERegion.highlands_outside,) +sprite_spring = (SVERegion.sprite_spring,) +fable_reef = (SVERegion.fable_reef,) +vineyard = (SVERegion.blue_moon_vineyard,) + all_fish: List[FishItem] = [] -def create_fish(name: str, item_id: int, locations: Tuple[str, ...], seasons: Union[str, Tuple[str, ...]], - difficulty: int, mod_name: Optional[str] = None) -> FishItem: +def create_fish(name: str, locations: Tuple[str, ...], seasons: Union[str, Tuple[str, ...]], + difficulty: int, legendary: bool = False, extended_family: bool = False, mod_name: Optional[str] = None) -> FishItem: if isinstance(seasons, str): seasons = (seasons,) - fish_item = FishItem(name, item_id, locations, seasons, difficulty, mod_name) + fish_item = FishItem(name, locations, seasons, difficulty, legendary, extended_family, mod_name) all_fish.append(fish_item) return fish_item -albacore = create_fish("Albacore", 705, ocean, (season.fall, season.winter), 60) -anchovy = create_fish("Anchovy", 129, ocean, (season.spring, season.fall), 30) -blue_discus = create_fish("Blue Discus", 838, ginger_island_river, season.all_seasons, 60) -bream = create_fish("Bream", 132, town_river + forest_river, season.all_seasons, 35) -bullhead = create_fish("Bullhead", 700, mountain_lake, season.all_seasons, 46) -carp = create_fish("Carp", 142, mountain_lake + secret_woods + sewers + mutant_bug_lair, season.not_winter, 15) -catfish = create_fish("Catfish", 143, town_river + forest_river + secret_woods, (season.spring, season.fall), 75) -chub = create_fish("Chub", 702, forest_river + mountain_lake, season.all_seasons, 35) -dorado = create_fish("Dorado", 704, forest_river, season.summer, 78) -eel = create_fish("Eel", 148, ocean, (season.spring, season.fall), 70) -flounder = create_fish("Flounder", 267, ocean, (season.spring, season.summer), 50) -ghostfish = create_fish("Ghostfish", 156, mines_floor_20 + mines_floor_60, season.all_seasons, 50) -halibut = create_fish("Halibut", 708, ocean, season.not_fall, 50) -herring = create_fish("Herring", 147, ocean, (season.spring, season.winter), 25) -ice_pip = create_fish("Ice Pip", 161, mines_floor_60, season.all_seasons, 85) -largemouth_bass = create_fish("Largemouth Bass", 136, mountain_lake, season.all_seasons, 50) -lava_eel = create_fish("Lava Eel", 162, mines_floor_100, season.all_seasons, 90) -lingcod = create_fish("Lingcod", 707, town_river + forest_river + mountain_lake, season.winter, 85) -lionfish = create_fish("Lionfish", 837, ginger_island_ocean, season.all_seasons, 50) -midnight_carp = create_fish("Midnight Carp", 269, mountain_lake + forest_pond + ginger_island_river, +albacore = create_fish("Albacore", ocean, (season.fall, season.winter), 60) +anchovy = create_fish("Anchovy", ocean, (season.spring, season.fall), 30) +blue_discus = create_fish("Blue Discus", ginger_island_river, season.all_seasons, 60) +bream = create_fish("Bream", town_river + forest_river, season.all_seasons, 35) +bullhead = create_fish("Bullhead", mountain_lake, season.all_seasons, 46) +carp = create_fish(Fish.carp, mountain_lake + secret_woods + sewers + mutant_bug_lair, season.not_winter, 15) +catfish = create_fish("Catfish", town_river + forest_river + secret_woods, (season.spring, season.fall), 75) +chub = create_fish("Chub", forest_river + mountain_lake, season.all_seasons, 35) +dorado = create_fish("Dorado", forest_river, season.summer, 78) +eel = create_fish("Eel", ocean, (season.spring, season.fall), 70) +flounder = create_fish("Flounder", ocean, (season.spring, season.summer), 50) +ghostfish = create_fish("Ghostfish", mines_floor_20 + mines_floor_60, season.all_seasons, 50) +halibut = create_fish("Halibut", ocean, season.not_fall, 50) +herring = create_fish("Herring", ocean, (season.spring, season.winter), 25) +ice_pip = create_fish("Ice Pip", mines_floor_60, season.all_seasons, 85) +largemouth_bass = create_fish("Largemouth Bass", mountain_lake, season.all_seasons, 50) +lava_eel = create_fish("Lava Eel", mines_floor_100, season.all_seasons, 90) +lingcod = create_fish("Lingcod", town_river + forest_river + mountain_lake, season.winter, 85) +lionfish = create_fish("Lionfish", ginger_island_ocean, season.all_seasons, 50) +midnight_carp = create_fish("Midnight Carp", mountain_lake + forest_pond + ginger_island_river, (season.fall, season.winter), 55) -octopus = create_fish("Octopus", 149, ocean, season.summer, 95) -perch = create_fish("Perch", 141, town_river + forest_river + forest_pond + mountain_lake, season.winter, 35) -pike = create_fish("Pike", 144, town_river + forest_river + forest_pond, (season.summer, season.winter), 60) -pufferfish = create_fish("Pufferfish", 128, ocean + ginger_island_ocean, season.summer, 80) -rainbow_trout = create_fish("Rainbow Trout", 138, town_river + forest_river + mountain_lake, season.summer, 45) -red_mullet = create_fish("Red Mullet", 146, ocean, (season.summer, season.winter), 55) -red_snapper = create_fish("Red Snapper", 150, ocean, (season.summer, season.fall), 40) -salmon = create_fish("Salmon", 139, town_river + forest_river, season.fall, 50) -sandfish = create_fish("Sandfish", 164, desert, season.all_seasons, 65) -sardine = create_fish("Sardine", 131, ocean, (season.spring, season.fall, season.winter), 30) -scorpion_carp = create_fish("Scorpion Carp", 165, desert, season.all_seasons, 90) -sea_cucumber = create_fish("Sea Cucumber", 154, ocean, (season.fall, season.winter), 40) -shad = create_fish("Shad", 706, town_river + forest_river, season.not_winter, 45) -slimejack = create_fish("Slimejack", 796, mutant_bug_lair, season.all_seasons, 55) -smallmouth_bass = create_fish("Smallmouth Bass", 137, town_river + forest_river, (season.spring, season.fall), 28) -squid = create_fish("Squid", 151, ocean, season.winter, 75) -stingray = create_fish("Stingray", 836, pirate_cove, season.all_seasons, 80) -stonefish = create_fish("Stonefish", 158, mines_floor_20, season.all_seasons, 65) -sturgeon = create_fish("Sturgeon", 698, mountain_lake, (season.summer, season.winter), 78) -sunfish = create_fish("Sunfish", 145, town_river + forest_river, (season.spring, season.summer), 30) -super_cucumber = create_fish("Super Cucumber", 155, ocean + ginger_island_ocean, (season.summer, season.fall), 80) -tiger_trout = create_fish("Tiger Trout", 699, town_river + forest_river, (season.fall, season.winter), 60) -tilapia = create_fish("Tilapia", 701, ocean + ginger_island_ocean, (season.summer, season.fall), 50) +octopus = create_fish("Octopus", ocean, season.summer, 95) +perch = create_fish("Perch", town_river + forest_river + forest_pond + mountain_lake, season.winter, 35) +pike = create_fish("Pike", town_river + forest_river + forest_pond, (season.summer, season.winter), 60) +pufferfish = create_fish("Pufferfish", ocean + ginger_island_ocean, season.summer, 80) +rainbow_trout = create_fish("Rainbow Trout", town_river + forest_river + mountain_lake, season.summer, 45) +red_mullet = create_fish("Red Mullet", ocean, (season.summer, season.winter), 55) +red_snapper = create_fish("Red Snapper", ocean, (season.summer, season.fall), 40) +salmon = create_fish("Salmon", town_river + forest_river, season.fall, 50) +sandfish = create_fish("Sandfish", desert, season.all_seasons, 65) +sardine = create_fish("Sardine", ocean, (season.spring, season.fall, season.winter), 30) +scorpion_carp = create_fish("Scorpion Carp", desert, season.all_seasons, 90) +sea_cucumber = create_fish("Sea Cucumber", ocean, (season.fall, season.winter), 40) +shad = create_fish("Shad", town_river + forest_river, season.not_winter, 45) +slimejack = create_fish("Slimejack", mutant_bug_lair, season.all_seasons, 55) +smallmouth_bass = create_fish("Smallmouth Bass", town_river + forest_river, (season.spring, season.fall), 28) +squid = create_fish("Squid", ocean, season.winter, 75) +stingray = create_fish("Stingray", pirate_cove, season.all_seasons, 80) +stonefish = create_fish("Stonefish", mines_floor_20, season.all_seasons, 65) +sturgeon = create_fish("Sturgeon", mountain_lake, (season.summer, season.winter), 78) +sunfish = create_fish("Sunfish", town_river + forest_river, (season.spring, season.summer), 30) +super_cucumber = create_fish("Super Cucumber", ocean + ginger_island_ocean, (season.summer, season.fall), 80) +tiger_trout = create_fish("Tiger Trout", town_river + forest_river, (season.fall, season.winter), 60) +tilapia = create_fish("Tilapia", ocean + ginger_island_ocean, (season.summer, season.fall), 50) # Tuna has different seasons on ginger island. Should be changed when the whole fish thing is refactored -tuna = create_fish("Tuna", 130, ocean + ginger_island_ocean, (season.summer, season.winter), 70) -void_salmon = create_fish("Void Salmon", 795, witch_swamp, season.all_seasons, 80) -walleye = create_fish("Walleye", 140, town_river + forest_river + forest_pond + mountain_lake, season.fall, 45) -woodskip = create_fish("Woodskip", 734, secret_woods, season.all_seasons, 50) - -blob_fish = create_fish("Blobfish", 800, night_market, season.winter, 75) -midnight_squid = create_fish("Midnight Squid", 798, night_market, season.winter, 55) -spook_fish = create_fish("Spook Fish", 799, night_market, season.winter, 60) - -angler = create_fish("Angler", 160, town_river, season.fall, 85) -crimsonfish = create_fish("Crimsonfish", 159, ocean, season.summer, 95) -glacierfish = create_fish("Glacierfish", 775, forest_river, season.winter, 100) -legend = create_fish("Legend", 163, mountain_lake, season.spring, 110) -mutant_carp = create_fish("Mutant Carp", 682, sewers, season.all_seasons, 80) - -clam = create_fish("Clam", 372, ocean, season.all_seasons, -1) -cockle = create_fish("Cockle", 718, ocean, season.all_seasons, -1) -crab = create_fish("Crab", 717, ocean, season.all_seasons, -1) -crayfish = create_fish("Crayfish", 716, fresh_water, season.all_seasons, -1) -lobster = create_fish("Lobster", 715, ocean, season.all_seasons, -1) -mussel = create_fish("Mussel", 719, ocean, season.all_seasons, -1) -oyster = create_fish("Oyster", 723, ocean, season.all_seasons, -1) -periwinkle = create_fish("Periwinkle", 722, fresh_water, season.all_seasons, -1) -shrimp = create_fish("Shrimp", 720, ocean, season.all_seasons, -1) -snail = create_fish("Snail", 721, fresh_water, season.all_seasons, -1) - -legendary_fish = [crimsonfish, angler, legend, glacierfish, mutant_carp] +tuna = create_fish("Tuna", ocean + ginger_island_ocean, (season.summer, season.winter), 70) +void_salmon = create_fish("Void Salmon", witch_swamp, season.all_seasons, 80) +walleye = create_fish("Walleye", town_river + forest_river + forest_pond + mountain_lake, season.fall, 45) +woodskip = create_fish("Woodskip", secret_woods, season.all_seasons, 50) + +blob_fish = create_fish("Blobfish", night_market, season.winter, 75) +midnight_squid = create_fish("Midnight Squid", night_market, season.winter, 55) +spook_fish = create_fish("Spook Fish", night_market, season.winter, 60) + +angler = create_fish(Fish.angler, town_river, season.fall, 85, True, False) +crimsonfish = create_fish(Fish.crimsonfish, ocean, season.summer, 95, True, False) +glacierfish = create_fish(Fish.glacierfish, forest_river, season.winter, 100, True, False) +legend = create_fish(Fish.legend, mountain_lake, season.spring, 110, True, False) +mutant_carp = create_fish(Fish.mutant_carp, sewers, season.all_seasons, 80, True, False) + +ms_angler = create_fish(Fish.ms_angler, town_river, season.fall, 85, True, True) +son_of_crimsonfish = create_fish(Fish.son_of_crimsonfish, ocean, season.summer, 95, True, True) +glacierfish_jr = create_fish(Fish.glacierfish_jr, forest_river, season.winter, 100, True, True) +legend_ii = create_fish(Fish.legend_ii, mountain_lake, season.spring, 110, True, True) +radioactive_carp = create_fish(Fish.radioactive_carp, sewers, season.all_seasons, 80, True, True) + +baby_lunaloo = create_fish(SVEFish.baby_lunaloo, ginger_island_ocean, season.all_seasons, 15, mod_name=ModNames.sve) +bonefish = create_fish(SVEFish.bonefish, crimson_badlands, season.all_seasons, 70, mod_name=ModNames.sve) +bull_trout = create_fish(SVEFish.bull_trout, forest_river, season.not_spring, 45, mod_name=ModNames.sve) +butterfish = create_fish(SVEFish.butterfish, shearwater, season.not_winter, 75, mod_name=ModNames.sve) +clownfish = create_fish(SVEFish.clownfish, ginger_island_ocean, season.all_seasons, 45, mod_name=ModNames.sve) +daggerfish = create_fish(SVEFish.daggerfish, highlands, season.all_seasons, 50, mod_name=ModNames.sve) +frog = create_fish(SVEFish.frog, mountain_lake, (season.spring, season.summer), 70, mod_name=ModNames.sve) +gemfish = create_fish(SVEFish.gemfish, highlands, season.all_seasons, 100, mod_name=ModNames.sve) +goldenfish = create_fish(SVEFish.goldenfish, sprite_spring, season.all_seasons, 60, mod_name=ModNames.sve) +grass_carp = create_fish(SVEFish.grass_carp, secret_woods, (season.spring, season.summer), 85, mod_name=ModNames.sve) +king_salmon = create_fish(SVEFish.king_salmon, forest_river, (season.spring, season.summer), 80, mod_name=ModNames.sve) +kittyfish = create_fish(SVEFish.kittyfish, shearwater, (season.fall, season.winter), 85, mod_name=ModNames.sve) +lunaloo = create_fish(SVEFish.lunaloo, ginger_island_ocean, season.all_seasons, 70, mod_name=ModNames.sve) +meteor_carp = create_fish(SVEFish.meteor_carp, sprite_spring, season.all_seasons, 80, mod_name=ModNames.sve) +minnow = create_fish(SVEFish.minnow, town_river, season.all_seasons, 1, mod_name=ModNames.sve) +puppyfish = create_fish(SVEFish.puppyfish, shearwater, season.not_winter, 85, mod_name=ModNames.sve) +radioactive_bass = create_fish(SVEFish.radioactive_bass, sewers, season.all_seasons, 90, mod_name=ModNames.sve) +seahorse = create_fish(SVEFish.seahorse, ginger_island_ocean, season.all_seasons, 25, mod_name=ModNames.sve) +shiny_lunaloo = create_fish(SVEFish.shiny_lunaloo, ginger_island_ocean, season.all_seasons, 110, mod_name=ModNames.sve) +snatcher_worm = create_fish(SVEFish.snatcher_worm, mutant_bug_lair, season.all_seasons, 75, mod_name=ModNames.sve) +starfish = create_fish(SVEFish.starfish, ginger_island_ocean, season.all_seasons, 75, mod_name=ModNames.sve) +torpedo_trout = create_fish(SVEFish.torpedo_trout, fable_reef, season.all_seasons, 70, mod_name=ModNames.sve) +undeadfish = create_fish(SVEFish.undeadfish, crimson_badlands, season.all_seasons, 80, mod_name=ModNames.sve) +void_eel = create_fish(SVEFish.void_eel, witch_swamp, season.all_seasons, 100, mod_name=ModNames.sve) +water_grub = create_fish(SVEFish.water_grub, mutant_bug_lair, season.all_seasons, 60, mod_name=ModNames.sve) +sea_sponge = create_fish(SVEFish.sea_sponge, ginger_island_ocean, season.all_seasons, 40, mod_name=ModNames.sve) +dulse_seaweed = create_fish(SVEFish.dulse_seaweed, vineyard, season.all_seasons, 50, mod_name=ModNames.sve) + +void_minnow = create_fish(DistantLandsFish.void_minnow, witch_swamp, season.all_seasons, 15, mod_name=ModNames.distant_lands) +purple_algae = create_fish(DistantLandsFish.purple_algae, witch_swamp, season.all_seasons, 15, mod_name=ModNames.distant_lands) +swamp_leech = create_fish(DistantLandsFish.swamp_leech, witch_swamp, season.all_seasons, 15, mod_name=ModNames.distant_lands) +giant_horsehoe_crab = create_fish(DistantLandsFish.giant_horsehoe_crab, witch_swamp, season.all_seasons, 90, mod_name=ModNames.distant_lands) + + +clam = create_fish("Clam", ocean, season.all_seasons, -1) +cockle = create_fish("Cockle", ocean, season.all_seasons, -1) +crab = create_fish("Crab", ocean, season.all_seasons, -1) +crayfish = create_fish("Crayfish", fresh_water, season.all_seasons, -1) +lobster = create_fish("Lobster", ocean, season.all_seasons, -1) +mussel = create_fish("Mussel", ocean, season.all_seasons, -1) +oyster = create_fish("Oyster", ocean, season.all_seasons, -1) +periwinkle = create_fish("Periwinkle", fresh_water, season.all_seasons, -1) +shrimp = create_fish("Shrimp", ocean, season.all_seasons, -1) +snail = create_fish("Snail", fresh_water, season.all_seasons, -1) + +legendary_fish = [angler, crimsonfish, glacierfish, legend, mutant_carp] +extended_family = [ms_angler, son_of_crimsonfish, glacierfish_jr, legend_ii, radioactive_carp] special_fish = [*legendary_fish, blob_fish, lava_eel, octopus, scorpion_carp, ice_pip, super_cucumber, dorado] -island_fish = [lionfish, blue_discus, stingray] +island_fish = [lionfish, blue_discus, stingray, *extended_family] all_fish_by_name = {fish.name: fish for fish in all_fish} + + +def get_fish_for_mods(mods: Set[str]) -> List[FishItem]: + fish_for_mods = [] + for fish in all_fish: + if fish.mod_name and fish.mod_name not in mods: + continue + fish_for_mods.append(fish) + return fish_for_mods diff --git a/worlds/stardew_valley/data/game_item.py b/worlds/stardew_valley/data/game_item.py deleted file mode 100644 index cac86d527d86..000000000000 --- a/worlds/stardew_valley/data/game_item.py +++ /dev/null @@ -1,13 +0,0 @@ -from dataclasses import dataclass - - -@dataclass(frozen=True) -class GameItem: - name: str - item_id: int - - def __repr__(self): - return f"{self.name} [{self.item_id}]" - - def __lt__(self, other): - return self.name < other.name diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv index 3c4ddb84156b..a3096cf789df 100644 --- a/worlds/stardew_valley/data/items.csv +++ b/worlds/stardew_valley/data/items.csv @@ -7,48 +7,46 @@ id,name,classification,groups,mod_name 19,Glittering Boulder Removed,progression,COMMUNITY_REWARD, 20,Minecarts Repair,useful,COMMUNITY_REWARD, 21,Bus Repair,progression,COMMUNITY_REWARD, -22,Movie Theater,useful,, +22,Progressive Movie Theater,progression,COMMUNITY_REWARD, 23,Stardrop,progression,, 24,Progressive Backpack,progression,, -25,Rusty Sword,progression,WEAPON, -26,Leather Boots,progression,"FOOTWEAR,MINES_FLOOR_10", -27,Work Boots,useful,"FOOTWEAR,MINES_FLOOR_10", -28,Wooden Blade,progression,"MINES_FLOOR_10,WEAPON", -29,Iron Dirk,progression,"MINES_FLOOR_10,WEAPON", -30,Wind Spire,progression,"MINES_FLOOR_10,WEAPON", -31,Femur,progression,"MINES_FLOOR_10,WEAPON", -32,Steel Smallsword,progression,"MINES_FLOOR_20,WEAPON", -33,Wood Club,progression,"MINES_FLOOR_20,WEAPON", -34,Elf Blade,progression,"MINES_FLOOR_20,WEAPON", -35,Glow Ring,useful,"MINES_FLOOR_20,RING", -36,Magnet Ring,useful,"MINES_FLOOR_20,RING", -37,Slingshot,progression,WEAPON, -38,Tundra Boots,useful,"FOOTWEAR,MINES_FLOOR_50", -39,Thermal Boots,useful,"FOOTWEAR,MINES_FLOOR_50", -40,Combat Boots,useful,"FOOTWEAR,MINES_FLOOR_50", -41,Silver Saber,progression,"MINES_FLOOR_50,WEAPON", -42,Pirate's Sword,progression,"MINES_FLOOR_50,WEAPON", -43,Crystal Dagger,progression,"MINES_FLOOR_60,WEAPON", -44,Cutlass,progression,"MINES_FLOOR_60,WEAPON", -45,Iron Edge,progression,"MINES_FLOOR_60,WEAPON", -46,Burglar's Shank,progression,"MINES_FLOOR_60,WEAPON", -47,Wood Mallet,progression,"MINES_FLOOR_60,WEAPON", -48,Master Slingshot,progression,WEAPON, -49,Firewalker Boots,useful,"FOOTWEAR,MINES_FLOOR_80", -50,Dark Boots,useful,"FOOTWEAR,MINES_FLOOR_80", -51,Claymore,progression,"MINES_FLOOR_80,WEAPON", -52,Templar's Blade,progression,"MINES_FLOOR_80,WEAPON", -53,Kudgel,progression,"MINES_FLOOR_80,WEAPON", -54,Shadow Dagger,progression,"MINES_FLOOR_80,WEAPON", -55,Obsidian Edge,progression,"MINES_FLOOR_90,WEAPON", -56,Tempered Broadsword,progression,"MINES_FLOOR_90,WEAPON", -57,Wicked Kris,progression,"MINES_FLOOR_90,WEAPON", -58,Bone Sword,progression,"MINES_FLOOR_90,WEAPON", -59,Ossified Blade,progression,"MINES_FLOOR_90,WEAPON", -60,Space Boots,useful,"FOOTWEAR,MINES_FLOOR_110", -61,Crystal Shoes,useful,"FOOTWEAR,MINES_FLOOR_110", -62,Steel Falchion,progression,"MINES_FLOOR_110,WEAPON", -63,The Slammer,progression,"MINES_FLOOR_110,WEAPON", +25,Rusty Sword,filler,"WEAPON,DEPRECATED", +26,Leather Boots,filler,"FOOTWEAR,DEPRECATED", +27,Work Boots,filler,"FOOTWEAR,DEPRECATED", +28,Wooden Blade,filler,"WEAPON,DEPRECATED", +29,Iron Dirk,filler,"WEAPON,DEPRECATED", +30,Wind Spire,filler,"WEAPON,DEPRECATED", +31,Femur,filler,"WEAPON,DEPRECATED", +32,Steel Smallsword,filler,"WEAPON,DEPRECATED", +33,Wood Club,filler,"WEAPON,DEPRECATED", +34,Elf Blade,filler,"WEAPON,DEPRECATED", +37,Slingshot,filler,"WEAPON,DEPRECATED", +38,Tundra Boots,filler,"FOOTWEAR,DEPRECATED", +39,Thermal Boots,filler,"FOOTWEAR,DEPRECATED", +40,Combat Boots,filler,"FOOTWEAR,DEPRECATED", +41,Silver Saber,filler,"WEAPON,DEPRECATED", +42,Pirate's Sword,filler,"WEAPON,DEPRECATED", +43,Crystal Dagger,filler,"WEAPON,DEPRECATED", +44,Cutlass,filler,"WEAPON,DEPRECATED", +45,Iron Edge,filler,"WEAPON,DEPRECATED", +46,Burglar's Shank,filler,"WEAPON,DEPRECATED", +47,Wood Mallet,filler,"WEAPON,DEPRECATED", +48,Master Slingshot,filler,"WEAPON,DEPRECATED", +49,Firewalker Boots,filler,"FOOTWEAR,DEPRECATED", +50,Dark Boots,filler,"FOOTWEAR,DEPRECATED", +51,Claymore,filler,"WEAPON,DEPRECATED", +52,Templar's Blade,filler,"WEAPON,DEPRECATED", +53,Kudgel,filler,"WEAPON,DEPRECATED", +54,Shadow Dagger,filler,"WEAPON,DEPRECATED", +55,Obsidian Edge,filler,"WEAPON,DEPRECATED", +56,Tempered Broadsword,filler,"WEAPON,DEPRECATED", +57,Wicked Kris,filler,"WEAPON,DEPRECATED", +58,Bone Sword,filler,"WEAPON,DEPRECATED", +59,Ossified Blade,filler,"WEAPON,DEPRECATED", +60,Space Boots,filler,"FOOTWEAR,DEPRECATED", +61,Crystal Shoes,filler,"FOOTWEAR,DEPRECATED", +62,Steel Falchion,filler,"WEAPON,DEPRECATED", +63,The Slammer,filler,"WEAPON,DEPRECATED", 64,Skull Key,progression,, 65,Progressive Hoe,progression,PROGRESSIVE_TOOLS, 66,Progressive Pickaxe,progression,PROGRESSIVE_TOOLS, @@ -63,40 +61,40 @@ id,name,classification,groups,mod_name 75,Foraging Level,progression,SKILL_LEVEL_UP, 76,Mining Level,progression,SKILL_LEVEL_UP, 77,Combat Level,progression,SKILL_LEVEL_UP, -78,Earth Obelisk,progression,, -79,Water Obelisk,progression,, -80,Desert Obelisk,progression,, -81,Island Obelisk,progression,GINGER_ISLAND, -82,Junimo Hut,useful,, -83,Gold Clock,progression,, -84,Progressive Coop,progression,, -85,Progressive Barn,progression,, -86,Well,useful,, -87,Silo,progression,, -88,Mill,progression,, -89,Progressive Shed,progression,, -90,Fish Pond,progression,, -91,Stable,useful,, -92,Slime Hutch,useful,, -93,Shipping Bin,progression,, +78,Earth Obelisk,progression,WIZARD_BUILDING, +79,Water Obelisk,progression,WIZARD_BUILDING, +80,Desert Obelisk,progression,WIZARD_BUILDING, +81,Island Obelisk,progression,"WIZARD_BUILDING,GINGER_ISLAND", +82,Junimo Hut,useful,WIZARD_BUILDING, +83,Gold Clock,progression,WIZARD_BUILDING, +84,Progressive Coop,progression,BUILDING, +85,Progressive Barn,progression,BUILDING, +86,Well,useful,BUILDING, +87,Silo,progression,BUILDING, +88,Mill,progression,BUILDING, +89,Progressive Shed,progression,BUILDING, +90,Fish Pond,progression,BUILDING, +91,Stable,useful,BUILDING, +92,Slime Hutch,progression,BUILDING, +93,Shipping Bin,progression,BUILDING, 94,Beach Bridge,progression,, -95,Adventurer's Guild,progression,, +95,Adventurer's Guild,progression,DEPRECATED, 96,Club Card,progression,, 97,Magnifying Glass,progression,, 98,Bear's Knowledge,progression,, -99,Iridium Snake Milk,progression,, +99,Iridium Snake Milk,useful,, 100,JotPK: Progressive Boots,progression,ARCADE_MACHINE_BUFFS, 101,JotPK: Progressive Gun,progression,ARCADE_MACHINE_BUFFS, 102,JotPK: Progressive Ammo,progression,ARCADE_MACHINE_BUFFS, 103,JotPK: Extra Life,progression,ARCADE_MACHINE_BUFFS, 104,JotPK: Increased Drop Rate,progression,ARCADE_MACHINE_BUFFS, 105,Junimo Kart: Extra Life,progression,ARCADE_MACHINE_BUFFS, -106,Galaxy Sword,progression,"GALAXY_WEAPONS,WEAPON", -107,Galaxy Dagger,progression,"GALAXY_WEAPONS,WEAPON", -108,Galaxy Hammer,progression,"GALAXY_WEAPONS,WEAPON", +106,Galaxy Sword,filler,"WEAPON,DEPRECATED", +107,Galaxy Dagger,filler,"WEAPON,DEPRECATED", +108,Galaxy Hammer,filler,"WEAPON,DEPRECATED", 109,Movement Speed Bonus,progression,, 110,Luck Bonus,progression,, -111,Lava Katana,progression,"MINES_FLOOR_110,WEAPON", +111,Lava Katana,filler,"WEAPON,DEPRECATED", 112,Progressive House,progression,, 113,Traveling Merchant: Sunday,progression,TRAVELING_MERCHANT_DAY, 114,Traveling Merchant: Monday,progression,TRAVELING_MERCHANT_DAY, @@ -105,8 +103,8 @@ id,name,classification,groups,mod_name 117,Traveling Merchant: Thursday,progression,TRAVELING_MERCHANT_DAY, 118,Traveling Merchant: Friday,progression,TRAVELING_MERCHANT_DAY, 119,Traveling Merchant: Saturday,progression,TRAVELING_MERCHANT_DAY, -120,Traveling Merchant Stock Size,progression,, -121,Traveling Merchant Discount,progression,, +120,Traveling Merchant Stock Size,useful,, +121,Traveling Merchant Discount,useful,, 122,Return Scepter,useful,, 123,Progressive Season,progression,, 124,Spring,progression,SEASON, @@ -223,7 +221,7 @@ id,name,classification,groups,mod_name 235,Quality Bobber Recipe,progression,SPECIAL_ORDER_BOARD, 236,Mini-Obelisk Recipe,progression,SPECIAL_ORDER_BOARD, 237,Monster Musk Recipe,progression,SPECIAL_ORDER_BOARD, -239,Sewing Machine,progression,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD", +239,Sewing Machine,useful,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD", 240,Coffee Maker,progression,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD", 241,Mini-Fridge,useful,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD", 242,Mini-Shipping Bin,progression,"RESOURCE_PACK_USEFUL,SPECIAL_ORDER_BOARD", @@ -245,7 +243,7 @@ id,name,classification,groups,mod_name 258,Banana Sapling,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY", 259,Mango Sapling,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL,CROPSANITY", 260,Boat Repair,progression,GINGER_ISLAND, -261,Open Professor Snail Cave,progression,"GINGER_ISLAND", +261,Open Professor Snail Cave,progression,GINGER_ISLAND, 262,Island North Turtle,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 263,Island West Turtle,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 264,Island Farmhouse,progression,"GINGER_ISLAND,WALNUT_PURCHASE", @@ -254,42 +252,218 @@ id,name,classification,groups,mod_name 267,Dig Site Bridge,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 268,Island Trader,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 269,Volcano Bridge,progression,"GINGER_ISLAND,WALNUT_PURCHASE", -270,Volcano Exit Shortcut,progression,"GINGER_ISLAND,WALNUT_PURCHASE", +270,Volcano Exit Shortcut,useful,"GINGER_ISLAND,WALNUT_PURCHASE", 271,Island Resort,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 272,Parrot Express,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 273,Qi Walnut Room,progression,"GINGER_ISLAND,WALNUT_PURCHASE", 274,Pineapple Seeds,progression,"GINGER_ISLAND,CROPSANITY", 275,Taro Tuber,progression,"GINGER_ISLAND,CROPSANITY", -276,Weather Report,useful,"TV_CHANNEL", -277,Fortune Teller,useful,"TV_CHANNEL", -278,Livin' Off The Land,useful,"TV_CHANNEL", -279,The Queen of Sauce,progression,"TV_CHANNEL", -280,Fishing Information Broadcasting Service,useful,"TV_CHANNEL", -281,Sinister Signal,useful,"TV_CHANNEL", +276,Weather Report,useful,TV_CHANNEL, +277,Fortune Teller,useful,TV_CHANNEL, +278,Livin' Off The Land,useful,TV_CHANNEL, +279,The Queen of Sauce,progression,TV_CHANNEL, +280,Fishing Information Broadcasting Service,useful,TV_CHANNEL, +281,Sinister Signal,filler,TV_CHANNEL, 282,Dark Talisman,progression,, -283,Ostrich Incubator Recipe,progression,"GINGER_ISLAND", -284,Cute Baby,progression,"BABY", -285,Ugly Baby,progression,"BABY", -286,Deluxe Scarecrow Recipe,progression,"FESTIVAL,RARECROW", -287,Treehouse,progression,"GINGER_ISLAND", +283,Ostrich Incubator Recipe,progression,GINGER_ISLAND, +284,Cute Baby,progression,BABY, +285,Ugly Baby,progression,BABY, +286,Deluxe Scarecrow Recipe,progression,RARECROW, +287,Treehouse,progression,GINGER_ISLAND, 288,Coffee Bean,progression,CROPSANITY, -4001,Burnt,trap,TRAP, -4002,Darkness,trap,TRAP, -4003,Frozen,trap,TRAP, -4004,Jinxed,trap,TRAP, -4005,Nauseated,trap,TRAP, -4006,Slimed,trap,TRAP, -4007,Weakness,trap,TRAP, -4008,Taxes,trap,TRAP, -4009,Random Teleport,trap,TRAP, -4010,The Crows,trap,TRAP, -4011,Monsters,trap,TRAP, -4012,Entrance Reshuffle,trap,"TRAP,DEPRECATED", -4013,Debris,trap,TRAP, -4014,Shuffle,trap,TRAP, -4015,Temporary Winter,trap,"TRAP,DEPRECATED", -4016,Pariah,trap,TRAP, -4017,Drought,trap,TRAP, +289,Progressive Weapon,progression,"WEAPON,WEAPON_GENERIC", +290,Progressive Sword,progression,"WEAPON,WEAPON_SWORD", +291,Progressive Club,progression,"WEAPON,WEAPON_CLUB", +292,Progressive Dagger,progression,"WEAPON,WEAPON_DAGGER", +293,Progressive Slingshot,progression,"WEAPON,WEAPON_SLINGSHOT", +294,Progressive Footwear,useful,FOOTWEAR, +295,Small Glow Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE", +296,Glow Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +297,Small Magnet Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE", +298,Magnet Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +299,Slime Charmer Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +300,Warrior Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +301,Vampire Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +302,Savage Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +303,Ring of Yoba,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +304,Sturdy Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +305,Burglar's Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +306,Iridium Band,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +307,Jukebox Ring,filler,"RING,RESOURCE_PACK,MAXIMUM_ONE", +308,Amethyst Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +309,Topaz Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +310,Aquamarine Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +311,Jade Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +312,Emerald Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +313,Ruby Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +314,Wedding Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +315,Crabshell Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +316,Napalm Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +317,Thorns Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +318,Lucky Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +319,Hot Java Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +320,Protection Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +321,Soul Sapper Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +322,Phoenix Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +323,Immunity Band,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +324,Glowstone Ring,useful,"RING,RESOURCE_PACK,MAXIMUM_ONE", +325,Fairy Dust Recipe,progression,, +326,Heavy Tapper Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND", +327,Hyper Speed-Gro Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND", +328,Deluxe Fertilizer Recipe,progression,QI_CRAFTING_RECIPE, +329,Hopper Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND", +330,Magic Bait Recipe,progression,"QI_CRAFTING_RECIPE,GINGER_ISLAND", +331,Jack-O-Lantern Recipe,progression,FESTIVAL, +333,Tub o' Flowers Recipe,progression,FESTIVAL, +335,Moonlight Jellies Banner,filler,FESTIVAL, +336,Starport Decal,filler,FESTIVAL, +337,Golden Egg,progression,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", +340,Algae Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +341,Artichoke Dip Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +342,Autumn's Bounty Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +343,Baked Fish Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +344,Banana Pudding Recipe,progression,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +345,Bean Hotpot Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +346,Blackberry Cobbler Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +347,Blueberry Tart Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +348,Bread Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_FRIENDSHIP,CHEFSANITY_PURCHASE", +349,Bruschetta Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +350,Carp Surprise Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +351,Cheese Cauliflower Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +352,Chocolate Cake Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +353,Chowder Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +354,Coleslaw Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +355,Complete Breakfast Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +356,Cookies Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +357,Crab Cakes Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +358,Cranberry Candy Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +359,Cranberry Sauce Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +360,Crispy Bass Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +361,Dish O' The Sea Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +362,Eggplant Parmesan Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +363,Escargot Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +364,Farmer's Lunch Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +365,Fiddlehead Risotto Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +366,Fish Stew Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +367,Fish Taco Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +368,Fried Calamari Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +369,Fried Eel Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +370,Fried Egg Recipe,progression,CHEFSANITY_STARTER, +371,Fried Mushroom Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +372,Fruit Salad Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +373,Ginger Ale Recipe,progression,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +374,Glazed Yams Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +375,Hashbrowns Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +376,Ice Cream Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +377,Lobster Bisque Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_FRIENDSHIP", +378,Lucky Lunch Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +379,Maki Roll Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +380,Mango Sticky Rice Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP,GINGER_ISLAND", +381,Maple Bar Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +382,Miner's Treat Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +383,Omelet Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +384,Pale Broth Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +385,Pancakes Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +386,Parsnip Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +387,Pepper Poppers Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +388,Pink Cake Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +389,Pizza Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +390,Plum Pudding Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +391,Poi Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP,GINGER_ISLAND", +392,Poppyseed Muffin Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +393,Pumpkin Pie Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +394,Pumpkin Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +395,Radish Salad Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +396,Red Plate Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +397,Rhubarb Pie Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +398,Rice Pudding Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +399,Roasted Hazelnuts Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +400,Roots Platter Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +401,Salad Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +402,Salmon Dinner Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +403,Sashimi Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +404,Seafoam Pudding Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +405,Shrimp Cocktail Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +406,Spaghetti Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +407,Spicy Eel Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +408,Squid Ink Ravioli Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +409,Stir Fry Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +410,Strange Bun Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +411,Stuffing Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +412,Super Meal Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +413,Survival Burger Recipe,progression,"CHEFSANITY,CHEFSANITY_SKILL", +414,Tom Kha Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +415,Tortilla Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +416,Triple Shot Espresso Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE", +417,Tropical Curry Recipe,progression,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +418,Trout Soup Recipe,progression,"CHEFSANITY,CHEFSANITY_QOS", +419,Vegetable Medley Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +425,Gate Recipe,progression,CRAFTSANITY, +426,Wood Fence Recipe,progression,CRAFTSANITY, +427,Deluxe Retaining Soil Recipe,progression,"CRAFTSANITY,GINGER_ISLAND", +428,Grass Starter Recipe,progression,CRAFTSANITY, +429,Wood Floor Recipe,progression,CRAFTSANITY, +430,Rustic Plank Floor Recipe,progression,CRAFTSANITY, +431,Straw Floor Recipe,progression,CRAFTSANITY, +432,Weathered Floor Recipe,progression,CRAFTSANITY, +433,Crystal Floor Recipe,progression,CRAFTSANITY, +434,Stone Floor Recipe,progression,CRAFTSANITY, +435,Stone Walkway Floor Recipe,progression,CRAFTSANITY, +436,Brick Floor Recipe,progression,CRAFTSANITY, +437,Wood Path Recipe,progression,CRAFTSANITY, +438,Gravel Path Recipe,progression,CRAFTSANITY, +439,Cobblestone Path Recipe,progression,CRAFTSANITY, +440,Stepping Stone Path Recipe,progression,CRAFTSANITY, +441,Crystal Path Recipe,progression,CRAFTSANITY, +442,Wedding Ring Recipe,progression,CRAFTSANITY, +443,Warp Totem: Desert Recipe,progression,CRAFTSANITY, +444,Warp Totem: Island Recipe,progression,"CRAFTSANITY,GINGER_ISLAND", +445,Torch Recipe,progression,CRAFTSANITY, +446,Campfire Recipe,progression,CRAFTSANITY, +447,Wooden Brazier Recipe,progression,CRAFTSANITY, +448,Stone Brazier Recipe,progression,CRAFTSANITY, +449,Gold Brazier Recipe,progression,CRAFTSANITY, +450,Carved Brazier Recipe,progression,CRAFTSANITY, +451,Stump Brazier Recipe,progression,CRAFTSANITY, +452,Barrel Brazier Recipe,progression,CRAFTSANITY, +453,Skull Brazier Recipe,progression,CRAFTSANITY, +454,Marble Brazier Recipe,progression,CRAFTSANITY, +455,Wood Lamp-post Recipe,progression,CRAFTSANITY, +456,Iron Lamp-post Recipe,progression,CRAFTSANITY, +457,Furnace Recipe,progression,CRAFTSANITY, +458,Wicked Statue Recipe,progression,CRAFTSANITY, +459,Chest Recipe,progression,CRAFTSANITY, +460,Wood Sign Recipe,progression,CRAFTSANITY, +461,Stone Sign Recipe,progression,CRAFTSANITY, +469,Railroad Boulder Removed,progression,, +470,Fruit Bats,progression,, +471,Mushroom Boxes,progression,, +475,The Gateway Gazette,progression,TV_CHANNEL, +4001,Burnt Trap,trap,TRAP, +4002,Darkness Trap,trap,TRAP, +4003,Frozen Trap,trap,TRAP, +4004,Jinxed Trap,trap,TRAP, +4005,Nauseated Trap,trap,TRAP, +4006,Slimed Trap,trap,TRAP, +4007,Weakness Trap,trap,TRAP, +4008,Taxes Trap,trap,TRAP, +4009,Random Teleport Trap,trap,TRAP, +4010,The Crows Trap,trap,TRAP, +4011,Monsters Trap,trap,TRAP, +4012,Entrance Reshuffle Trap,trap,"TRAP,DEPRECATED", +4013,Debris Trap,trap,TRAP, +4014,Shuffle Trap,trap,TRAP, +4015,Temporary Winter Trap,trap,"TRAP,DEPRECATED", +4016,Pariah Trap,trap,TRAP, +4017,Drought Trap,trap,TRAP, +4018,Time Flies Trap,trap,TRAP, +4019,Babies Trap,trap,TRAP, +4020,Meow Trap,trap,TRAP, +4021,Bark Trap,trap,TRAP, +4022,Depression Trap,trap,"TRAP,DEPRECATED", +4023,Benjamin Budton Trap,trap,TRAP, +4024,Inflation Trap,trap,TRAP, +4025,Bomb Trap,trap,TRAP, 5000,Resource Pack: 500 Money,useful,"BASE_RESOURCE,RESOURCE_PACK", 5001,Resource Pack: 1000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK", 5002,Resource Pack: 1500 Money,useful,"BASE_RESOURCE,RESOURCE_PACK", @@ -336,12 +510,12 @@ id,name,classification,groups,mod_name 5043,Resource Pack: 7 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", 5044,Resource Pack: 9 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", 5045,Resource Pack: 10 Warp Totem: Farm,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", -5046,Resource Pack: 1 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", -5047,Resource Pack: 3 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", -5048,Resource Pack: 5 Warp Totem: Island,filler,"RESOURCE_PACK,WARP_TOTEM", -5049,Resource Pack: 7 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", -5050,Resource Pack: 9 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", -5051,Resource Pack: 10 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", +5046,Resource Pack: 1 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", +5047,Resource Pack: 3 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", +5048,Resource Pack: 5 Warp Totem: Island,filler,"RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", +5049,Resource Pack: 7 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", +5050,Resource Pack: 9 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", +5051,Resource Pack: 10 Warp Totem: Island,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM,GINGER_ISLAND", 5052,Resource Pack: 1 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", 5053,Resource Pack: 3 Warp Totem: Mountains,filler,"DEPRECATED,RESOURCE_PACK,WARP_TOTEM", 5054,Resource Pack: 5 Warp Totem: Mountains,filler,"RESOURCE_PACK,WARP_TOTEM", @@ -492,7 +666,7 @@ id,name,classification,groups,mod_name 5199,Friendship Bonus (2 <3),useful,"FRIENDSHIP_PACK,COMMUNITY_REWARD", 5200,Friendship Bonus (3 <3),useful,"DEPRECATED,FRIENDSHIP_PACK,RESOURCE_PACK", 5201,Friendship Bonus (4 <3),useful,"DEPRECATED,FRIENDSHIP_PACK,RESOURCE_PACK", -5202,30 Qi Gems,useful,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5202,15 Qi Gems,progression,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5203,Solar Panel,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5204,Geode Crusher,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5205,Farm Computer,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", @@ -507,36 +681,29 @@ id,name,classification,groups,mod_name 5214,Quality Sprinkler,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5215,Iridium Sprinkler,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5216,Scarecrow,filler,RESOURCE_PACK, -5217,Deluxe Scarecrow,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5217,Deluxe Scarecrow,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5218,Furnace,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5219,Charcoal Kiln,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5220,Lightning Rod,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5221,Resource Pack: 5000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5222,Resource Pack: 10000 Money,useful,"BASE_RESOURCE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5223,Junimo Chest,filler,"EXACTLY_TWO,RESOURCE_PACK", -5224,Horse Flute,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5225,Pierre's Missing Stocklist,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5224,Horse Flute,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5225,Pierre's Missing Stocklist,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5226,Hopper,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5227,Enricher,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5228,Pressure Nozzle,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5229,Deconstructor,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5230,Key To The Town,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5230,Key To The Town,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5231,Galaxy Soul,filler,"GINGER_ISLAND,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5232,Mushroom Tree Seed,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5233,Resource Pack: 20 Magic Bait,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5234,Resource Pack: 10 Qi Seasoning,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5235,Mr. Qi's Hat,filler,"MAXIMUM_ONE,RESOURCE_PACK", 5236,Aquatic Sanctuary,filler,RESOURCE_PACK, -5237,Heavy Tapper Recipe,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5238,Hyper Speed-Gro Recipe,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5239,Deluxe Fertilizer Recipe,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5240,Hopper Recipe,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5241,Magic Bait Recipe,filler,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5242,Exotic Double Bed,filler,RESOURCE_PACK, -5243,Resource Pack: 2 Qi Gem,filler,"GINGER_ISLAND,RESOURCE_PACK", -5244,Golden Egg,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5243,Resource Pack: 2 Qi Gem,filler,"GINGER_ISLAND,RESOURCE_PACK,DEPRECATED", 5245,Golden Walnut,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL,GINGER_ISLAND", -5246,Fairy Dust Recipe,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5247,Fairy Dust,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5248,Seed Maker,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5249,Keg,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", @@ -552,10 +719,13 @@ id,name,classification,groups,mod_name 5259,Worm Bin,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5260,Tapper,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5261,Heavy Tapper,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", -5262,Slime Incubator,useful,"RESOURCE_PACK", -5263,Slime Egg-Press,useful,"RESOURCE_PACK", +5262,Slime Incubator,useful,RESOURCE_PACK, +5263,Slime Egg-Press,useful,RESOURCE_PACK, 5264,Crystalarium,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 5265,Ostrich Incubator,useful,"MAXIMUM_ONE,RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5266,Resource Pack: 5 Staircase,filler,"RESOURCE_PACK", +5267,Auto-Petter,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", +5268,Auto-Grabber,useful,"RESOURCE_PACK,RESOURCE_PACK_USEFUL", 10001,Luck Level,progression,SKILL_LEVEL_UP,Luck Skill 10002,Magic Level,progression,SKILL_LEVEL_UP,Magic 10003,Socializing Level,progression,SKILL_LEVEL_UP,Socializing Skill @@ -569,14 +739,14 @@ id,name,classification,groups,mod_name 10011,Spell: Water,progression,MAGIC_SPELL,Magic 10012,Spell: Blink,progression,MAGIC_SPELL,Magic 10013,Spell: Evac,useful,MAGIC_SPELL,Magic -10014,Spell: Haste,filler,MAGIC_SPELL,Magic +10014,Spell: Haste,useful,MAGIC_SPELL,Magic 10015,Spell: Heal,progression,MAGIC_SPELL,Magic 10016,Spell: Buff,useful,MAGIC_SPELL,Magic 10017,Spell: Shockwave,progression,MAGIC_SPELL,Magic 10018,Spell: Fireball,progression,MAGIC_SPELL,Magic -10019,Spell: Frostbite,progression,MAGIC_SPELL,Magic +10019,Spell: Frostbolt,progression,MAGIC_SPELL,Magic 10020,Spell: Teleport,progression,MAGIC_SPELL,Magic -10021,Spell: Lantern,filler,MAGIC_SPELL,Magic +10021,Spell: Lantern,useful,MAGIC_SPELL,Magic 10022,Spell: Tendrils,progression,MAGIC_SPELL,Magic 10023,Spell: Photosynthesis,useful,MAGIC_SPELL,Magic 10024,Spell: Descend,progression,MAGIC_SPELL,Magic @@ -585,6 +755,9 @@ id,name,classification,groups,mod_name 10027,Spell: Lucksteal,useful,MAGIC_SPELL,Magic 10028,Spell: Spirit,progression,MAGIC_SPELL,Magic 10029,Spell: Rewind,useful,MAGIC_SPELL,Magic +10030,Pendant of Community,progression,,DeepWoods +10031,Pendant of Elders,progression,,DeepWoods +10032,Pendant of Depths,progression,,DeepWoods 10101,Juna <3,progression,FRIENDSANITY,Juna - Roommate NPC 10102,Jasper <3,progression,FRIENDSANITY,Professor Jasper Thomas 10103,Alec <3,progression,FRIENDSANITY,Alec Revisited @@ -596,5 +769,91 @@ id,name,classification,groups,mod_name 10109,Delores <3,progression,FRIENDSANITY,Delores - Custom NPC 10110,Ayeisha <3,progression,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) 10111,Riley <3,progression,FRIENDSANITY,Custom NPC - Riley +10112,Claire <3,progression,FRIENDSANITY,Stardew Valley Expanded +10113,Lance <3,progression,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +10114,Olivia <3,progression,FRIENDSANITY,Stardew Valley Expanded +10115,Sophia <3,progression,FRIENDSANITY,Stardew Valley Expanded +10116,Victor <3,progression,FRIENDSANITY,Stardew Valley Expanded +10117,Andy <3,progression,FRIENDSANITY,Stardew Valley Expanded +10118,Apples <3,progression,FRIENDSANITY,Stardew Valley Expanded +10119,Gunther <3,progression,FRIENDSANITY,Stardew Valley Expanded +10120,Martin <3,progression,FRIENDSANITY,Stardew Valley Expanded +10121,Marlon <3,progression,FRIENDSANITY,Stardew Valley Expanded +10122,Morgan <3,progression,FRIENDSANITY,Stardew Valley Expanded +10123,Scarlett <3,progression,FRIENDSANITY,Stardew Valley Expanded +10124,Susan <3,progression,FRIENDSANITY,Stardew Valley Expanded +10125,Morris <3,progression,FRIENDSANITY,Stardew Valley Expanded +10126,Alecto <3,progression,FRIENDSANITY,Alecto the Witch +10127,Zic <3,progression,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +10128,Lacey <3,progression,FRIENDSANITY,Hat Mouse Lacey +10129,Gregory <3,progression,FRIENDSANITY,Boarding House and Bus Stop Extension +10130,Sheila <3,progression,FRIENDSANITY,Boarding House and Bus Stop Extension +10131,Joel <3,progression,FRIENDSANITY,Boarding House and Bus Stop Extension 10301,Progressive Woods Obelisk Sigils,progression,,DeepWoods 10302,Progressive Skull Cavern Elevator,progression,,Skull Cavern Elevator +10401,Baked Berry Oatmeal Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10402,Big Bark Burger Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10403,Flower Cookie Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10404,Frog Legs Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10405,Glazed Butterfish Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10406,Mixed Berry Pie Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10407,Mushroom Berry Rice Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10408,Seaweed Salad Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10409,Void Delight Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10410,Void Salmon Sushi Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +10411,Mushroom Kebab Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +10412,Crayfish Soup Recipe,progression,,Distant Lands - Witch Swamp Overhaul +10413,Pemmican Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +10414,Void Mint Tea Recipe,progression,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +10415,Ginger Tincture Recipe,progression,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul +10416,Special Pumpkin Soup Recipe,progression,,Boarding House and Bus Stop Extension +10450,Void Mint Seeds,progression,DEPRECATED,Distant Lands - Witch Swamp Overhaul +10451,Vile Ancient Fruit Seeds,progression,DEPRECATED,Distant Lands - Witch Swamp Overhaul +10501,Marlon's Boat Paddle,progression,GINGER_ISLAND,Stardew Valley Expanded +10502,Diamond Wand,filler,"WEAPON,DEPRECATED",Stardew Valley Expanded +10503,Iridium Bomb,progression,,Stardew Valley Expanded +10504,Void Spirit Peace Agreement,useful,GINGER_ISLAND,Stardew Valley Expanded +10505,Kittyfish Spell,progression,,Stardew Valley Expanded +10506,Nexus: Adventurer's Guild Runes,progression,MOD_WARP,Stardew Valley Expanded +10507,Nexus: Junimo Woods Runes,progression,MOD_WARP,Stardew Valley Expanded +10508,Nexus: Aurora Vineyard Runes,progression,MOD_WARP,Stardew Valley Expanded +10509,Nexus: Sprite Spring Runes,progression,MOD_WARP,Stardew Valley Expanded +10510,Nexus: Outpost Runes,progression,MOD_WARP,Stardew Valley Expanded +10511,Nexus: Farm Runes,progression,MOD_WARP,Stardew Valley Expanded +10512,Nexus: Wizard Runes,progression,MOD_WARP,Stardew Valley Expanded +10513,Fable Reef Portal,progression,GINGER_ISLAND,Stardew Valley Expanded +10514,Tempered Galaxy Sword,filler,"WEAPON,DEPRECATED",Stardew Valley Expanded +10515,Tempered Galaxy Dagger,filler,"WEAPON,DEPRECATED",Stardew Valley Expanded +10516,Tempered Galaxy Hammer,filler,"WEAPON,DEPRECATED",Stardew Valley Expanded +10517,Grandpa's Shed,progression,,Stardew Valley Expanded +10518,Aurora Vineyard Tablet,progression,,Stardew Valley Expanded +10519,Scarlett's Job Offer,progression,,Stardew Valley Expanded +10520,Morgan's Schooling,progression,,Stardew Valley Expanded +10601,Magic Elixir Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic +10602,Travel Core Recipe,progression,CRAFTSANITY,Magic +10603,Haste Elixir Recipe,progression,CRAFTSANITY,Stardew Valley Expanded +10604,Hero Elixir Recipe,progression,CRAFTSANITY,Stardew Valley Expanded +10605,Armor Elixir Recipe,progression,CRAFTSANITY,Stardew Valley Expanded +10606,Neanderthal Skeleton Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10607,Pterodactyl Skeleton L Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10608,Pterodactyl Skeleton M Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10609,Pterodactyl Skeleton R Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10610,T-Rex Skeleton L Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10611,T-Rex Skeleton M Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10612,T-Rex Skeleton R Recipe,progression,CRAFTSANITY,Boarding House and Bus Stop Extension +10701,Resource Pack: 3 Magic Elixir,filler,RESOURCE_PACK,Magic +10702,Resource Pack: 3 Travel Core,filler,RESOURCE_PACK,Magic +10703,Preservation Chamber,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology +10704,Hardwood Preservation Chamber,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology +10705,Resource Pack: 3 Water Shifter,filler,RESOURCE_PACK,Archaeology +10706,Resource Pack: 5 Hardwood Display,filler,RESOURCE_PACK,Archaeology +10707,Resource Pack: 5 Wooden Display,filler,RESOURCE_PACK,Archaeology +10708,Grinder,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology +10709,Ancient Battery Production Station,filler,"RESOURCE_PACK,RESOURCE_PACK_USEFUL",Archaeology +10710,Hero Elixir,filler,RESOURCE_PACK,Starde Valley Expanded +10711,Aegis Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded +10712,Haste Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded +10713,Lightning Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded +10714,Armor Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded +10715,Gravity Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded +10716,Barbarian Elixir,filler,RESOURCE_PACK,Stardew Valley Expanded diff --git a/worlds/stardew_valley/data/locations.csv b/worlds/stardew_valley/data/locations.csv index ef56bf5a12ba..68667ac5c4bf 100644 --- a/worlds/stardew_valley/data/locations.csv +++ b/worlds/stardew_valley/data/locations.csv @@ -1,1291 +1,2939 @@ -id,region,name,tags,mod_name -1,Crafts Room,Spring Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -2,Crafts Room,Summer Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -3,Crafts Room,Fall Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -4,Crafts Room,Winter Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -5,Crafts Room,Construction Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -6,Crafts Room,Exotic Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE,MANDATORY", -7,Pantry,Spring Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -8,Pantry,Summer Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -9,Pantry,Fall Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -10,Pantry,Quality Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -11,Pantry,Animal Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -12,Pantry,Artisan Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,PANTRY_BUNDLE", -13,Fish Tank,River Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -14,Fish Tank,Lake Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -15,Fish Tank,Ocean Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -16,Fish Tank,Night Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -17,Fish Tank,Crab Pot Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -18,Fish Tank,Specialty Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE,MANDATORY", -19,Boiler Room,Blacksmith's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -20,Boiler Room,Geologist's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -21,Boiler Room,Adventurer's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -22,Bulletin Board,Chef's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -23,Bulletin Board,Dye Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -24,Bulletin Board,Field Research Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -25,Bulletin Board,Fodder Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -26,Bulletin Board,Enchanter's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY", -27,Vault,"2,500g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,VAULT_BUNDLE", -28,Vault,"5,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,VAULT_BUNDLE", -29,Vault,"10,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,VAULT_BUNDLE", -30,Vault,"25,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,MANDATORY,VAULT_BUNDLE", -31,Abandoned JojaMart,The Missing Bundle,BUNDLE, -32,Crafts Room,Complete Crafts Room,"COMMUNITY_CENTER_ROOM,MANDATORY", -33,Pantry,Complete Pantry,"COMMUNITY_CENTER_ROOM,MANDATORY", -34,Fish Tank,Complete Fish Tank,"COMMUNITY_CENTER_ROOM,MANDATORY", -35,Boiler Room,Complete Boiler Room,"COMMUNITY_CENTER_ROOM,MANDATORY", -36,Bulletin Board,Complete Bulletin Board,"COMMUNITY_CENTER_ROOM,MANDATORY", -37,Vault,Complete Vault,"COMMUNITY_CENTER_ROOM,MANDATORY", -101,Pierre's General Store,Large Pack,BACKPACK, -102,Pierre's General Store,Deluxe Pack,BACKPACK, -103,Clint's Blacksmith,Copper Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", -104,Clint's Blacksmith,Iron Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", -105,Clint's Blacksmith,Gold Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", -106,Clint's Blacksmith,Iridium Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", -107,Clint's Blacksmith,Copper Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", -108,Clint's Blacksmith,Iron Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", -109,Clint's Blacksmith,Gold Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", -110,Clint's Blacksmith,Iridium Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", -111,Clint's Blacksmith,Copper Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", -112,Clint's Blacksmith,Iron Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", -113,Clint's Blacksmith,Gold Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", -114,Clint's Blacksmith,Iridium Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", -115,Clint's Blacksmith,Copper Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", -116,Clint's Blacksmith,Iron Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", -117,Clint's Blacksmith,Gold Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", -118,Clint's Blacksmith,Iridium Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", -119,Clint's Blacksmith,Copper Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", -120,Clint's Blacksmith,Iron Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", -121,Clint's Blacksmith,Gold Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", -122,Clint's Blacksmith,Iridium Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", -123,Willy's Fish Shop,Purchase Training Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", -124,Beach,Bamboo Pole Cutscene,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", -125,Willy's Fish Shop,Purchase Fiberglass Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", -126,Willy's Fish Shop,Purchase Iridium Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", -201,The Mines - Floor 10,The Mines Floor 10 Treasure,"MANDATORY,THE_MINES_TREASURE", -202,The Mines - Floor 20,The Mines Floor 20 Treasure,"MANDATORY,THE_MINES_TREASURE", -203,The Mines - Floor 40,The Mines Floor 40 Treasure,"MANDATORY,THE_MINES_TREASURE", -204,The Mines - Floor 50,The Mines Floor 50 Treasure,"MANDATORY,THE_MINES_TREASURE", -205,The Mines - Floor 60,The Mines Floor 60 Treasure,"MANDATORY,THE_MINES_TREASURE", -206,The Mines - Floor 70,The Mines Floor 70 Treasure,"MANDATORY,THE_MINES_TREASURE", -207,The Mines - Floor 80,The Mines Floor 80 Treasure,"MANDATORY,THE_MINES_TREASURE", -208,The Mines - Floor 90,The Mines Floor 90 Treasure,"MANDATORY,THE_MINES_TREASURE", -209,The Mines - Floor 100,The Mines Floor 100 Treasure,"MANDATORY,THE_MINES_TREASURE", -210,The Mines - Floor 110,The Mines Floor 110 Treasure,"MANDATORY,THE_MINES_TREASURE", -211,The Mines - Floor 120,The Mines Floor 120 Treasure,"MANDATORY,THE_MINES_TREASURE", -212,Quarry Mine,Grim Reaper statue,MANDATORY, -213,The Mines,The Mines Entrance Cutscene,MANDATORY, -214,The Mines - Floor 5,Floor 5 Elevator,ELEVATOR, -215,The Mines - Floor 10,Floor 10 Elevator,ELEVATOR, -216,The Mines - Floor 15,Floor 15 Elevator,ELEVATOR, -217,The Mines - Floor 20,Floor 20 Elevator,ELEVATOR, -218,The Mines - Floor 25,Floor 25 Elevator,ELEVATOR, -219,The Mines - Floor 30,Floor 30 Elevator,ELEVATOR, -220,The Mines - Floor 35,Floor 35 Elevator,ELEVATOR, -221,The Mines - Floor 40,Floor 40 Elevator,ELEVATOR, -222,The Mines - Floor 45,Floor 45 Elevator,ELEVATOR, -223,The Mines - Floor 50,Floor 50 Elevator,ELEVATOR, -224,The Mines - Floor 55,Floor 55 Elevator,ELEVATOR, -225,The Mines - Floor 60,Floor 60 Elevator,ELEVATOR, -226,The Mines - Floor 65,Floor 65 Elevator,ELEVATOR, -227,The Mines - Floor 70,Floor 70 Elevator,ELEVATOR, -228,The Mines - Floor 75,Floor 75 Elevator,ELEVATOR, -229,The Mines - Floor 80,Floor 80 Elevator,ELEVATOR, -230,The Mines - Floor 85,Floor 85 Elevator,ELEVATOR, -231,The Mines - Floor 90,Floor 90 Elevator,ELEVATOR, -232,The Mines - Floor 95,Floor 95 Elevator,ELEVATOR, -233,The Mines - Floor 100,Floor 100 Elevator,ELEVATOR, -234,The Mines - Floor 105,Floor 105 Elevator,ELEVATOR, -235,The Mines - Floor 110,Floor 110 Elevator,ELEVATOR, -236,The Mines - Floor 115,Floor 115 Elevator,ELEVATOR, -237,The Mines - Floor 120,Floor 120 Elevator,ELEVATOR, -251,Volcano - Floor 10,Volcano Caldera Treasure,"MANDATORY,GINGER_ISLAND", -301,Stardew Valley,Level 1 Farming,"FARMING_LEVEL,SKILL_LEVEL", -302,Stardew Valley,Level 2 Farming,"FARMING_LEVEL,SKILL_LEVEL", -303,Stardew Valley,Level 3 Farming,"FARMING_LEVEL,SKILL_LEVEL", -304,Stardew Valley,Level 4 Farming,"FARMING_LEVEL,SKILL_LEVEL", -305,Stardew Valley,Level 5 Farming,"FARMING_LEVEL,SKILL_LEVEL", -306,Stardew Valley,Level 6 Farming,"FARMING_LEVEL,SKILL_LEVEL", -307,Stardew Valley,Level 7 Farming,"FARMING_LEVEL,SKILL_LEVEL", -308,Stardew Valley,Level 8 Farming,"FARMING_LEVEL,SKILL_LEVEL", -309,Stardew Valley,Level 9 Farming,"FARMING_LEVEL,SKILL_LEVEL", -310,Stardew Valley,Level 10 Farming,"FARMING_LEVEL,SKILL_LEVEL", -311,Stardew Valley,Level 1 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -312,Stardew Valley,Level 2 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -313,Stardew Valley,Level 3 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -314,Stardew Valley,Level 4 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -315,Stardew Valley,Level 5 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -316,Stardew Valley,Level 6 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -317,Stardew Valley,Level 7 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -318,Stardew Valley,Level 8 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -319,Stardew Valley,Level 9 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -320,Stardew Valley,Level 10 Fishing,"FISHING_LEVEL,SKILL_LEVEL", -321,Stardew Valley,Level 1 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -322,Stardew Valley,Level 2 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -323,Stardew Valley,Level 3 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -324,Stardew Valley,Level 4 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -325,Stardew Valley,Level 5 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -326,Stardew Valley,Level 6 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -327,Stardew Valley,Level 7 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -328,Stardew Valley,Level 8 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -329,Stardew Valley,Level 9 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -330,Stardew Valley,Level 10 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", -331,Stardew Valley,Level 1 Mining,"MINING_LEVEL,SKILL_LEVEL", -332,Stardew Valley,Level 2 Mining,"MINING_LEVEL,SKILL_LEVEL", -333,Stardew Valley,Level 3 Mining,"MINING_LEVEL,SKILL_LEVEL", -334,Stardew Valley,Level 4 Mining,"MINING_LEVEL,SKILL_LEVEL", -335,Stardew Valley,Level 5 Mining,"MINING_LEVEL,SKILL_LEVEL", -336,Stardew Valley,Level 6 Mining,"MINING_LEVEL,SKILL_LEVEL", -337,Stardew Valley,Level 7 Mining,"MINING_LEVEL,SKILL_LEVEL", -338,Stardew Valley,Level 8 Mining,"MINING_LEVEL,SKILL_LEVEL", -339,Stardew Valley,Level 9 Mining,"MINING_LEVEL,SKILL_LEVEL", -340,Stardew Valley,Level 10 Mining,"MINING_LEVEL,SKILL_LEVEL", -341,Stardew Valley,Level 1 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -342,Stardew Valley,Level 2 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -343,Stardew Valley,Level 3 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -344,Stardew Valley,Level 4 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -345,Stardew Valley,Level 5 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -346,Stardew Valley,Level 6 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -347,Stardew Valley,Level 7 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -348,Stardew Valley,Level 8 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -349,Stardew Valley,Level 9 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -350,Stardew Valley,Level 10 Combat,"COMBAT_LEVEL,SKILL_LEVEL", -401,Carpenter Shop,Coop Blueprint,BUILDING_BLUEPRINT, -402,Carpenter Shop,Big Coop Blueprint,BUILDING_BLUEPRINT, -403,Carpenter Shop,Deluxe Coop Blueprint,BUILDING_BLUEPRINT, -404,Carpenter Shop,Barn Blueprint,BUILDING_BLUEPRINT, -405,Carpenter Shop,Big Barn Blueprint,BUILDING_BLUEPRINT, -406,Carpenter Shop,Deluxe Barn Blueprint,BUILDING_BLUEPRINT, -407,Carpenter Shop,Well Blueprint,BUILDING_BLUEPRINT, -408,Carpenter Shop,Silo Blueprint,BUILDING_BLUEPRINT, -409,Carpenter Shop,Mill Blueprint,BUILDING_BLUEPRINT, -410,Carpenter Shop,Shed Blueprint,BUILDING_BLUEPRINT, -411,Carpenter Shop,Big Shed Blueprint,BUILDING_BLUEPRINT, -412,Carpenter Shop,Fish Pond Blueprint,BUILDING_BLUEPRINT, -413,Carpenter Shop,Stable Blueprint,BUILDING_BLUEPRINT, -414,Carpenter Shop,Slime Hutch Blueprint,BUILDING_BLUEPRINT, -415,Carpenter Shop,Shipping Bin Blueprint,BUILDING_BLUEPRINT, -416,Carpenter Shop,Kitchen Blueprint,BUILDING_BLUEPRINT, -417,Carpenter Shop,Kids Room Blueprint,BUILDING_BLUEPRINT, -418,Carpenter Shop,Cellar Blueprint,BUILDING_BLUEPRINT, -501,Town,Introductions,"MANDATORY,QUEST", -502,Town,How To Win Friends,"MANDATORY,QUEST", -503,Farm,Getting Started,"MANDATORY,QUEST", -504,Farm,Raising Animals,"MANDATORY,QUEST", -505,Farm,Advancement,"MANDATORY,QUEST", -506,Museum,Archaeology,"MANDATORY,QUEST", -507,Wizard Tower,Meet The Wizard,"MANDATORY,QUEST", -508,Farm,Forging Ahead,"MANDATORY,QUEST", -509,Farm,Smelting,"MANDATORY,QUEST", -510,The Mines - Floor 5,Initiation,"MANDATORY,QUEST", -511,Forest,Robin's Lost Axe,"MANDATORY,QUEST", -512,Sam's House,Jodi's Request,"MANDATORY,QUEST", -513,Marnie's Ranch,"Mayor's ""Shorts""","MANDATORY,QUEST", -514,Tunnel Entrance,Blackberry Basket,"MANDATORY,QUEST", -515,Marnie's Ranch,Marnie's Request,"MANDATORY,QUEST", -516,Town,Pam Is Thirsty,"MANDATORY,QUEST", -517,Wizard Tower,A Dark Reagent,"MANDATORY,QUEST", -518,Marnie's Ranch,Cow's Delight,"MANDATORY,QUEST", -519,Skull Cavern Entrance,The Skull Key,"MANDATORY,QUEST", -520,Town,Crop Research,"MANDATORY,QUEST", -521,Town,Knee Therapy,"MANDATORY,QUEST", -522,Town,Robin's Request,"MANDATORY,QUEST", -523,Skull Cavern,Qi's Challenge,"MANDATORY,QUEST", -524,Desert,The Mysterious Qi,"MANDATORY,QUEST", -525,Town,Carving Pumpkins,"MANDATORY,QUEST", -526,Town,A Winter Mystery,"MANDATORY,QUEST", -527,Secret Woods,Strange Note,"MANDATORY,QUEST", -528,Skull Cavern,Cryptic Note,"MANDATORY,QUEST", -529,Town,Fresh Fruit,"MANDATORY,QUEST", -530,Town,Aquatic Research,"MANDATORY,QUEST", -531,Town,A Soldier's Star,"MANDATORY,QUEST", -532,Town,Mayor's Need,"MANDATORY,QUEST", -533,Saloon,Wanted: Lobster,"MANDATORY,QUEST", -534,Town,Pam Needs Juice,"MANDATORY,QUEST", -535,Sam's House,Fish Casserole,"MANDATORY,QUEST", -536,Beach,Catch A Squid,"MANDATORY,QUEST", -537,Saloon,Fish Stew,"MANDATORY,QUEST", -538,Town,Pierre's Notice,"MANDATORY,QUEST", -539,Town,Clint's Attempt,"MANDATORY,QUEST", -540,Town,A Favor For Clint,"MANDATORY,QUEST", -541,Wizard Tower,Staff Of Power,"MANDATORY,QUEST", -542,Town,Granny's Gift,"MANDATORY,QUEST", -543,Saloon,Exotic Spirits,"MANDATORY,QUEST", -544,Town,Catch a Lingcod,"MANDATORY,QUEST", -545,Island West,The Pirate's Wife,"GINGER_ISLAND,MANDATORY,QUEST", -546,Railroad,Dark Talisman,"MANDATORY,QUEST", -547,Witch's Swamp,Goblin Problem,"MANDATORY,QUEST", -548,Witch's Hut,Magic Ink,"MANDATORY,QUEST", -601,JotPK World 1,JotPK: Boots 1,"ARCADE_MACHINE,JOTPK", -602,JotPK World 1,JotPK: Boots 2,"ARCADE_MACHINE,JOTPK", -603,JotPK World 1,JotPK: Gun 1,"ARCADE_MACHINE,JOTPK", -604,JotPK World 2,JotPK: Gun 2,"ARCADE_MACHINE,JOTPK", -605,JotPK World 2,JotPK: Gun 3,"ARCADE_MACHINE,JOTPK", -606,JotPK World 3,JotPK: Super Gun,"ARCADE_MACHINE,JOTPK", -607,JotPK World 1,JotPK: Ammo 1,"ARCADE_MACHINE,JOTPK", -608,JotPK World 2,JotPK: Ammo 2,"ARCADE_MACHINE,JOTPK", -609,JotPK World 3,JotPK: Ammo 3,"ARCADE_MACHINE,JOTPK", -610,JotPK World 1,JotPK: Cowboy 1,"ARCADE_MACHINE,JOTPK", -611,JotPK World 2,JotPK: Cowboy 2,"ARCADE_MACHINE,JOTPK", -612,Junimo Kart 1,Junimo Kart: Crumble Cavern,"ARCADE_MACHINE,JUNIMO_KART", -613,Junimo Kart 1,Junimo Kart: Slippery Slopes,"ARCADE_MACHINE,JUNIMO_KART", -614,Junimo Kart 2,Junimo Kart: Secret Level,"ARCADE_MACHINE,JUNIMO_KART", -615,Junimo Kart 2,Junimo Kart: The Gem Sea Giant,"ARCADE_MACHINE,JUNIMO_KART", -616,Junimo Kart 2,Junimo Kart: Slomp's Stomp,"ARCADE_MACHINE,JUNIMO_KART", -617,Junimo Kart 2,Junimo Kart: Ghastly Galleon,"ARCADE_MACHINE,JUNIMO_KART", -618,Junimo Kart 3,Junimo Kart: Glowshroom Grotto,"ARCADE_MACHINE,JUNIMO_KART", -619,Junimo Kart 3,Junimo Kart: Red Hot Rollercoaster,"ARCADE_MACHINE,JUNIMO_KART", -620,JotPK World 3,Journey of the Prairie King Victory,"ARCADE_MACHINE_VICTORY,JOTPK", -621,Junimo Kart 3,Junimo Kart: Sunset Speedway (Victory),"ARCADE_MACHINE_VICTORY,JUNIMO_KART", -701,Secret Woods,Old Master Cannoli,MANDATORY, -702,Beach,Beach Bridge Repair,MANDATORY, -703,Desert,Galaxy Sword Shrine,MANDATORY, -704,Farmhouse,Have a Baby,MANDATORY, -705,Farmhouse,Have Another Baby,MANDATORY, -801,Town,Help Wanted: Gathering 1,HELP_WANTED, -802,Town,Help Wanted: Gathering 2,HELP_WANTED, -803,Town,Help Wanted: Gathering 3,HELP_WANTED, -804,Town,Help Wanted: Gathering 4,HELP_WANTED, -805,Town,Help Wanted: Gathering 5,HELP_WANTED, -806,Town,Help Wanted: Gathering 6,HELP_WANTED, -807,Town,Help Wanted: Gathering 7,HELP_WANTED, -808,Town,Help Wanted: Gathering 8,HELP_WANTED, -811,Town,Help Wanted: Slay Monsters 1,HELP_WANTED, -812,Town,Help Wanted: Slay Monsters 2,HELP_WANTED, -813,Town,Help Wanted: Slay Monsters 3,HELP_WANTED, -814,Town,Help Wanted: Slay Monsters 4,HELP_WANTED, -815,Town,Help Wanted: Slay Monsters 5,HELP_WANTED, -816,Town,Help Wanted: Slay Monsters 6,HELP_WANTED, -817,Town,Help Wanted: Slay Monsters 7,HELP_WANTED, -818,Town,Help Wanted: Slay Monsters 8,HELP_WANTED, -821,Town,Help Wanted: Fishing 1,HELP_WANTED, -822,Town,Help Wanted: Fishing 2,HELP_WANTED, -823,Town,Help Wanted: Fishing 3,HELP_WANTED, -824,Town,Help Wanted: Fishing 4,HELP_WANTED, -825,Town,Help Wanted: Fishing 5,HELP_WANTED, -826,Town,Help Wanted: Fishing 6,HELP_WANTED, -827,Town,Help Wanted: Fishing 7,HELP_WANTED, -828,Town,Help Wanted: Fishing 8,HELP_WANTED, -841,Town,Help Wanted: Item Delivery 1,HELP_WANTED, -842,Town,Help Wanted: Item Delivery 2,HELP_WANTED, -843,Town,Help Wanted: Item Delivery 3,HELP_WANTED, -844,Town,Help Wanted: Item Delivery 4,HELP_WANTED, -845,Town,Help Wanted: Item Delivery 5,HELP_WANTED, -846,Town,Help Wanted: Item Delivery 6,HELP_WANTED, -847,Town,Help Wanted: Item Delivery 7,HELP_WANTED, -848,Town,Help Wanted: Item Delivery 8,HELP_WANTED, -849,Town,Help Wanted: Item Delivery 9,HELP_WANTED, -850,Town,Help Wanted: Item Delivery 10,HELP_WANTED, -851,Town,Help Wanted: Item Delivery 11,HELP_WANTED, -852,Town,Help Wanted: Item Delivery 12,HELP_WANTED, -853,Town,Help Wanted: Item Delivery 13,HELP_WANTED, -854,Town,Help Wanted: Item Delivery 14,HELP_WANTED, -855,Town,Help Wanted: Item Delivery 15,HELP_WANTED, -856,Town,Help Wanted: Item Delivery 16,HELP_WANTED, -857,Town,Help Wanted: Item Delivery 17,HELP_WANTED, -858,Town,Help Wanted: Item Delivery 18,HELP_WANTED, -859,Town,Help Wanted: Item Delivery 19,HELP_WANTED, -860,Town,Help Wanted: Item Delivery 20,HELP_WANTED, -861,Town,Help Wanted: Item Delivery 21,HELP_WANTED, -862,Town,Help Wanted: Item Delivery 22,HELP_WANTED, -863,Town,Help Wanted: Item Delivery 23,HELP_WANTED, -864,Town,Help Wanted: Item Delivery 24,HELP_WANTED, -865,Town,Help Wanted: Item Delivery 25,HELP_WANTED, -866,Town,Help Wanted: Item Delivery 26,HELP_WANTED, -867,Town,Help Wanted: Item Delivery 27,HELP_WANTED, -868,Town,Help Wanted: Item Delivery 28,HELP_WANTED, -869,Town,Help Wanted: Item Delivery 29,HELP_WANTED, -870,Town,Help Wanted: Item Delivery 30,HELP_WANTED, -871,Town,Help Wanted: Item Delivery 31,HELP_WANTED, -872,Town,Help Wanted: Item Delivery 32,HELP_WANTED, -901,Forest,Traveling Merchant Sunday Item 1,"MANDATORY,TRAVELING_MERCHANT", -902,Forest,Traveling Merchant Sunday Item 2,"MANDATORY,TRAVELING_MERCHANT", -903,Forest,Traveling Merchant Sunday Item 3,"MANDATORY,TRAVELING_MERCHANT", -911,Forest,Traveling Merchant Monday Item 1,"MANDATORY,TRAVELING_MERCHANT", -912,Forest,Traveling Merchant Monday Item 2,"MANDATORY,TRAVELING_MERCHANT", -913,Forest,Traveling Merchant Monday Item 3,"MANDATORY,TRAVELING_MERCHANT", -921,Forest,Traveling Merchant Tuesday Item 1,"MANDATORY,TRAVELING_MERCHANT", -922,Forest,Traveling Merchant Tuesday Item 2,"MANDATORY,TRAVELING_MERCHANT", -923,Forest,Traveling Merchant Tuesday Item 3,"MANDATORY,TRAVELING_MERCHANT", -931,Forest,Traveling Merchant Wednesday Item 1,"MANDATORY,TRAVELING_MERCHANT", -932,Forest,Traveling Merchant Wednesday Item 2,"MANDATORY,TRAVELING_MERCHANT", -933,Forest,Traveling Merchant Wednesday Item 3,"MANDATORY,TRAVELING_MERCHANT", -941,Forest,Traveling Merchant Thursday Item 1,"MANDATORY,TRAVELING_MERCHANT", -942,Forest,Traveling Merchant Thursday Item 2,"MANDATORY,TRAVELING_MERCHANT", -943,Forest,Traveling Merchant Thursday Item 3,"MANDATORY,TRAVELING_MERCHANT", -951,Forest,Traveling Merchant Friday Item 1,"MANDATORY,TRAVELING_MERCHANT", -952,Forest,Traveling Merchant Friday Item 2,"MANDATORY,TRAVELING_MERCHANT", -953,Forest,Traveling Merchant Friday Item 3,"MANDATORY,TRAVELING_MERCHANT", -961,Forest,Traveling Merchant Saturday Item 1,"MANDATORY,TRAVELING_MERCHANT", -962,Forest,Traveling Merchant Saturday Item 2,"MANDATORY,TRAVELING_MERCHANT", -963,Forest,Traveling Merchant Saturday Item 3,"MANDATORY,TRAVELING_MERCHANT", -1001,Mountain,Fishsanity: Carp,FISHSANITY, -1002,Beach,Fishsanity: Herring,FISHSANITY, -1003,Forest,Fishsanity: Smallmouth Bass,FISHSANITY, -1004,Beach,Fishsanity: Anchovy,FISHSANITY, -1005,Beach,Fishsanity: Sardine,FISHSANITY, -1006,Forest,Fishsanity: Sunfish,FISHSANITY, -1007,Forest,Fishsanity: Perch,FISHSANITY, -1008,Forest,Fishsanity: Chub,FISHSANITY, -1009,Forest,Fishsanity: Bream,FISHSANITY, -1010,Beach,Fishsanity: Red Snapper,FISHSANITY, -1011,Beach,Fishsanity: Sea Cucumber,FISHSANITY, -1012,Forest,Fishsanity: Rainbow Trout,FISHSANITY, -1013,Forest,Fishsanity: Walleye,FISHSANITY, -1014,Forest,Fishsanity: Shad,FISHSANITY, -1015,Mountain,Fishsanity: Bullhead,FISHSANITY, -1016,Mountain,Fishsanity: Largemouth Bass,FISHSANITY, -1017,Forest,Fishsanity: Salmon,FISHSANITY, -1018,The Mines - Floor 20,Fishsanity: Ghostfish,FISHSANITY, -1019,Beach,Fishsanity: Tilapia,FISHSANITY, -1020,Secret Woods,Fishsanity: Woodskip,FISHSANITY, -1021,Beach,Fishsanity: Flounder,FISHSANITY, -1022,Beach,Fishsanity: Halibut,FISHSANITY, -1023,Island West,Fishsanity: Lionfish,"FISHSANITY,GINGER_ISLAND", -1024,Mutant Bug Lair,Fishsanity: Slimejack,FISHSANITY, -1025,Forest,Fishsanity: Midnight Carp,FISHSANITY, -1026,Beach,Fishsanity: Red Mullet,FISHSANITY, -1027,Forest,Fishsanity: Pike,FISHSANITY, -1028,Forest,Fishsanity: Tiger Trout,FISHSANITY, -1029,Island West,Fishsanity: Blue Discus,"FISHSANITY,GINGER_ISLAND", -1030,Beach,Fishsanity: Albacore,FISHSANITY, -1031,Desert,Fishsanity: Sandfish,FISHSANITY, -1032,The Mines - Floor 20,Fishsanity: Stonefish,FISHSANITY, -1033,Beach,Fishsanity: Tuna,FISHSANITY, -1034,Beach,Fishsanity: Eel,FISHSANITY, -1035,Forest,Fishsanity: Catfish,FISHSANITY, -1036,Beach,Fishsanity: Squid,FISHSANITY, -1037,Mountain,Fishsanity: Sturgeon,FISHSANITY, -1038,Forest,Fishsanity: Dorado,FISHSANITY, -1039,Beach,Fishsanity: Pufferfish,FISHSANITY, -1040,Witch's Swamp,Fishsanity: Void Salmon,FISHSANITY, -1041,Beach,Fishsanity: Super Cucumber,FISHSANITY, -1042,Pirate Cove,Fishsanity: Stingray,"FISHSANITY,GINGER_ISLAND", -1043,The Mines - Floor 60,Fishsanity: Ice Pip,FISHSANITY, -1044,Forest,Fishsanity: Lingcod,FISHSANITY, -1045,Desert,Fishsanity: Scorpion Carp,FISHSANITY, -1046,The Mines - Floor 100,Fishsanity: Lava Eel,FISHSANITY, -1047,Beach,Fishsanity: Octopus,FISHSANITY, -1048,Beach,Fishsanity: Midnight Squid,FISHSANITY, -1049,Beach,Fishsanity: Spook Fish,FISHSANITY, -1050,Beach,Fishsanity: Blobfish,FISHSANITY, -1051,Beach,Fishsanity: Crimsonfish,FISHSANITY, -1052,Town,Fishsanity: Angler,FISHSANITY, -1053,Mountain,Fishsanity: Legend,FISHSANITY, -1054,Forest,Fishsanity: Glacierfish,FISHSANITY, -1055,Sewer,Fishsanity: Mutant Carp,FISHSANITY, -1056,Town,Fishsanity: Crayfish,FISHSANITY, -1057,Town,Fishsanity: Snail,FISHSANITY, -1058,Town,Fishsanity: Periwinkle,FISHSANITY, -1059,Beach,Fishsanity: Lobster,FISHSANITY, -1060,Beach,Fishsanity: Clam,FISHSANITY, -1061,Beach,Fishsanity: Crab,FISHSANITY, -1062,Beach,Fishsanity: Cockle,FISHSANITY, -1063,Beach,Fishsanity: Mussel,FISHSANITY, -1064,Beach,Fishsanity: Shrimp,FISHSANITY, -1065,Beach,Fishsanity: Oyster,FISHSANITY, -1100,Stardew Valley,Museumsanity: 5 Donations,MUSEUM_MILESTONES, -1101,Stardew Valley,Museumsanity: 10 Donations,MUSEUM_MILESTONES, -1102,Stardew Valley,Museumsanity: 15 Donations,MUSEUM_MILESTONES, -1103,Stardew Valley,Museumsanity: 20 Donations,MUSEUM_MILESTONES, -1104,Stardew Valley,Museumsanity: 25 Donations,MUSEUM_MILESTONES, -1105,Stardew Valley,Museumsanity: 30 Donations,MUSEUM_MILESTONES, -1106,Stardew Valley,Museumsanity: 35 Donations,MUSEUM_MILESTONES, -1107,Stardew Valley,Museumsanity: 40 Donations,MUSEUM_MILESTONES, -1108,Stardew Valley,Museumsanity: 50 Donations,MUSEUM_MILESTONES, -1109,Stardew Valley,Museumsanity: 60 Donations,MUSEUM_MILESTONES, -1110,Stardew Valley,Museumsanity: 70 Donations,MUSEUM_MILESTONES, -1111,Stardew Valley,Museumsanity: 80 Donations,MUSEUM_MILESTONES, -1112,Stardew Valley,Museumsanity: 90 Donations,MUSEUM_MILESTONES, -1113,Stardew Valley,Museumsanity: 95 Donations,MUSEUM_MILESTONES, -1114,Stardew Valley,Museumsanity: 11 Minerals,MUSEUM_MILESTONES, -1115,Stardew Valley,Museumsanity: 21 Minerals,MUSEUM_MILESTONES, -1116,Stardew Valley,Museumsanity: 31 Minerals,MUSEUM_MILESTONES, -1117,Stardew Valley,Museumsanity: 41 Minerals,MUSEUM_MILESTONES, -1118,Stardew Valley,Museumsanity: 50 Minerals,MUSEUM_MILESTONES, -1119,Stardew Valley,Museumsanity: 3 Artifacts,MUSEUM_MILESTONES, -1120,Stardew Valley,Museumsanity: 6 Artifacts,MUSEUM_MILESTONES, -1121,Stardew Valley,Museumsanity: 9 Artifacts,MUSEUM_MILESTONES, -1122,Stardew Valley,Museumsanity: 11 Artifacts,MUSEUM_MILESTONES, -1123,Stardew Valley,Museumsanity: 15 Artifacts,MUSEUM_MILESTONES, -1124,Stardew Valley,Museumsanity: 20 Artifacts,MUSEUM_MILESTONES, -1125,Stardew Valley,Museumsanity: Dwarf Scrolls,MUSEUM_MILESTONES, -1126,Stardew Valley,Museumsanity: Skeleton Front,MUSEUM_MILESTONES, -1127,Stardew Valley,Museumsanity: Skeleton Middle,MUSEUM_MILESTONES, -1128,Stardew Valley,Museumsanity: Skeleton Back,MUSEUM_MILESTONES, -1201,The Mines - Floor 20,Museumsanity: Dwarf Scroll I,MUSEUM_DONATIONS, -1202,The Mines - Floor 20,Museumsanity: Dwarf Scroll II,MUSEUM_DONATIONS, -1203,The Mines - Floor 60,Museumsanity: Dwarf Scroll III,MUSEUM_DONATIONS, -1204,The Mines - Floor 100,Museumsanity: Dwarf Scroll IV,MUSEUM_DONATIONS, -1205,Town,Museumsanity: Chipped Amphora,MUSEUM_DONATIONS, -1206,Forest,Museumsanity: Arrowhead,MUSEUM_DONATIONS, -1207,Forest,Museumsanity: Ancient Doll,MUSEUM_DONATIONS, -1208,Forest,Museumsanity: Elvish Jewelry,MUSEUM_DONATIONS, -1209,Forest,Museumsanity: Chewing Stick,MUSEUM_DONATIONS, -1210,Forest,Museumsanity: Ornamental Fan,MUSEUM_DONATIONS, -1211,Mountain,Museumsanity: Dinosaur Egg,MUSEUM_DONATIONS, -1212,Stardew Valley,Museumsanity: Rare Disc,MUSEUM_DONATIONS, -1213,Forest,Museumsanity: Ancient Sword,MUSEUM_DONATIONS, -1214,Town,Museumsanity: Rusty Spoon,MUSEUM_DONATIONS, -1215,Farm,Museumsanity: Rusty Spur,MUSEUM_DONATIONS, -1216,Mountain,Museumsanity: Rusty Cog,MUSEUM_DONATIONS, -1217,Farm,Museumsanity: Chicken Statue,MUSEUM_DONATIONS, -1218,Forest,Museumsanity: Ancient Seed,"MUSEUM_DONATIONS,MUSEUM_MILESTONES", -1219,Forest,Museumsanity: Prehistoric Tool,MUSEUM_DONATIONS, -1220,Beach,Museumsanity: Dried Starfish,MUSEUM_DONATIONS, -1221,Beach,Museumsanity: Anchor,MUSEUM_DONATIONS, -1222,Beach,Museumsanity: Glass Shards,MUSEUM_DONATIONS, -1223,Forest,Museumsanity: Bone Flute,MUSEUM_DONATIONS, -1224,Forest,Museumsanity: Prehistoric Handaxe,MUSEUM_DONATIONS, -1225,The Mines - Floor 20,Museumsanity: Dwarvish Helm,MUSEUM_DONATIONS, -1226,The Mines - Floor 60,Museumsanity: Dwarf Gadget,MUSEUM_DONATIONS, -1227,Forest,Museumsanity: Ancient Drum,MUSEUM_DONATIONS, -1228,Desert,Museumsanity: Golden Mask,MUSEUM_DONATIONS, -1229,Desert,Museumsanity: Golden Relic,MUSEUM_DONATIONS, -1230,Town,Museumsanity: Strange Doll (Green),MUSEUM_DONATIONS, -1231,Desert,Museumsanity: Strange Doll,MUSEUM_DONATIONS, -1232,Forest,Museumsanity: Prehistoric Scapula,MUSEUM_DONATIONS, -1233,Forest,Museumsanity: Prehistoric Tibia,MUSEUM_DONATIONS, -1234,Dig Site,Museumsanity: Prehistoric Skull,MUSEUM_DONATIONS, -1235,Dig Site,Museumsanity: Skeletal Hand,MUSEUM_DONATIONS, -1236,Dig Site,Museumsanity: Prehistoric Rib,MUSEUM_DONATIONS, -1237,Dig Site,Museumsanity: Prehistoric Vertebra,MUSEUM_DONATIONS, -1238,Dig Site,Museumsanity: Skeletal Tail,MUSEUM_DONATIONS, -1239,Dig Site,Museumsanity: Nautilus Fossil,MUSEUM_DONATIONS, -1240,Forest,Museumsanity: Amphibian Fossil,MUSEUM_DONATIONS, -1241,Forest,Museumsanity: Palm Fossil,MUSEUM_DONATIONS, -1242,Forest,Museumsanity: Trilobite,MUSEUM_DONATIONS, -1243,The Mines - Floor 20,Museumsanity: Quartz,MUSEUM_DONATIONS, -1244,The Mines - Floor 100,Museumsanity: Fire Quartz,MUSEUM_DONATIONS, -1245,The Mines - Floor 60,Museumsanity: Frozen Tear,MUSEUM_DONATIONS, -1246,The Mines - Floor 20,Museumsanity: Earth Crystal,MUSEUM_DONATIONS, -1247,The Mines - Floor 100,Museumsanity: Emerald,MUSEUM_DONATIONS, -1248,The Mines - Floor 60,Museumsanity: Aquamarine,MUSEUM_DONATIONS, -1249,The Mines - Floor 100,Museumsanity: Ruby,MUSEUM_DONATIONS, -1250,The Mines - Floor 20,Museumsanity: Amethyst,MUSEUM_DONATIONS, -1251,The Mines - Floor 20,Museumsanity: Topaz,MUSEUM_DONATIONS, -1252,The Mines - Floor 60,Museumsanity: Jade,MUSEUM_DONATIONS, -1253,The Mines - Floor 60,Museumsanity: Diamond,MUSEUM_DONATIONS, -1254,Skull Cavern Floor 100,Museumsanity: Prismatic Shard,MUSEUM_DONATIONS, -1255,Town,Museumsanity: Alamite,MUSEUM_DONATIONS, -1256,Town,Museumsanity: Bixite,MUSEUM_DONATIONS, -1257,Town,Museumsanity: Baryte,MUSEUM_DONATIONS, -1258,Town,Museumsanity: Aerinite,MUSEUM_DONATIONS, -1259,Town,Museumsanity: Calcite,MUSEUM_DONATIONS, -1260,Town,Museumsanity: Dolomite,MUSEUM_DONATIONS, -1261,Town,Museumsanity: Esperite,MUSEUM_DONATIONS, -1262,Town,Museumsanity: Fluorapatite,MUSEUM_DONATIONS, -1263,Town,Museumsanity: Geminite,MUSEUM_DONATIONS, -1264,Town,Museumsanity: Helvite,MUSEUM_DONATIONS, -1265,Town,Museumsanity: Jamborite,MUSEUM_DONATIONS, -1266,Town,Museumsanity: Jagoite,MUSEUM_DONATIONS, -1267,Town,Museumsanity: Kyanite,MUSEUM_DONATIONS, -1268,Town,Museumsanity: Lunarite,MUSEUM_DONATIONS, -1269,Town,Museumsanity: Malachite,MUSEUM_DONATIONS, -1270,Town,Museumsanity: Neptunite,MUSEUM_DONATIONS, -1271,Town,Museumsanity: Lemon Stone,MUSEUM_DONATIONS, -1272,Town,Museumsanity: Nekoite,MUSEUM_DONATIONS, -1273,Town,Museumsanity: Orpiment,MUSEUM_DONATIONS, -1274,Town,Museumsanity: Petrified Slime,MUSEUM_DONATIONS, -1275,Town,Museumsanity: Thunder Egg,MUSEUM_DONATIONS, -1276,Town,Museumsanity: Pyrite,MUSEUM_DONATIONS, -1277,Town,Museumsanity: Ocean Stone,MUSEUM_DONATIONS, -1278,Town,Museumsanity: Ghost Crystal,MUSEUM_DONATIONS, -1279,Town,Museumsanity: Tigerseye,MUSEUM_DONATIONS, -1280,Town,Museumsanity: Jasper,MUSEUM_DONATIONS, -1281,Town,Museumsanity: Opal,MUSEUM_DONATIONS, -1282,Town,Museumsanity: Fire Opal,MUSEUM_DONATIONS, -1283,Town,Museumsanity: Celestine,MUSEUM_DONATIONS, -1284,Town,Museumsanity: Marble,MUSEUM_DONATIONS, -1285,Town,Museumsanity: Sandstone,MUSEUM_DONATIONS, -1286,Town,Museumsanity: Granite,MUSEUM_DONATIONS, -1287,Town,Museumsanity: Basalt,MUSEUM_DONATIONS, -1288,Town,Museumsanity: Limestone,MUSEUM_DONATIONS, -1289,Town,Museumsanity: Soapstone,MUSEUM_DONATIONS, -1290,Town,Museumsanity: Hematite,MUSEUM_DONATIONS, -1291,Town,Museumsanity: Mudstone,MUSEUM_DONATIONS, -1292,Town,Museumsanity: Obsidian,MUSEUM_DONATIONS, -1293,Town,Museumsanity: Slate,MUSEUM_DONATIONS, -1294,Town,Museumsanity: Fairy Stone,MUSEUM_DONATIONS, -1295,Town,Museumsanity: Star Shards,MUSEUM_DONATIONS, -1301,Town,Friendsanity: Alex 1 <3,FRIENDSANITY, -1302,Town,Friendsanity: Alex 2 <3,FRIENDSANITY, -1303,Town,Friendsanity: Alex 3 <3,FRIENDSANITY, -1304,Town,Friendsanity: Alex 4 <3,FRIENDSANITY, -1305,Town,Friendsanity: Alex 5 <3,FRIENDSANITY, -1306,Town,Friendsanity: Alex 6 <3,FRIENDSANITY, -1307,Town,Friendsanity: Alex 7 <3,FRIENDSANITY, -1308,Town,Friendsanity: Alex 8 <3,FRIENDSANITY, -1309,Town,Friendsanity: Alex 9 <3,FRIENDSANITY, -1310,Town,Friendsanity: Alex 10 <3,FRIENDSANITY, -1311,Town,Friendsanity: Alex 11 <3,FRIENDSANITY, -1312,Town,Friendsanity: Alex 12 <3,FRIENDSANITY, -1313,Town,Friendsanity: Alex 13 <3,FRIENDSANITY, -1314,Town,Friendsanity: Alex 14 <3,FRIENDSANITY, -1315,Beach,Friendsanity: Elliott 1 <3,FRIENDSANITY, -1316,Beach,Friendsanity: Elliott 2 <3,FRIENDSANITY, -1317,Beach,Friendsanity: Elliott 3 <3,FRIENDSANITY, -1318,Beach,Friendsanity: Elliott 4 <3,FRIENDSANITY, -1319,Beach,Friendsanity: Elliott 5 <3,FRIENDSANITY, -1320,Beach,Friendsanity: Elliott 6 <3,FRIENDSANITY, -1321,Beach,Friendsanity: Elliott 7 <3,FRIENDSANITY, -1322,Beach,Friendsanity: Elliott 8 <3,FRIENDSANITY, -1323,Beach,Friendsanity: Elliott 9 <3,FRIENDSANITY, -1324,Beach,Friendsanity: Elliott 10 <3,FRIENDSANITY, -1325,Beach,Friendsanity: Elliott 11 <3,FRIENDSANITY, -1326,Beach,Friendsanity: Elliott 12 <3,FRIENDSANITY, -1327,Beach,Friendsanity: Elliott 13 <3,FRIENDSANITY, -1328,Beach,Friendsanity: Elliott 14 <3,FRIENDSANITY, -1329,Town,Friendsanity: Harvey 1 <3,FRIENDSANITY, -1330,Town,Friendsanity: Harvey 2 <3,FRIENDSANITY, -1331,Town,Friendsanity: Harvey 3 <3,FRIENDSANITY, -1332,Town,Friendsanity: Harvey 4 <3,FRIENDSANITY, -1333,Town,Friendsanity: Harvey 5 <3,FRIENDSANITY, -1334,Town,Friendsanity: Harvey 6 <3,FRIENDSANITY, -1335,Town,Friendsanity: Harvey 7 <3,FRIENDSANITY, -1336,Town,Friendsanity: Harvey 8 <3,FRIENDSANITY, -1337,Town,Friendsanity: Harvey 9 <3,FRIENDSANITY, -1338,Town,Friendsanity: Harvey 10 <3,FRIENDSANITY, -1339,Town,Friendsanity: Harvey 11 <3,FRIENDSANITY, -1340,Town,Friendsanity: Harvey 12 <3,FRIENDSANITY, -1341,Town,Friendsanity: Harvey 13 <3,FRIENDSANITY, -1342,Town,Friendsanity: Harvey 14 <3,FRIENDSANITY, -1343,Town,Friendsanity: Sam 1 <3,FRIENDSANITY, -1344,Town,Friendsanity: Sam 2 <3,FRIENDSANITY, -1345,Town,Friendsanity: Sam 3 <3,FRIENDSANITY, -1346,Town,Friendsanity: Sam 4 <3,FRIENDSANITY, -1347,Town,Friendsanity: Sam 5 <3,FRIENDSANITY, -1348,Town,Friendsanity: Sam 6 <3,FRIENDSANITY, -1349,Town,Friendsanity: Sam 7 <3,FRIENDSANITY, -1350,Town,Friendsanity: Sam 8 <3,FRIENDSANITY, -1351,Town,Friendsanity: Sam 9 <3,FRIENDSANITY, -1352,Town,Friendsanity: Sam 10 <3,FRIENDSANITY, -1353,Town,Friendsanity: Sam 11 <3,FRIENDSANITY, -1354,Town,Friendsanity: Sam 12 <3,FRIENDSANITY, -1355,Town,Friendsanity: Sam 13 <3,FRIENDSANITY, -1356,Town,Friendsanity: Sam 14 <3,FRIENDSANITY, -1357,Carpenter Shop,Friendsanity: Sebastian 1 <3,FRIENDSANITY, -1358,Carpenter Shop,Friendsanity: Sebastian 2 <3,FRIENDSANITY, -1359,Carpenter Shop,Friendsanity: Sebastian 3 <3,FRIENDSANITY, -1360,Carpenter Shop,Friendsanity: Sebastian 4 <3,FRIENDSANITY, -1361,Carpenter Shop,Friendsanity: Sebastian 5 <3,FRIENDSANITY, -1362,Carpenter Shop,Friendsanity: Sebastian 6 <3,FRIENDSANITY, -1363,Carpenter Shop,Friendsanity: Sebastian 7 <3,FRIENDSANITY, -1364,Carpenter Shop,Friendsanity: Sebastian 8 <3,FRIENDSANITY, -1365,Carpenter Shop,Friendsanity: Sebastian 9 <3,FRIENDSANITY, -1366,Carpenter Shop,Friendsanity: Sebastian 10 <3,FRIENDSANITY, -1367,Carpenter Shop,Friendsanity: Sebastian 11 <3,FRIENDSANITY, -1368,Carpenter Shop,Friendsanity: Sebastian 12 <3,FRIENDSANITY, -1369,Carpenter Shop,Friendsanity: Sebastian 13 <3,FRIENDSANITY, -1370,Carpenter Shop,Friendsanity: Sebastian 14 <3,FRIENDSANITY, -1371,Marnie's Ranch,Friendsanity: Shane 1 <3,FRIENDSANITY, -1372,Marnie's Ranch,Friendsanity: Shane 2 <3,FRIENDSANITY, -1373,Marnie's Ranch,Friendsanity: Shane 3 <3,FRIENDSANITY, -1374,Marnie's Ranch,Friendsanity: Shane 4 <3,FRIENDSANITY, -1375,Marnie's Ranch,Friendsanity: Shane 5 <3,FRIENDSANITY, -1376,Marnie's Ranch,Friendsanity: Shane 6 <3,FRIENDSANITY, -1377,Marnie's Ranch,Friendsanity: Shane 7 <3,FRIENDSANITY, -1378,Marnie's Ranch,Friendsanity: Shane 8 <3,FRIENDSANITY, -1379,Marnie's Ranch,Friendsanity: Shane 9 <3,FRIENDSANITY, -1380,Marnie's Ranch,Friendsanity: Shane 10 <3,FRIENDSANITY, -1381,Marnie's Ranch,Friendsanity: Shane 11 <3,FRIENDSANITY, -1382,Marnie's Ranch,Friendsanity: Shane 12 <3,FRIENDSANITY, -1383,Marnie's Ranch,Friendsanity: Shane 13 <3,FRIENDSANITY, -1384,Marnie's Ranch,Friendsanity: Shane 14 <3,FRIENDSANITY, -1385,Town,Friendsanity: Abigail 1 <3,FRIENDSANITY, -1386,Town,Friendsanity: Abigail 2 <3,FRIENDSANITY, -1387,Town,Friendsanity: Abigail 3 <3,FRIENDSANITY, -1388,Town,Friendsanity: Abigail 4 <3,FRIENDSANITY, -1389,Town,Friendsanity: Abigail 5 <3,FRIENDSANITY, -1390,Town,Friendsanity: Abigail 6 <3,FRIENDSANITY, -1391,Town,Friendsanity: Abigail 7 <3,FRIENDSANITY, -1392,Town,Friendsanity: Abigail 8 <3,FRIENDSANITY, -1393,Town,Friendsanity: Abigail 9 <3,FRIENDSANITY, -1394,Town,Friendsanity: Abigail 10 <3,FRIENDSANITY, -1395,Town,Friendsanity: Abigail 11 <3,FRIENDSANITY, -1396,Town,Friendsanity: Abigail 12 <3,FRIENDSANITY, -1397,Town,Friendsanity: Abigail 13 <3,FRIENDSANITY, -1398,Town,Friendsanity: Abigail 14 <3,FRIENDSANITY, -1399,Town,Friendsanity: Emily 1 <3,FRIENDSANITY, -1400,Town,Friendsanity: Emily 2 <3,FRIENDSANITY, -1401,Town,Friendsanity: Emily 3 <3,FRIENDSANITY, -1402,Town,Friendsanity: Emily 4 <3,FRIENDSANITY, -1403,Town,Friendsanity: Emily 5 <3,FRIENDSANITY, -1404,Town,Friendsanity: Emily 6 <3,FRIENDSANITY, -1405,Town,Friendsanity: Emily 7 <3,FRIENDSANITY, -1406,Town,Friendsanity: Emily 8 <3,FRIENDSANITY, -1407,Town,Friendsanity: Emily 9 <3,FRIENDSANITY, -1408,Town,Friendsanity: Emily 10 <3,FRIENDSANITY, -1409,Town,Friendsanity: Emily 11 <3,FRIENDSANITY, -1410,Town,Friendsanity: Emily 12 <3,FRIENDSANITY, -1411,Town,Friendsanity: Emily 13 <3,FRIENDSANITY, -1412,Town,Friendsanity: Emily 14 <3,FRIENDSANITY, -1413,Town,Friendsanity: Haley 1 <3,FRIENDSANITY, -1414,Town,Friendsanity: Haley 2 <3,FRIENDSANITY, -1415,Town,Friendsanity: Haley 3 <3,FRIENDSANITY, -1416,Town,Friendsanity: Haley 4 <3,FRIENDSANITY, -1417,Town,Friendsanity: Haley 5 <3,FRIENDSANITY, -1418,Town,Friendsanity: Haley 6 <3,FRIENDSANITY, -1419,Town,Friendsanity: Haley 7 <3,FRIENDSANITY, -1420,Town,Friendsanity: Haley 8 <3,FRIENDSANITY, -1421,Town,Friendsanity: Haley 9 <3,FRIENDSANITY, -1422,Town,Friendsanity: Haley 10 <3,FRIENDSANITY, -1423,Town,Friendsanity: Haley 11 <3,FRIENDSANITY, -1424,Town,Friendsanity: Haley 12 <3,FRIENDSANITY, -1425,Town,Friendsanity: Haley 13 <3,FRIENDSANITY, -1426,Town,Friendsanity: Haley 14 <3,FRIENDSANITY, -1427,Forest,Friendsanity: Leah 1 <3,FRIENDSANITY, -1428,Forest,Friendsanity: Leah 2 <3,FRIENDSANITY, -1429,Forest,Friendsanity: Leah 3 <3,FRIENDSANITY, -1430,Forest,Friendsanity: Leah 4 <3,FRIENDSANITY, -1431,Forest,Friendsanity: Leah 5 <3,FRIENDSANITY, -1432,Forest,Friendsanity: Leah 6 <3,FRIENDSANITY, -1433,Forest,Friendsanity: Leah 7 <3,FRIENDSANITY, -1434,Forest,Friendsanity: Leah 8 <3,FRIENDSANITY, -1435,Forest,Friendsanity: Leah 9 <3,FRIENDSANITY, -1436,Forest,Friendsanity: Leah 10 <3,FRIENDSANITY, -1437,Forest,Friendsanity: Leah 11 <3,FRIENDSANITY, -1438,Forest,Friendsanity: Leah 12 <3,FRIENDSANITY, -1439,Forest,Friendsanity: Leah 13 <3,FRIENDSANITY, -1440,Forest,Friendsanity: Leah 14 <3,FRIENDSANITY, -1441,Carpenter Shop,Friendsanity: Maru 1 <3,FRIENDSANITY, -1442,Carpenter Shop,Friendsanity: Maru 2 <3,FRIENDSANITY, -1443,Carpenter Shop,Friendsanity: Maru 3 <3,FRIENDSANITY, -1444,Carpenter Shop,Friendsanity: Maru 4 <3,FRIENDSANITY, -1445,Carpenter Shop,Friendsanity: Maru 5 <3,FRIENDSANITY, -1446,Carpenter Shop,Friendsanity: Maru 6 <3,FRIENDSANITY, -1447,Carpenter Shop,Friendsanity: Maru 7 <3,FRIENDSANITY, -1448,Carpenter Shop,Friendsanity: Maru 8 <3,FRIENDSANITY, -1449,Carpenter Shop,Friendsanity: Maru 9 <3,FRIENDSANITY, -1450,Carpenter Shop,Friendsanity: Maru 10 <3,FRIENDSANITY, -1451,Carpenter Shop,Friendsanity: Maru 11 <3,FRIENDSANITY, -1452,Carpenter Shop,Friendsanity: Maru 12 <3,FRIENDSANITY, -1453,Carpenter Shop,Friendsanity: Maru 13 <3,FRIENDSANITY, -1454,Carpenter Shop,Friendsanity: Maru 14 <3,FRIENDSANITY, -1455,Town,Friendsanity: Penny 1 <3,FRIENDSANITY, -1456,Town,Friendsanity: Penny 2 <3,FRIENDSANITY, -1457,Town,Friendsanity: Penny 3 <3,FRIENDSANITY, -1458,Town,Friendsanity: Penny 4 <3,FRIENDSANITY, -1459,Town,Friendsanity: Penny 5 <3,FRIENDSANITY, -1460,Town,Friendsanity: Penny 6 <3,FRIENDSANITY, -1461,Town,Friendsanity: Penny 7 <3,FRIENDSANITY, -1462,Town,Friendsanity: Penny 8 <3,FRIENDSANITY, -1463,Town,Friendsanity: Penny 9 <3,FRIENDSANITY, -1464,Town,Friendsanity: Penny 10 <3,FRIENDSANITY, -1465,Town,Friendsanity: Penny 11 <3,FRIENDSANITY, -1466,Town,Friendsanity: Penny 12 <3,FRIENDSANITY, -1467,Town,Friendsanity: Penny 13 <3,FRIENDSANITY, -1468,Town,Friendsanity: Penny 14 <3,FRIENDSANITY, -1469,Town,Friendsanity: Caroline 1 <3,FRIENDSANITY, -1470,Town,Friendsanity: Caroline 2 <3,FRIENDSANITY, -1471,Town,Friendsanity: Caroline 3 <3,FRIENDSANITY, -1472,Town,Friendsanity: Caroline 4 <3,FRIENDSANITY, -1473,Town,Friendsanity: Caroline 5 <3,FRIENDSANITY, -1474,Town,Friendsanity: Caroline 6 <3,FRIENDSANITY, -1475,Town,Friendsanity: Caroline 7 <3,FRIENDSANITY, -1476,Town,Friendsanity: Caroline 8 <3,FRIENDSANITY, -1477,Town,Friendsanity: Caroline 9 <3,FRIENDSANITY, -1478,Town,Friendsanity: Caroline 10 <3,FRIENDSANITY, -1480,Town,Friendsanity: Clint 1 <3,FRIENDSANITY, -1481,Town,Friendsanity: Clint 2 <3,FRIENDSANITY, -1482,Town,Friendsanity: Clint 3 <3,FRIENDSANITY, -1483,Town,Friendsanity: Clint 4 <3,FRIENDSANITY, -1484,Town,Friendsanity: Clint 5 <3,FRIENDSANITY, -1485,Town,Friendsanity: Clint 6 <3,FRIENDSANITY, -1486,Town,Friendsanity: Clint 7 <3,FRIENDSANITY, -1487,Town,Friendsanity: Clint 8 <3,FRIENDSANITY, -1488,Town,Friendsanity: Clint 9 <3,FRIENDSANITY, -1489,Town,Friendsanity: Clint 10 <3,FRIENDSANITY, -1491,Carpenter Shop,Friendsanity: Demetrius 1 <3,FRIENDSANITY, -1492,Carpenter Shop,Friendsanity: Demetrius 2 <3,FRIENDSANITY, -1493,Carpenter Shop,Friendsanity: Demetrius 3 <3,FRIENDSANITY, -1494,Carpenter Shop,Friendsanity: Demetrius 4 <3,FRIENDSANITY, -1495,Carpenter Shop,Friendsanity: Demetrius 5 <3,FRIENDSANITY, -1496,Carpenter Shop,Friendsanity: Demetrius 6 <3,FRIENDSANITY, -1497,Carpenter Shop,Friendsanity: Demetrius 7 <3,FRIENDSANITY, -1498,Carpenter Shop,Friendsanity: Demetrius 8 <3,FRIENDSANITY, -1499,Carpenter Shop,Friendsanity: Demetrius 9 <3,FRIENDSANITY, -1500,Carpenter Shop,Friendsanity: Demetrius 10 <3,FRIENDSANITY, -1502,The Mines,Friendsanity: Dwarf 1 <3,FRIENDSANITY, -1503,The Mines,Friendsanity: Dwarf 2 <3,FRIENDSANITY, -1504,The Mines,Friendsanity: Dwarf 3 <3,FRIENDSANITY, -1505,The Mines,Friendsanity: Dwarf 4 <3,FRIENDSANITY, -1506,The Mines,Friendsanity: Dwarf 5 <3,FRIENDSANITY, -1507,The Mines,Friendsanity: Dwarf 6 <3,FRIENDSANITY, -1508,The Mines,Friendsanity: Dwarf 7 <3,FRIENDSANITY, -1509,The Mines,Friendsanity: Dwarf 8 <3,FRIENDSANITY, -1510,The Mines,Friendsanity: Dwarf 9 <3,FRIENDSANITY, -1511,The Mines,Friendsanity: Dwarf 10 <3,FRIENDSANITY, -1513,Town,Friendsanity: Evelyn 1 <3,FRIENDSANITY, -1514,Town,Friendsanity: Evelyn 2 <3,FRIENDSANITY, -1515,Town,Friendsanity: Evelyn 3 <3,FRIENDSANITY, -1516,Town,Friendsanity: Evelyn 4 <3,FRIENDSANITY, -1517,Town,Friendsanity: Evelyn 5 <3,FRIENDSANITY, -1518,Town,Friendsanity: Evelyn 6 <3,FRIENDSANITY, -1519,Town,Friendsanity: Evelyn 7 <3,FRIENDSANITY, -1520,Town,Friendsanity: Evelyn 8 <3,FRIENDSANITY, -1521,Town,Friendsanity: Evelyn 9 <3,FRIENDSANITY, -1522,Town,Friendsanity: Evelyn 10 <3,FRIENDSANITY, -1524,Town,Friendsanity: George 1 <3,FRIENDSANITY, -1525,Town,Friendsanity: George 2 <3,FRIENDSANITY, -1526,Town,Friendsanity: George 3 <3,FRIENDSANITY, -1527,Town,Friendsanity: George 4 <3,FRIENDSANITY, -1528,Town,Friendsanity: George 5 <3,FRIENDSANITY, -1529,Town,Friendsanity: George 6 <3,FRIENDSANITY, -1530,Town,Friendsanity: George 7 <3,FRIENDSANITY, -1531,Town,Friendsanity: George 8 <3,FRIENDSANITY, -1532,Town,Friendsanity: George 9 <3,FRIENDSANITY, -1533,Town,Friendsanity: George 10 <3,FRIENDSANITY, -1535,Town,Friendsanity: Gus 1 <3,FRIENDSANITY, -1536,Town,Friendsanity: Gus 2 <3,FRIENDSANITY, -1537,Town,Friendsanity: Gus 3 <3,FRIENDSANITY, -1538,Town,Friendsanity: Gus 4 <3,FRIENDSANITY, -1539,Town,Friendsanity: Gus 5 <3,FRIENDSANITY, -1540,Town,Friendsanity: Gus 6 <3,FRIENDSANITY, -1541,Town,Friendsanity: Gus 7 <3,FRIENDSANITY, -1542,Town,Friendsanity: Gus 8 <3,FRIENDSANITY, -1543,Town,Friendsanity: Gus 9 <3,FRIENDSANITY, -1544,Town,Friendsanity: Gus 10 <3,FRIENDSANITY, -1546,Marnie's Ranch,Friendsanity: Jas 1 <3,FRIENDSANITY, -1547,Marnie's Ranch,Friendsanity: Jas 2 <3,FRIENDSANITY, -1548,Marnie's Ranch,Friendsanity: Jas 3 <3,FRIENDSANITY, -1549,Marnie's Ranch,Friendsanity: Jas 4 <3,FRIENDSANITY, -1550,Marnie's Ranch,Friendsanity: Jas 5 <3,FRIENDSANITY, -1551,Marnie's Ranch,Friendsanity: Jas 6 <3,FRIENDSANITY, -1552,Marnie's Ranch,Friendsanity: Jas 7 <3,FRIENDSANITY, -1553,Marnie's Ranch,Friendsanity: Jas 8 <3,FRIENDSANITY, -1554,Marnie's Ranch,Friendsanity: Jas 9 <3,FRIENDSANITY, -1555,Marnie's Ranch,Friendsanity: Jas 10 <3,FRIENDSANITY, -1557,Town,Friendsanity: Jodi 1 <3,FRIENDSANITY, -1558,Town,Friendsanity: Jodi 2 <3,FRIENDSANITY, -1559,Town,Friendsanity: Jodi 3 <3,FRIENDSANITY, -1560,Town,Friendsanity: Jodi 4 <3,FRIENDSANITY, -1561,Town,Friendsanity: Jodi 5 <3,FRIENDSANITY, -1562,Town,Friendsanity: Jodi 6 <3,FRIENDSANITY, -1563,Town,Friendsanity: Jodi 7 <3,FRIENDSANITY, -1564,Town,Friendsanity: Jodi 8 <3,FRIENDSANITY, -1565,Town,Friendsanity: Jodi 9 <3,FRIENDSANITY, -1566,Town,Friendsanity: Jodi 10 <3,FRIENDSANITY, -1568,Town,Friendsanity: Kent 1 <3,FRIENDSANITY, -1569,Town,Friendsanity: Kent 2 <3,FRIENDSANITY, -1570,Town,Friendsanity: Kent 3 <3,FRIENDSANITY, -1571,Town,Friendsanity: Kent 4 <3,FRIENDSANITY, -1572,Town,Friendsanity: Kent 5 <3,FRIENDSANITY, -1573,Town,Friendsanity: Kent 6 <3,FRIENDSANITY, -1574,Town,Friendsanity: Kent 7 <3,FRIENDSANITY, -1575,Town,Friendsanity: Kent 8 <3,FRIENDSANITY, -1576,Town,Friendsanity: Kent 9 <3,FRIENDSANITY, -1577,Town,Friendsanity: Kent 10 <3,FRIENDSANITY, -1579,Sewer,Friendsanity: Krobus 1 <3,FRIENDSANITY, -1580,Sewer,Friendsanity: Krobus 2 <3,FRIENDSANITY, -1581,Sewer,Friendsanity: Krobus 3 <3,FRIENDSANITY, -1582,Sewer,Friendsanity: Krobus 4 <3,FRIENDSANITY, -1583,Sewer,Friendsanity: Krobus 5 <3,FRIENDSANITY, -1584,Sewer,Friendsanity: Krobus 6 <3,FRIENDSANITY, -1585,Sewer,Friendsanity: Krobus 7 <3,FRIENDSANITY, -1586,Sewer,Friendsanity: Krobus 8 <3,FRIENDSANITY, -1587,Sewer,Friendsanity: Krobus 9 <3,FRIENDSANITY, -1588,Sewer,Friendsanity: Krobus 10 <3,FRIENDSANITY, -1590,Leo's Hut,Friendsanity: Leo 1 <3,"FRIENDSANITY,GINGER_ISLAND", -1591,Leo's Hut,Friendsanity: Leo 2 <3,"FRIENDSANITY,GINGER_ISLAND", -1592,Leo's Hut,Friendsanity: Leo 3 <3,"FRIENDSANITY,GINGER_ISLAND", -1593,Leo's Hut,Friendsanity: Leo 4 <3,"FRIENDSANITY,GINGER_ISLAND", -1594,Leo's Hut,Friendsanity: Leo 5 <3,"FRIENDSANITY,GINGER_ISLAND", -1595,Leo's Hut,Friendsanity: Leo 6 <3,"FRIENDSANITY,GINGER_ISLAND", -1596,Leo's Hut,Friendsanity: Leo 7 <3,"FRIENDSANITY,GINGER_ISLAND", -1597,Leo's Hut,Friendsanity: Leo 8 <3,"FRIENDSANITY,GINGER_ISLAND", -1598,Leo's Hut,Friendsanity: Leo 9 <3,"FRIENDSANITY,GINGER_ISLAND", -1599,Leo's Hut,Friendsanity: Leo 10 <3,"FRIENDSANITY,GINGER_ISLAND", -1601,Town,Friendsanity: Lewis 1 <3,FRIENDSANITY, -1602,Town,Friendsanity: Lewis 2 <3,FRIENDSANITY, -1603,Town,Friendsanity: Lewis 3 <3,FRIENDSANITY, -1604,Town,Friendsanity: Lewis 4 <3,FRIENDSANITY, -1605,Town,Friendsanity: Lewis 5 <3,FRIENDSANITY, -1606,Town,Friendsanity: Lewis 6 <3,FRIENDSANITY, -1607,Town,Friendsanity: Lewis 7 <3,FRIENDSANITY, -1608,Town,Friendsanity: Lewis 8 <3,FRIENDSANITY, -1609,Town,Friendsanity: Lewis 9 <3,FRIENDSANITY, -1610,Town,Friendsanity: Lewis 10 <3,FRIENDSANITY, -1612,Mountain,Friendsanity: Linus 1 <3,FRIENDSANITY, -1613,Mountain,Friendsanity: Linus 2 <3,FRIENDSANITY, -1614,Mountain,Friendsanity: Linus 3 <3,FRIENDSANITY, -1615,Mountain,Friendsanity: Linus 4 <3,FRIENDSANITY, -1616,Mountain,Friendsanity: Linus 5 <3,FRIENDSANITY, -1617,Mountain,Friendsanity: Linus 6 <3,FRIENDSANITY, -1618,Mountain,Friendsanity: Linus 7 <3,FRIENDSANITY, -1619,Mountain,Friendsanity: Linus 8 <3,FRIENDSANITY, -1620,Mountain,Friendsanity: Linus 9 <3,FRIENDSANITY, -1621,Mountain,Friendsanity: Linus 10 <3,FRIENDSANITY, -1623,Marnie's Ranch,Friendsanity: Marnie 1 <3,FRIENDSANITY, -1624,Marnie's Ranch,Friendsanity: Marnie 2 <3,FRIENDSANITY, -1625,Marnie's Ranch,Friendsanity: Marnie 3 <3,FRIENDSANITY, -1626,Marnie's Ranch,Friendsanity: Marnie 4 <3,FRIENDSANITY, -1627,Marnie's Ranch,Friendsanity: Marnie 5 <3,FRIENDSANITY, -1628,Marnie's Ranch,Friendsanity: Marnie 6 <3,FRIENDSANITY, -1629,Marnie's Ranch,Friendsanity: Marnie 7 <3,FRIENDSANITY, -1630,Marnie's Ranch,Friendsanity: Marnie 8 <3,FRIENDSANITY, -1631,Marnie's Ranch,Friendsanity: Marnie 9 <3,FRIENDSANITY, -1632,Marnie's Ranch,Friendsanity: Marnie 10 <3,FRIENDSANITY, -1634,Town,Friendsanity: Pam 1 <3,FRIENDSANITY, -1635,Town,Friendsanity: Pam 2 <3,FRIENDSANITY, -1636,Town,Friendsanity: Pam 3 <3,FRIENDSANITY, -1637,Town,Friendsanity: Pam 4 <3,FRIENDSANITY, -1638,Town,Friendsanity: Pam 5 <3,FRIENDSANITY, -1639,Town,Friendsanity: Pam 6 <3,FRIENDSANITY, -1640,Town,Friendsanity: Pam 7 <3,FRIENDSANITY, -1641,Town,Friendsanity: Pam 8 <3,FRIENDSANITY, -1642,Town,Friendsanity: Pam 9 <3,FRIENDSANITY, -1643,Town,Friendsanity: Pam 10 <3,FRIENDSANITY, -1645,Town,Friendsanity: Pierre 1 <3,FRIENDSANITY, -1646,Town,Friendsanity: Pierre 2 <3,FRIENDSANITY, -1647,Town,Friendsanity: Pierre 3 <3,FRIENDSANITY, -1648,Town,Friendsanity: Pierre 4 <3,FRIENDSANITY, -1649,Town,Friendsanity: Pierre 5 <3,FRIENDSANITY, -1650,Town,Friendsanity: Pierre 6 <3,FRIENDSANITY, -1651,Town,Friendsanity: Pierre 7 <3,FRIENDSANITY, -1652,Town,Friendsanity: Pierre 8 <3,FRIENDSANITY, -1653,Town,Friendsanity: Pierre 9 <3,FRIENDSANITY, -1654,Town,Friendsanity: Pierre 10 <3,FRIENDSANITY, -1656,Carpenter Shop,Friendsanity: Robin 1 <3,FRIENDSANITY, -1657,Carpenter Shop,Friendsanity: Robin 2 <3,FRIENDSANITY, -1658,Carpenter Shop,Friendsanity: Robin 3 <3,FRIENDSANITY, -1659,Carpenter Shop,Friendsanity: Robin 4 <3,FRIENDSANITY, -1660,Carpenter Shop,Friendsanity: Robin 5 <3,FRIENDSANITY, -1661,Carpenter Shop,Friendsanity: Robin 6 <3,FRIENDSANITY, -1662,Carpenter Shop,Friendsanity: Robin 7 <3,FRIENDSANITY, -1663,Carpenter Shop,Friendsanity: Robin 8 <3,FRIENDSANITY, -1664,Carpenter Shop,Friendsanity: Robin 9 <3,FRIENDSANITY, -1665,Carpenter Shop,Friendsanity: Robin 10 <3,FRIENDSANITY, -1667,Oasis,Friendsanity: Sandy 1 <3,FRIENDSANITY, -1668,Oasis,Friendsanity: Sandy 2 <3,FRIENDSANITY, -1669,Oasis,Friendsanity: Sandy 3 <3,FRIENDSANITY, -1670,Oasis,Friendsanity: Sandy 4 <3,FRIENDSANITY, -1671,Oasis,Friendsanity: Sandy 5 <3,FRIENDSANITY, -1672,Oasis,Friendsanity: Sandy 6 <3,FRIENDSANITY, -1673,Oasis,Friendsanity: Sandy 7 <3,FRIENDSANITY, -1674,Oasis,Friendsanity: Sandy 8 <3,FRIENDSANITY, -1675,Oasis,Friendsanity: Sandy 9 <3,FRIENDSANITY, -1676,Oasis,Friendsanity: Sandy 10 <3,FRIENDSANITY, -1678,Town,Friendsanity: Vincent 1 <3,FRIENDSANITY, -1679,Town,Friendsanity: Vincent 2 <3,FRIENDSANITY, -1680,Town,Friendsanity: Vincent 3 <3,FRIENDSANITY, -1681,Town,Friendsanity: Vincent 4 <3,FRIENDSANITY, -1682,Town,Friendsanity: Vincent 5 <3,FRIENDSANITY, -1683,Town,Friendsanity: Vincent 6 <3,FRIENDSANITY, -1684,Town,Friendsanity: Vincent 7 <3,FRIENDSANITY, -1685,Town,Friendsanity: Vincent 8 <3,FRIENDSANITY, -1686,Town,Friendsanity: Vincent 9 <3,FRIENDSANITY, -1687,Town,Friendsanity: Vincent 10 <3,FRIENDSANITY, -1689,Beach,Friendsanity: Willy 1 <3,FRIENDSANITY, -1690,Beach,Friendsanity: Willy 2 <3,FRIENDSANITY, -1691,Beach,Friendsanity: Willy 3 <3,FRIENDSANITY, -1692,Beach,Friendsanity: Willy 4 <3,FRIENDSANITY, -1693,Beach,Friendsanity: Willy 5 <3,FRIENDSANITY, -1694,Beach,Friendsanity: Willy 6 <3,FRIENDSANITY, -1695,Beach,Friendsanity: Willy 7 <3,FRIENDSANITY, -1696,Beach,Friendsanity: Willy 8 <3,FRIENDSANITY, -1697,Beach,Friendsanity: Willy 9 <3,FRIENDSANITY, -1698,Beach,Friendsanity: Willy 10 <3,FRIENDSANITY, -1700,Forest,Friendsanity: Wizard 1 <3,FRIENDSANITY, -1701,Forest,Friendsanity: Wizard 2 <3,FRIENDSANITY, -1702,Forest,Friendsanity: Wizard 3 <3,FRIENDSANITY, -1703,Forest,Friendsanity: Wizard 4 <3,FRIENDSANITY, -1704,Forest,Friendsanity: Wizard 5 <3,FRIENDSANITY, -1705,Forest,Friendsanity: Wizard 6 <3,FRIENDSANITY, -1706,Forest,Friendsanity: Wizard 7 <3,FRIENDSANITY, -1707,Forest,Friendsanity: Wizard 8 <3,FRIENDSANITY, -1708,Forest,Friendsanity: Wizard 9 <3,FRIENDSANITY, -1709,Forest,Friendsanity: Wizard 10 <3,FRIENDSANITY, -1710,Farm,Friendsanity: Pet 1 <3,FRIENDSANITY, -1711,Farm,Friendsanity: Pet 2 <3,FRIENDSANITY, -1712,Farm,Friendsanity: Pet 3 <3,FRIENDSANITY, -1713,Farm,Friendsanity: Pet 4 <3,FRIENDSANITY, -1714,Farm,Friendsanity: Pet 5 <3,FRIENDSANITY, -1715,Farm,Friendsanity: Friend 1 <3,FRIENDSANITY, -1716,Farm,Friendsanity: Friend 2 <3,FRIENDSANITY, -1717,Farm,Friendsanity: Friend 3 <3,FRIENDSANITY, -1718,Farm,Friendsanity: Friend 4 <3,FRIENDSANITY, -1719,Farm,Friendsanity: Friend 5 <3,FRIENDSANITY, -1720,Farm,Friendsanity: Friend 6 <3,FRIENDSANITY, -1721,Farm,Friendsanity: Friend 7 <3,FRIENDSANITY, -1722,Farm,Friendsanity: Friend 8 <3,FRIENDSANITY, -1723,Farm,Friendsanity: Suitor 9 <3,FRIENDSANITY, -1724,Farm,Friendsanity: Suitor 10 <3,FRIENDSANITY, -1725,Farm,Friendsanity: Spouse 11 <3,FRIENDSANITY, -1726,Farm,Friendsanity: Spouse 12 <3,FRIENDSANITY, -1727,Farm,Friendsanity: Spouse 13 <3,FRIENDSANITY, -1728,Farm,Friendsanity: Spouse 14 <3,FRIENDSANITY, -2001,Town,Egg Hunt Victory,FESTIVAL, -2002,Town,Egg Festival: Strawberry Seeds,FESTIVAL, -2003,Forest,Dance with someone,FESTIVAL, -2004,Forest,Rarecrow #5 (Woman),FESTIVAL, -2005,Beach,Luau Soup,FESTIVAL, -2006,Beach,Dance of the Moonlight Jellies,FESTIVAL, -2007,Town,Smashing Stone,FESTIVAL, -2008,Town,Grange Display,FESTIVAL, -2009,Town,Rarecrow #1 (Turnip Head),FESTIVAL, -2010,Town,Fair Stardrop,FESTIVAL, -2011,Town,Spirit's Eve Maze,FESTIVAL, -2012,Town,Rarecrow #2 (Witch),FESTIVAL, -2013,Forest,Win Fishing Competition,FESTIVAL, -2014,Forest,Rarecrow #4 (Snowman),FESTIVAL, -2015,Beach,Mermaid Pearl,FESTIVAL, -2016,Beach,Cone Hat,FESTIVAL_HARD, -2017,Beach,Iridium Fireplace,FESTIVAL_HARD, -2018,Beach,Rarecrow #7 (Tanuki),FESTIVAL, -2019,Beach,Rarecrow #8 (Tribal Mask),FESTIVAL, -2020,Beach,Lupini: Red Eagle,FESTIVAL, -2021,Beach,Lupini: Portrait Of A Mermaid,FESTIVAL, -2022,Beach,Lupini: Solar Kingdom,FESTIVAL, -2023,Beach,Lupini: Clouds,FESTIVAL_HARD, -2024,Beach,Lupini: 1000 Years From Now,FESTIVAL_HARD, -2025,Beach,Lupini: Three Trees,FESTIVAL_HARD, -2026,Beach,Lupini: The Serpent,FESTIVAL_HARD, -2027,Beach,Lupini: 'Tropical Fish #173',FESTIVAL_HARD, -2028,Beach,Lupini: Land Of Clay,FESTIVAL_HARD, -2029,Town,Secret Santa,FESTIVAL, -2030,Town,The Legend of the Winter Star,FESTIVAL, -2031,Farm,Collect All Rarecrows,FESTIVAL, -2101,Town,Island Ingredients,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", -2102,Town,Cave Patrol,SPECIAL_ORDER_BOARD, -2103,Town,Aquatic Overpopulation,SPECIAL_ORDER_BOARD, -2104,Town,Biome Balance,SPECIAL_ORDER_BOARD, -2105,Town,Rock Rejuvenation,SPECIAL_ORDER_BOARD, -2106,Town,Gifts for George,SPECIAL_ORDER_BOARD, -2107,Town,Fragments of the past,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", -2108,Town,Gus' Famous Omelet,SPECIAL_ORDER_BOARD, -2109,Town,Crop Order,SPECIAL_ORDER_BOARD, -2110,Town,Community Cleanup,SPECIAL_ORDER_BOARD, -2111,Town,The Strong Stuff,SPECIAL_ORDER_BOARD, -2112,Town,Pierre's Prime Produce,SPECIAL_ORDER_BOARD, -2113,Town,Robin's Project,SPECIAL_ORDER_BOARD, -2114,Town,Robin's Resource Rush,SPECIAL_ORDER_BOARD, -2115,Town,Juicy Bugs Wanted!,SPECIAL_ORDER_BOARD, -2116,Town,Tropical Fish,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", -2117,Town,A Curious Substance,SPECIAL_ORDER_BOARD, -2118,Town,Prismatic Jelly,SPECIAL_ORDER_BOARD, -2151,Qi's Walnut Room,Qi's Crop,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2152,Qi's Walnut Room,Let's Play A Game,"GINGER_ISLAND,SPECIAL_ORDER_QI,JUNIMO_KART", -2153,Qi's Walnut Room,Four Precious Stones,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2154,Qi's Walnut Room,Qi's Hungry Challenge,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2155,Qi's Walnut Room,Qi's Cuisine,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2156,Qi's Walnut Room,Qi's Kindness,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2157,Qi's Walnut Room,Extended Family,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2158,Qi's Walnut Room,Danger In The Deep,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2159,Qi's Walnut Room,Skull Cavern Invasion,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2160,Qi's Walnut Room,Qi's Prismatic Grange,"GINGER_ISLAND,SPECIAL_ORDER_QI", -2201,Boat Tunnel,Repair Ticket Machine,GINGER_ISLAND, -2202,Boat Tunnel,Repair Boat Hull,GINGER_ISLAND, -2203,Boat Tunnel,Repair Boat Anchor,GINGER_ISLAND, -2204,Leo's Hut,Leo's Parrot,"GINGER_ISLAND,WALNUT_PURCHASE", -2205,Island South,Island West Turtle,"GINGER_ISLAND,WALNUT_PURCHASE", -2206,Island West,Island Farmhouse,"GINGER_ISLAND,WALNUT_PURCHASE", -2207,Island Farmhouse,Island Mailbox,"GINGER_ISLAND,WALNUT_PURCHASE", -2208,Island Farmhouse,Farm Obelisk,"GINGER_ISLAND,WALNUT_PURCHASE", -2209,Island North,Dig Site Bridge,"GINGER_ISLAND,WALNUT_PURCHASE", -2210,Island North,Island Trader,"GINGER_ISLAND,WALNUT_PURCHASE", -2211,Volcano Entrance,Volcano Bridge,"GINGER_ISLAND,WALNUT_PURCHASE", -2212,Volcano - Floor 5,Volcano Exit Shortcut,"GINGER_ISLAND,WALNUT_PURCHASE", -2213,Island South,Island Resort,"GINGER_ISLAND,WALNUT_PURCHASE", -2214,Island West,Parrot Express,"GINGER_ISLAND,WALNUT_PURCHASE", -2215,Dig Site,Open Professor Snail Cave,"GINGER_ISLAND", -2216,Field Office,Complete Island Field Office,"GINGER_ISLAND", -2301,Farm,Harvest Amaranth,"CROPSANITY", -2302,Farm,Harvest Artichoke,"CROPSANITY", -2303,Farm,Harvest Beet,"CROPSANITY", -2304,Farm,Harvest Blue Jazz,"CROPSANITY", -2305,Farm,Harvest Blueberry,"CROPSANITY", -2306,Farm,Harvest Bok Choy,"CROPSANITY", -2307,Farm,Harvest Cauliflower,"CROPSANITY", -2308,Farm,Harvest Corn,"CROPSANITY", -2309,Farm,Harvest Cranberries,"CROPSANITY", -2310,Farm,Harvest Eggplant,"CROPSANITY", -2311,Farm,Harvest Fairy Rose,"CROPSANITY", -2312,Farm,Harvest Garlic,"CROPSANITY", -2313,Farm,Harvest Grape,"CROPSANITY", -2314,Farm,Harvest Green Bean,"CROPSANITY", -2315,Farm,Harvest Hops,"CROPSANITY", -2316,Farm,Harvest Hot Pepper,"CROPSANITY", -2317,Farm,Harvest Kale,"CROPSANITY", -2318,Farm,Harvest Melon,"CROPSANITY", -2319,Farm,Harvest Parsnip,"CROPSANITY", -2320,Farm,Harvest Poppy,"CROPSANITY", -2321,Farm,Harvest Potato,"CROPSANITY", -2322,Farm,Harvest Pumpkin,"CROPSANITY", -2323,Farm,Harvest Radish,"CROPSANITY", -2324,Farm,Harvest Red Cabbage,"CROPSANITY", -2325,Farm,Harvest Rhubarb,"CROPSANITY", -2326,Farm,Harvest Starfruit,"CROPSANITY", -2327,Farm,Harvest Strawberry,"CROPSANITY", -2328,Farm,Harvest Summer Spangle,"CROPSANITY", -2329,Farm,Harvest Sunflower,"CROPSANITY", -2330,Farm,Harvest Tomato,"CROPSANITY", -2331,Farm,Harvest Tulip,"CROPSANITY", -2332,Farm,Harvest Unmilled Rice,"CROPSANITY", -2333,Farm,Harvest Wheat,"CROPSANITY", -2334,Farm,Harvest Yam,"CROPSANITY", -2335,Farm,Harvest Cactus Fruit,"CROPSANITY", -2336,Farm,Harvest Pineapple,"CROPSANITY,GINGER_ISLAND", -2337,Farm,Harvest Taro Root,"CROPSANITY,GINGER_ISLAND", -2338,Farm,Harvest Sweet Gem Berry,"CROPSANITY", -2339,Farm,Harvest Apple,"CROPSANITY", -2340,Farm,Harvest Apricot,"CROPSANITY", -2341,Farm,Harvest Cherry,"CROPSANITY", -2342,Farm,Harvest Orange,"CROPSANITY", -2343,Farm,Harvest Pomegranate,"CROPSANITY", -2344,Farm,Harvest Peach,"CROPSANITY", -2345,Farm,Harvest Banana,"CROPSANITY,GINGER_ISLAND", -2346,Farm,Harvest Mango,"CROPSANITY,GINGER_ISLAND", -2347,Farm,Harvest Coffee Bean,"CROPSANITY", -5001,Stardew Valley,Level 1 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5002,Stardew Valley,Level 2 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5003,Stardew Valley,Level 3 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5004,Stardew Valley,Level 4 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5005,Stardew Valley,Level 5 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5006,Stardew Valley,Level 6 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5007,Stardew Valley,Level 7 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5008,Stardew Valley,Level 8 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5009,Stardew Valley,Level 9 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5010,Stardew Valley,Level 10 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill -5011,Stardew Valley,Level 1 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5012,Stardew Valley,Level 2 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5013,Stardew Valley,Level 3 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5014,Stardew Valley,Level 4 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5015,Stardew Valley,Level 5 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5016,Stardew Valley,Level 6 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5017,Stardew Valley,Level 7 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5018,Stardew Valley,Level 8 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5019,Stardew Valley,Level 9 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5020,Stardew Valley,Level 10 Socializing,"SOCIALIZING_LEVEL,SKILL_LEVEL",Socializing Skill -5021,Stardew Valley,Level 1 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5022,Stardew Valley,Level 2 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5023,Stardew Valley,Level 3 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5024,Stardew Valley,Level 4 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5025,Stardew Valley,Level 5 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5026,Stardew Valley,Level 6 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5027,Stardew Valley,Level 7 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5028,Stardew Valley,Level 8 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5029,Stardew Valley,Level 9 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5030,Stardew Valley,Level 10 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic -5031,Stardew Valley,Level 1 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5032,Stardew Valley,Level 2 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5033,Stardew Valley,Level 3 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5034,Stardew Valley,Level 4 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5035,Stardew Valley,Level 5 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5036,Stardew Valley,Level 6 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5037,Stardew Valley,Level 7 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5038,Stardew Valley,Level 8 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5039,Stardew Valley,Level 9 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5040,Stardew Valley,Level 10 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill -5041,Stardew Valley,Level 1 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5042,Stardew Valley,Level 2 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5043,Stardew Valley,Level 3 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5044,Stardew Valley,Level 4 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5045,Stardew Valley,Level 5 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5046,Stardew Valley,Level 6 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5047,Stardew Valley,Level 7 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5048,Stardew Valley,Level 8 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5049,Stardew Valley,Level 9 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5050,Stardew Valley,Level 10 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology -5051,Stardew Valley,Level 1 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5052,Stardew Valley,Level 2 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5053,Stardew Valley,Level 3 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5054,Stardew Valley,Level 4 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5055,Stardew Valley,Level 5 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5056,Stardew Valley,Level 6 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5057,Stardew Valley,Level 7 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5058,Stardew Valley,Level 8 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5059,Stardew Valley,Level 9 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5060,Stardew Valley,Level 10 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill -5501,Stardew Valley,Analyze: Clear Debris,MANDATORY,Magic -5502,Stardew Valley,Analyze: Till,MANDATORY,Magic -5503,Stardew Valley,Analyze: Water,MANDATORY,Magic -5504,Stardew Valley,Analyze All Toil School Locations,MANDATORY,Magic -5505,Stardew Valley,Analyze: Evac,MANDATORY,Magic -5506,Stardew Valley,Analyze: Haste,MANDATORY,Magic -5507,Stardew Valley,Analyze: Heal,MANDATORY,Magic -5508,Stardew Valley,Analyze All Life School Locations,MANDATORY,Magic -5509,Stardew Valley,Analyze: Descend,MANDATORY,Magic -5510,Stardew Valley,Analyze: Fireball,MANDATORY,Magic -5511,Stardew Valley,Analyze: Frostbite,MANDATORY,Magic -5512,Stardew Valley,Analyze All Elemental School Locations,MANDATORY,Magic -5513,Stardew Valley,Analyze: Lantern,MANDATORY,Magic -5514,Stardew Valley,Analyze: Tendrils,MANDATORY,Magic -5515,Stardew Valley,Analyze: Shockwave,MANDATORY,Magic -5516,Stardew Valley,Analyze All Nature School Locations,MANDATORY,Magic -5517,Stardew Valley,Analyze: Meteor,MANDATORY,Magic -5518,Stardew Valley,Analyze: Lucksteal,MANDATORY,Magic -5519,Stardew Valley,Analyze: Bloodmana,MANDATORY,Magic -5520,Stardew Valley,Analyze All Eldritch School Locations,MANDATORY,Magic -5521,Stardew Valley,Analyze Every Magic School Location,MANDATORY,Magic -6001,Town,Friendsanity: Jasper 1 <3,FRIENDSANITY,Professor Jasper Thomas -6002,Town,Friendsanity: Jasper 2 <3,FRIENDSANITY,Professor Jasper Thomas -6003,Town,Friendsanity: Jasper 3 <3,FRIENDSANITY,Professor Jasper Thomas -6004,Town,Friendsanity: Jasper 4 <3,FRIENDSANITY,Professor Jasper Thomas -6005,Town,Friendsanity: Jasper 5 <3,FRIENDSANITY,Professor Jasper Thomas -6006,Town,Friendsanity: Jasper 6 <3,FRIENDSANITY,Professor Jasper Thomas -6007,Town,Friendsanity: Jasper 7 <3,FRIENDSANITY,Professor Jasper Thomas -6008,Town,Friendsanity: Jasper 8 <3,FRIENDSANITY,Professor Jasper Thomas -6009,Town,Friendsanity: Jasper 9 <3,FRIENDSANITY,Professor Jasper Thomas -6010,Town,Friendsanity: Jasper 10 <3,FRIENDSANITY,Professor Jasper Thomas -6011,Town,Friendsanity: Jasper 11 <3,FRIENDSANITY,Professor Jasper Thomas -6012,Town,Friendsanity: Jasper 12 <3,FRIENDSANITY,Professor Jasper Thomas -6013,Town,Friendsanity: Jasper 13 <3,FRIENDSANITY,Professor Jasper Thomas -6014,Town,Friendsanity: Jasper 14 <3,FRIENDSANITY,Professor Jasper Thomas -6015,Secret Woods,Friendsanity: Yoba 1 <3,FRIENDSANITY,Custom NPC - Yoba -6016,Secret Woods,Friendsanity: Yoba 2 <3,FRIENDSANITY,Custom NPC - Yoba -6017,Secret Woods,Friendsanity: Yoba 3 <3,FRIENDSANITY,Custom NPC - Yoba -6018,Secret Woods,Friendsanity: Yoba 4 <3,FRIENDSANITY,Custom NPC - Yoba -6019,Secret Woods,Friendsanity: Yoba 5 <3,FRIENDSANITY,Custom NPC - Yoba -6020,Secret Woods,Friendsanity: Yoba 6 <3,FRIENDSANITY,Custom NPC - Yoba -6021,Secret Woods,Friendsanity: Yoba 7 <3,FRIENDSANITY,Custom NPC - Yoba -6022,Secret Woods,Friendsanity: Yoba 8 <3,FRIENDSANITY,Custom NPC - Yoba -6023,Secret Woods,Friendsanity: Yoba 9 <3,FRIENDSANITY,Custom NPC - Yoba -6024,Secret Woods,Friendsanity: Yoba 10 <3,FRIENDSANITY,Custom NPC - Yoba -6025,Forest,Friendsanity: Mr. Ginger 1 <3,FRIENDSANITY,Mister Ginger (cat npc) -6026,Forest,Friendsanity: Mr. Ginger 2 <3,FRIENDSANITY,Mister Ginger (cat npc) -6027,Forest,Friendsanity: Mr. Ginger 3 <3,FRIENDSANITY,Mister Ginger (cat npc) -6028,Forest,Friendsanity: Mr. Ginger 4 <3,FRIENDSANITY,Mister Ginger (cat npc) -6029,Forest,Friendsanity: Mr. Ginger 5 <3,FRIENDSANITY,Mister Ginger (cat npc) -6030,Forest,Friendsanity: Mr. Ginger 6 <3,FRIENDSANITY,Mister Ginger (cat npc) -6031,Forest,Friendsanity: Mr. Ginger 7 <3,FRIENDSANITY,Mister Ginger (cat npc) -6032,Forest,Friendsanity: Mr. Ginger 8 <3,FRIENDSANITY,Mister Ginger (cat npc) -6033,Forest,Friendsanity: Mr. Ginger 9 <3,FRIENDSANITY,Mister Ginger (cat npc) -6034,Forest,Friendsanity: Mr. Ginger 10 <3,FRIENDSANITY,Mister Ginger (cat npc) -6035,Town,Friendsanity: Ayeisha 1 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6036,Town,Friendsanity: Ayeisha 2 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6037,Town,Friendsanity: Ayeisha 3 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6038,Town,Friendsanity: Ayeisha 4 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6039,Town,Friendsanity: Ayeisha 5 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6040,Town,Friendsanity: Ayeisha 6 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6041,Town,Friendsanity: Ayeisha 7 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6042,Town,Friendsanity: Ayeisha 8 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6043,Town,Friendsanity: Ayeisha 9 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6044,Town,Friendsanity: Ayeisha 10 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) -6045,Town,Friendsanity: Shiko 1 <3,FRIENDSANITY,Shiko - New Custom NPC -6046,Town,Friendsanity: Shiko 2 <3,FRIENDSANITY,Shiko - New Custom NPC -6047,Town,Friendsanity: Shiko 3 <3,FRIENDSANITY,Shiko - New Custom NPC -6048,Town,Friendsanity: Shiko 4 <3,FRIENDSANITY,Shiko - New Custom NPC -6049,Town,Friendsanity: Shiko 5 <3,FRIENDSANITY,Shiko - New Custom NPC -6050,Town,Friendsanity: Shiko 6 <3,FRIENDSANITY,Shiko - New Custom NPC -6051,Town,Friendsanity: Shiko 7 <3,FRIENDSANITY,Shiko - New Custom NPC -6052,Town,Friendsanity: Shiko 8 <3,FRIENDSANITY,Shiko - New Custom NPC -6053,Town,Friendsanity: Shiko 9 <3,FRIENDSANITY,Shiko - New Custom NPC -6054,Town,Friendsanity: Shiko 10 <3,FRIENDSANITY,Shiko - New Custom NPC -6055,Town,Friendsanity: Shiko 11 <3,FRIENDSANITY,Shiko - New Custom NPC -6056,Town,Friendsanity: Shiko 12 <3,FRIENDSANITY,Shiko - New Custom NPC -6057,Town,Friendsanity: Shiko 13 <3,FRIENDSANITY,Shiko - New Custom NPC -6058,Town,Friendsanity: Shiko 14 <3,FRIENDSANITY,Shiko - New Custom NPC -6059,Forest,Friendsanity: Wellwick 1 <3,FRIENDSANITY,'Prophet' Wellwick -6060,Forest,Friendsanity: Wellwick 2 <3,FRIENDSANITY,'Prophet' Wellwick -6061,Forest,Friendsanity: Wellwick 3 <3,FRIENDSANITY,'Prophet' Wellwick -6062,Forest,Friendsanity: Wellwick 4 <3,FRIENDSANITY,'Prophet' Wellwick -6063,Forest,Friendsanity: Wellwick 5 <3,FRIENDSANITY,'Prophet' Wellwick -6064,Forest,Friendsanity: Wellwick 6 <3,FRIENDSANITY,'Prophet' Wellwick -6065,Forest,Friendsanity: Wellwick 7 <3,FRIENDSANITY,'Prophet' Wellwick -6066,Forest,Friendsanity: Wellwick 8 <3,FRIENDSANITY,'Prophet' Wellwick -6067,Forest,Friendsanity: Wellwick 9 <3,FRIENDSANITY,'Prophet' Wellwick -6068,Forest,Friendsanity: Wellwick 10 <3,FRIENDSANITY,'Prophet' Wellwick -6069,Forest,Friendsanity: Wellwick 11 <3,FRIENDSANITY,'Prophet' Wellwick -6070,Forest,Friendsanity: Wellwick 12 <3,FRIENDSANITY,'Prophet' Wellwick -6071,Forest,Friendsanity: Wellwick 13 <3,FRIENDSANITY,'Prophet' Wellwick -6072,Forest,Friendsanity: Wellwick 14 <3,FRIENDSANITY,'Prophet' Wellwick -6073,Forest,Friendsanity: Delores 1 <3,FRIENDSANITY,Delores - Custom NPC -6074,Forest,Friendsanity: Delores 2 <3,FRIENDSANITY,Delores - Custom NPC -6075,Forest,Friendsanity: Delores 3 <3,FRIENDSANITY,Delores - Custom NPC -6076,Forest,Friendsanity: Delores 4 <3,FRIENDSANITY,Delores - Custom NPC -6077,Forest,Friendsanity: Delores 5 <3,FRIENDSANITY,Delores - Custom NPC -6078,Forest,Friendsanity: Delores 6 <3,FRIENDSANITY,Delores - Custom NPC -6079,Forest,Friendsanity: Delores 7 <3,FRIENDSANITY,Delores - Custom NPC -6080,Forest,Friendsanity: Delores 8 <3,FRIENDSANITY,Delores - Custom NPC -6081,Forest,Friendsanity: Delores 9 <3,FRIENDSANITY,Delores - Custom NPC -6082,Forest,Friendsanity: Delores 10 <3,FRIENDSANITY,Delores - Custom NPC -6083,Forest,Friendsanity: Delores 11 <3,FRIENDSANITY,Delores - Custom NPC -6084,Forest,Friendsanity: Delores 12 <3,FRIENDSANITY,Delores - Custom NPC -6085,Forest,Friendsanity: Delores 13 <3,FRIENDSANITY,Delores - Custom NPC -6086,Forest,Friendsanity: Delores 14 <3,FRIENDSANITY,Delores - Custom NPC -6087,Forest,Friendsanity: Alec 1 <3,FRIENDSANITY,Alec Revisited -6088,Forest,Friendsanity: Alec 2 <3,FRIENDSANITY,Alec Revisited -6089,Forest,Friendsanity: Alec 3 <3,FRIENDSANITY,Alec Revisited -6090,Forest,Friendsanity: Alec 4 <3,FRIENDSANITY,Alec Revisited -6091,Forest,Friendsanity: Alec 5 <3,FRIENDSANITY,Alec Revisited -6092,Forest,Friendsanity: Alec 6 <3,FRIENDSANITY,Alec Revisited -6093,Forest,Friendsanity: Alec 7 <3,FRIENDSANITY,Alec Revisited -6094,Forest,Friendsanity: Alec 8 <3,FRIENDSANITY,Alec Revisited -6095,Forest,Friendsanity: Alec 9 <3,FRIENDSANITY,Alec Revisited -6096,Forest,Friendsanity: Alec 10 <3,FRIENDSANITY,Alec Revisited -6097,Forest,Friendsanity: Alec 11 <3,FRIENDSANITY,Alec Revisited -6098,Forest,Friendsanity: Alec 12 <3,FRIENDSANITY,Alec Revisited -6099,Forest,Friendsanity: Alec 13 <3,FRIENDSANITY,Alec Revisited -6100,Forest,Friendsanity: Alec 14 <3,FRIENDSANITY,Alec Revisited -6101,Forest,Friendsanity: Eugene 1 <3,FRIENDSANITY,Custom NPC Eugene -6102,Forest,Friendsanity: Eugene 2 <3,FRIENDSANITY,Custom NPC Eugene -6103,Forest,Friendsanity: Eugene 3 <3,FRIENDSANITY,Custom NPC Eugene -6104,Forest,Friendsanity: Eugene 4 <3,FRIENDSANITY,Custom NPC Eugene -6105,Forest,Friendsanity: Eugene 5 <3,FRIENDSANITY,Custom NPC Eugene -6106,Forest,Friendsanity: Eugene 6 <3,FRIENDSANITY,Custom NPC Eugene -6107,Forest,Friendsanity: Eugene 7 <3,FRIENDSANITY,Custom NPC Eugene -6108,Forest,Friendsanity: Eugene 8 <3,FRIENDSANITY,Custom NPC Eugene -6109,Forest,Friendsanity: Eugene 9 <3,FRIENDSANITY,Custom NPC Eugene -6110,Forest,Friendsanity: Eugene 10 <3,FRIENDSANITY,Custom NPC Eugene -6111,Forest,Friendsanity: Eugene 11 <3,FRIENDSANITY,Custom NPC Eugene -6112,Forest,Friendsanity: Eugene 12 <3,FRIENDSANITY,Custom NPC Eugene -6113,Forest,Friendsanity: Eugene 13 <3,FRIENDSANITY,Custom NPC Eugene -6114,Forest,Friendsanity: Eugene 14 <3,FRIENDSANITY,Custom NPC Eugene -6115,Forest,Friendsanity: Juna 1 <3,FRIENDSANITY,Juna - Roommate NPC -6116,Forest,Friendsanity: Juna 2 <3,FRIENDSANITY,Juna - Roommate NPC -6117,Forest,Friendsanity: Juna 3 <3,FRIENDSANITY,Juna - Roommate NPC -6118,Forest,Friendsanity: Juna 4 <3,FRIENDSANITY,Juna - Roommate NPC -6119,Forest,Friendsanity: Juna 5 <3,FRIENDSANITY,Juna - Roommate NPC -6120,Forest,Friendsanity: Juna 6 <3,FRIENDSANITY,Juna - Roommate NPC -6121,Forest,Friendsanity: Juna 7 <3,FRIENDSANITY,Juna - Roommate NPC -6122,Forest,Friendsanity: Juna 8 <3,FRIENDSANITY,Juna - Roommate NPC -6123,Forest,Friendsanity: Juna 9 <3,FRIENDSANITY,Juna - Roommate NPC -6124,Forest,Friendsanity: Juna 10 <3,FRIENDSANITY,Juna - Roommate NPC -6125,Town,Friendsanity: Riley 1 <3,FRIENDSANITY,Custom NPC - Riley -6126,Town,Friendsanity: Riley 2 <3,FRIENDSANITY,Custom NPC - Riley -6127,Town,Friendsanity: Riley 3 <3,FRIENDSANITY,Custom NPC - Riley -6128,Town,Friendsanity: Riley 4 <3,FRIENDSANITY,Custom NPC - Riley -6129,Town,Friendsanity: Riley 5 <3,FRIENDSANITY,Custom NPC - Riley -6130,Town,Friendsanity: Riley 6 <3,FRIENDSANITY,Custom NPC - Riley -6131,Town,Friendsanity: Riley 7 <3,FRIENDSANITY,Custom NPC - Riley -6132,Town,Friendsanity: Riley 8 <3,FRIENDSANITY,Custom NPC - Riley -6133,Town,Friendsanity: Riley 9 <3,FRIENDSANITY,Custom NPC - Riley -6134,Town,Friendsanity: Riley 10 <3,FRIENDSANITY,Custom NPC - Riley -6135,Town,Friendsanity: Riley 11 <3,FRIENDSANITY,Custom NPC - Riley -6136,Town,Friendsanity: Riley 12 <3,FRIENDSANITY,Custom NPC - Riley -6137,Town,Friendsanity: Riley 13 <3,FRIENDSANITY,Custom NPC - Riley -6138,Town,Friendsanity: Riley 14 <3,FRIENDSANITY,Custom NPC - Riley -7001,Pierre's General Store,Premium Pack,BACKPACK,Bigger Backpack -7002,Carpenter Shop,Tractor Garage Blueprint,BUILDING_BLUEPRINT,Tractor Mod -7003,The Deep Woods Depth 100,Pet the Deep Woods Unicorn,MANDATORY,DeepWoods -7004,The Deep Woods Depth 50,Breaking Up Deep Woods Gingerbread House,MANDATORY,DeepWoods -7005,The Deep Woods Depth 50,Drinking From Deep Woods Fountain,MANDATORY,DeepWoods -7006,The Deep Woods Depth 100,Deep Woods Treasure Chest,MANDATORY,DeepWoods -7007,The Deep Woods Depth 100,Deep Woods Trash Bin,MANDATORY,DeepWoods -7008,The Deep Woods Depth 50,Chop Down a Deep Woods Iridium Tree,MANDATORY,DeepWoods -7009,The Deep Woods Depth 10,The Deep Woods: Depth 10,ELEVATOR,DeepWoods -7010,The Deep Woods Depth 20,The Deep Woods: Depth 20,ELEVATOR,DeepWoods -7011,The Deep Woods Depth 30,The Deep Woods: Depth 30,ELEVATOR,DeepWoods -7012,The Deep Woods Depth 40,The Deep Woods: Depth 40,ELEVATOR,DeepWoods -7013,The Deep Woods Depth 50,The Deep Woods: Depth 50,ELEVATOR,DeepWoods -7014,The Deep Woods Depth 60,The Deep Woods: Depth 60,ELEVATOR,DeepWoods -7015,The Deep Woods Depth 70,The Deep Woods: Depth 70,ELEVATOR,DeepWoods -7016,The Deep Woods Depth 80,The Deep Woods: Depth 80,ELEVATOR,DeepWoods -7017,The Deep Woods Depth 90,The Deep Woods: Depth 90,ELEVATOR,DeepWoods -7018,The Deep Woods Depth 100,The Deep Woods: Depth 100,ELEVATOR,DeepWoods -7019,The Deep Woods Depth 50,Purify an Infested Lichtung,MANDATORY,DeepWoods -7020,Skull Cavern Floor 25,Skull Cavern: Floor 25,ELEVATOR,Skull Cavern Elevator -7021,Skull Cavern Floor 50,Skull Cavern: Floor 50,ELEVATOR,Skull Cavern Elevator -7022,Skull Cavern Floor 75,Skull Cavern: Floor 75,ELEVATOR,Skull Cavern Elevator -7023,Skull Cavern Floor 100,Skull Cavern: Floor 100,ELEVATOR,Skull Cavern Elevator -7024,Skull Cavern Floor 125,Skull Cavern: Floor 125,ELEVATOR,Skull Cavern Elevator -7025,Skull Cavern Floor 150,Skull Cavern: Floor 150,ELEVATOR,Skull Cavern Elevator -7026,Skull Cavern Floor 175,Skull Cavern: Floor 175,ELEVATOR,Skull Cavern Elevator -7027,Skull Cavern Floor 200,Skull Cavern: Floor 200,ELEVATOR,Skull Cavern Elevator -7501,Town,Missing Envelope,"MANDATORY,QUEST",Ayeisha - The Postal Worker (Custom NPC) -7502,Town,Lost Emerald Ring,"MANDATORY,QUEST",Ayeisha - The Postal Worker (Custom NPC) -7503,Forest,Mr.Ginger's request,"MANDATORY,QUEST",Mister Ginger (cat npc) -7504,Forest,Juna's Drink Request,"MANDATORY,QUEST",Juna - Roommate NPC -7505,Forest,Juna's BFF Request,"MANDATORY,QUEST",Juna - Roommate NPC -7506,Forest,Juna's Monster Mash,SPECIAL_ORDER_BOARD,Juna - Roommate NPC +id,region,name,tags,mod_name +1,Crafts Room,Spring Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +2,Crafts Room,Summer Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +3,Crafts Room,Fall Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +4,Crafts Room,Winter Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +5,Crafts Room,Construction Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +6,Crafts Room,Exotic Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +7,Pantry,Spring Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +8,Pantry,Summer Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +9,Pantry,Fall Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +10,Pantry,Quality Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +11,Pantry,Animal Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +12,Pantry,Artisan Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +13,Fish Tank,River Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +14,Fish Tank,Lake Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +15,Fish Tank,Ocean Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +16,Fish Tank,Night Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +17,Fish Tank,Crab Pot Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +18,Fish Tank,Specialty Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +19,Boiler Room,Blacksmith's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +20,Boiler Room,Geologist's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +21,Boiler Room,Adventurer's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +22,Bulletin Board,Chef's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +23,Bulletin Board,Dye Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +24,Bulletin Board,Field Research Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +25,Bulletin Board,Fodder Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +26,Bulletin Board,Enchanter's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +27,Vault,"2,500g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +28,Vault,"5,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +29,Vault,"10,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +30,Vault,"25,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +31,Abandoned JojaMart,The Missing Bundle,BUNDLE, +32,Crafts Room,Complete Crafts Room,COMMUNITY_CENTER_ROOM, +33,Pantry,Complete Pantry,COMMUNITY_CENTER_ROOM, +34,Fish Tank,Complete Fish Tank,COMMUNITY_CENTER_ROOM, +35,Boiler Room,Complete Boiler Room,COMMUNITY_CENTER_ROOM, +36,Bulletin Board,Complete Bulletin Board,COMMUNITY_CENTER_ROOM, +37,Vault,Complete Vault,COMMUNITY_CENTER_ROOM, +39,Fish Tank,Deep Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +40,Crafts Room,Beach Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +41,Crafts Room,Mines Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +42,Crafts Room,Desert Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +43,Crafts Room,Island Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +44,Crafts Room,Sticky Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +45,Crafts Room,Wild Medicine Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +46,Crafts Room,Quality Foraging Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,CRAFTS_ROOM_BUNDLE", +47,Boiler Room,Paleontologist's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,BOILER_ROOM_BUNDLE", +48,Boiler Room,Archaeologist's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,BOILER_ROOM_BUNDLE", +49,Pantry,Slime Farmer Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +50,Pantry,Rare Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +51,Pantry,Fish Farmer's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +52,Pantry,Garden Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +53,Pantry,Brewer's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +54,Pantry,Orchard Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +55,Pantry,Island Crops Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,PANTRY_BUNDLE", +56,Pantry,Agronomist's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +57,Fish Tank,Tackle Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +58,Fish Tank,Trash Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +59,Fish Tank,Spring Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +60,Fish Tank,Summer Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +61,Fish Tank,Fall Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +62,Fish Tank,Winter Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +63,Fish Tank,Rain Fishing Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +64,Fish Tank,Quality Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +65,Fish Tank,Master Fisher's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +66,Fish Tank,Legendary Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +67,Fish Tank,Island Fish Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +68,Fish Tank,Master Baiter Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,FISH_TANK_BUNDLE", +69,Boiler Room,Recycling Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +70,Boiler Room,Treasure Hunter's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +71,Boiler Room,Engineer's Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +72,Boiler Room,Demolition Bundle,"BOILER_ROOM_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +73,Bulletin Board,Children's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +74,Bulletin Board,Forager's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +75,Bulletin Board,Home Cook's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +76,Bulletin Board,Bartender's Bundle,"BULLETIN_BOARD_BUNDLE,BUNDLE,COMMUNITY_CENTER_BUNDLE", +77,Vault,250g Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +78,Vault,500g Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +79,Vault,"1,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +80,Vault,"2,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +81,Vault,"5,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +82,Vault,"1,500g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +83,Vault,"3,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +84,Vault,"3,500g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +85,Vault,"4,500g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +86,Vault,"6,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +87,Vault,"7,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +88,Vault,"9,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +89,Vault,"14,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +90,Vault,"15,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +91,Vault,"18,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +92,Vault,"20,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +93,Vault,"35,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +94,Vault,"40,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +95,Vault,"45,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +96,Vault,"100,000g Bundle","BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +97,Vault,Gambler's Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +98,Vault,Carnival Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +99,Vault,Walnut Hunter Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +100,Vault,Qi's Helper Bundle,"BUNDLE,COMMUNITY_CENTER_BUNDLE,VAULT_BUNDLE", +101,Pierre's General Store,Large Pack,BACKPACK, +102,Pierre's General Store,Deluxe Pack,BACKPACK, +103,Blacksmith Copper Upgrades,Copper Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", +104,Blacksmith Iron Upgrades,Iron Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", +105,Blacksmith Gold Upgrades,Gold Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", +106,Blacksmith Iridium Upgrades,Iridium Hoe Upgrade,"HOE_UPGRADE,TOOL_UPGRADE", +107,Blacksmith Copper Upgrades,Copper Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", +108,Blacksmith Iron Upgrades,Iron Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", +109,Blacksmith Gold Upgrades,Gold Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", +110,Blacksmith Iridium Upgrades,Iridium Pickaxe Upgrade,"PICKAXE_UPGRADE,TOOL_UPGRADE", +111,Blacksmith Copper Upgrades,Copper Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", +112,Blacksmith Iron Upgrades,Iron Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", +113,Blacksmith Gold Upgrades,Gold Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", +114,Blacksmith Iridium Upgrades,Iridium Axe Upgrade,"AXE_UPGRADE,TOOL_UPGRADE", +115,Blacksmith Copper Upgrades,Copper Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", +116,Blacksmith Iron Upgrades,Iron Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", +117,Blacksmith Gold Upgrades,Gold Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", +118,Blacksmith Iridium Upgrades,Iridium Watering Can Upgrade,"TOOL_UPGRADE,WATERING_CAN_UPGRADE", +119,Blacksmith Copper Upgrades,Copper Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", +120,Blacksmith Iron Upgrades,Iron Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", +121,Blacksmith Gold Upgrades,Gold Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", +122,Blacksmith Iridium Upgrades,Iridium Trash Can Upgrade,"TOOL_UPGRADE,TRASH_CAN_UPGRADE", +123,Willy's Fish Shop,Purchase Training Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", +124,Beach,Bamboo Pole Cutscene,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", +125,Willy's Fish Shop,Purchase Fiberglass Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", +126,Willy's Fish Shop,Purchase Iridium Rod,"FISHING_ROD_UPGRADE,TOOL_UPGRADE", +201,The Mines - Floor 10,The Mines Floor 10 Treasure,"MANDATORY,THE_MINES_TREASURE", +202,The Mines - Floor 20,The Mines Floor 20 Treasure,"MANDATORY,THE_MINES_TREASURE", +203,The Mines - Floor 40,The Mines Floor 40 Treasure,"MANDATORY,THE_MINES_TREASURE", +204,The Mines - Floor 50,The Mines Floor 50 Treasure,"MANDATORY,THE_MINES_TREASURE", +205,The Mines - Floor 60,The Mines Floor 60 Treasure,"MANDATORY,THE_MINES_TREASURE", +206,The Mines - Floor 70,The Mines Floor 70 Treasure,"MANDATORY,THE_MINES_TREASURE", +207,The Mines - Floor 80,The Mines Floor 80 Treasure,"MANDATORY,THE_MINES_TREASURE", +208,The Mines - Floor 90,The Mines Floor 90 Treasure,"MANDATORY,THE_MINES_TREASURE", +209,The Mines - Floor 100,The Mines Floor 100 Treasure,"MANDATORY,THE_MINES_TREASURE", +210,The Mines - Floor 110,The Mines Floor 110 Treasure,"MANDATORY,THE_MINES_TREASURE", +211,The Mines - Floor 120,The Mines Floor 120 Treasure,"MANDATORY,THE_MINES_TREASURE", +212,Quarry Mine,Grim Reaper statue,MANDATORY, +213,The Mines,The Mines Entrance Cutscene,MANDATORY, +214,The Mines - Floor 5,Floor 5 Elevator,ELEVATOR, +215,The Mines - Floor 10,Floor 10 Elevator,ELEVATOR, +216,The Mines - Floor 15,Floor 15 Elevator,ELEVATOR, +217,The Mines - Floor 20,Floor 20 Elevator,ELEVATOR, +218,The Mines - Floor 25,Floor 25 Elevator,ELEVATOR, +219,The Mines - Floor 30,Floor 30 Elevator,ELEVATOR, +220,The Mines - Floor 35,Floor 35 Elevator,ELEVATOR, +221,The Mines - Floor 40,Floor 40 Elevator,ELEVATOR, +222,The Mines - Floor 45,Floor 45 Elevator,ELEVATOR, +223,The Mines - Floor 50,Floor 50 Elevator,ELEVATOR, +224,The Mines - Floor 55,Floor 55 Elevator,ELEVATOR, +225,The Mines - Floor 60,Floor 60 Elevator,ELEVATOR, +226,The Mines - Floor 65,Floor 65 Elevator,ELEVATOR, +227,The Mines - Floor 70,Floor 70 Elevator,ELEVATOR, +228,The Mines - Floor 75,Floor 75 Elevator,ELEVATOR, +229,The Mines - Floor 80,Floor 80 Elevator,ELEVATOR, +230,The Mines - Floor 85,Floor 85 Elevator,ELEVATOR, +231,The Mines - Floor 90,Floor 90 Elevator,ELEVATOR, +232,The Mines - Floor 95,Floor 95 Elevator,ELEVATOR, +233,The Mines - Floor 100,Floor 100 Elevator,ELEVATOR, +234,The Mines - Floor 105,Floor 105 Elevator,ELEVATOR, +235,The Mines - Floor 110,Floor 110 Elevator,ELEVATOR, +236,The Mines - Floor 115,Floor 115 Elevator,ELEVATOR, +237,The Mines - Floor 120,Floor 120 Elevator,ELEVATOR, +250,Shipping,Demetrius's Breakthrough,MANDATORY +251,Volcano - Floor 10,Volcano Caldera Treasure,"GINGER_ISLAND,MANDATORY", +301,Farming,Level 1 Farming,"FARMING_LEVEL,SKILL_LEVEL", +302,Farming,Level 2 Farming,"FARMING_LEVEL,SKILL_LEVEL", +303,Farming,Level 3 Farming,"FARMING_LEVEL,SKILL_LEVEL", +304,Farming,Level 4 Farming,"FARMING_LEVEL,SKILL_LEVEL", +305,Farming,Level 5 Farming,"FARMING_LEVEL,SKILL_LEVEL", +306,Farming,Level 6 Farming,"FARMING_LEVEL,SKILL_LEVEL", +307,Farming,Level 7 Farming,"FARMING_LEVEL,SKILL_LEVEL", +308,Farming,Level 8 Farming,"FARMING_LEVEL,SKILL_LEVEL", +309,Farming,Level 9 Farming,"FARMING_LEVEL,SKILL_LEVEL", +310,Farming,Level 10 Farming,"FARMING_LEVEL,SKILL_LEVEL", +311,Fishing,Level 1 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +312,Fishing,Level 2 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +313,Fishing,Level 3 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +314,Fishing,Level 4 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +315,Fishing,Level 5 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +316,Fishing,Level 6 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +317,Fishing,Level 7 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +318,Fishing,Level 8 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +319,Fishing,Level 9 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +320,Fishing,Level 10 Fishing,"FISHING_LEVEL,SKILL_LEVEL", +321,Forest,Level 1 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +322,Forest,Level 2 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +323,Forest,Level 3 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +324,Forest,Level 4 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +325,Forest,Level 5 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +326,Secret Woods,Level 6 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +327,Secret Woods,Level 7 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +328,Secret Woods,Level 8 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +329,Secret Woods,Level 9 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +330,Secret Woods,Level 10 Foraging,"FORAGING_LEVEL,SKILL_LEVEL", +331,The Mines - Floor 20,Level 1 Mining,"MINING_LEVEL,SKILL_LEVEL", +332,The Mines - Floor 30,Level 2 Mining,"MINING_LEVEL,SKILL_LEVEL", +333,The Mines - Floor 40,Level 3 Mining,"MINING_LEVEL,SKILL_LEVEL", +334,The Mines - Floor 50,Level 4 Mining,"MINING_LEVEL,SKILL_LEVEL", +335,The Mines - Floor 60,Level 5 Mining,"MINING_LEVEL,SKILL_LEVEL", +336,The Mines - Floor 70,Level 6 Mining,"MINING_LEVEL,SKILL_LEVEL", +337,The Mines - Floor 80,Level 7 Mining,"MINING_LEVEL,SKILL_LEVEL", +338,The Mines - Floor 90,Level 8 Mining,"MINING_LEVEL,SKILL_LEVEL", +339,The Mines - Floor 100,Level 9 Mining,"MINING_LEVEL,SKILL_LEVEL", +340,The Mines - Floor 110,Level 10 Mining,"MINING_LEVEL,SKILL_LEVEL", +341,The Mines - Floor 20,Level 1 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +342,The Mines - Floor 30,Level 2 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +343,The Mines - Floor 40,Level 3 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +344,The Mines - Floor 50,Level 4 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +345,The Mines - Floor 60,Level 5 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +346,The Mines - Floor 70,Level 6 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +347,The Mines - Floor 80,Level 7 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +348,The Mines - Floor 90,Level 8 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +349,The Mines - Floor 100,Level 9 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +350,The Mines - Floor 110,Level 10 Combat,"COMBAT_LEVEL,SKILL_LEVEL", +401,Carpenter Shop,Coop Blueprint,BUILDING_BLUEPRINT, +402,Carpenter Shop,Big Coop Blueprint,BUILDING_BLUEPRINT, +403,Carpenter Shop,Deluxe Coop Blueprint,BUILDING_BLUEPRINT, +404,Carpenter Shop,Barn Blueprint,BUILDING_BLUEPRINT, +405,Carpenter Shop,Big Barn Blueprint,BUILDING_BLUEPRINT, +406,Carpenter Shop,Deluxe Barn Blueprint,BUILDING_BLUEPRINT, +407,Carpenter Shop,Well Blueprint,BUILDING_BLUEPRINT, +408,Carpenter Shop,Silo Blueprint,BUILDING_BLUEPRINT, +409,Carpenter Shop,Mill Blueprint,BUILDING_BLUEPRINT, +410,Carpenter Shop,Shed Blueprint,BUILDING_BLUEPRINT, +411,Carpenter Shop,Big Shed Blueprint,BUILDING_BLUEPRINT, +412,Carpenter Shop,Fish Pond Blueprint,BUILDING_BLUEPRINT, +413,Carpenter Shop,Stable Blueprint,BUILDING_BLUEPRINT, +414,Carpenter Shop,Slime Hutch Blueprint,BUILDING_BLUEPRINT, +415,Carpenter Shop,Shipping Bin Blueprint,BUILDING_BLUEPRINT, +416,Carpenter Shop,Kitchen Blueprint,BUILDING_BLUEPRINT, +417,Carpenter Shop,Kids Room Blueprint,BUILDING_BLUEPRINT, +418,Carpenter Shop,Cellar Blueprint,BUILDING_BLUEPRINT, +501,Town,Introductions,"STORY_QUEST", +502,Town,How To Win Friends,"STORY_QUEST", +503,Farm,Getting Started,"STORY_QUEST", +504,Farm,Raising Animals,"STORY_QUEST", +505,Farm,Advancement,"STORY_QUEST", +506,Museum,Archaeology,"STORY_QUEST", +507,Wizard Tower,Meet The Wizard,"STORY_QUEST", +508,The Mines - Floor 5,Forging Ahead,"STORY_QUEST", +509,The Mines - Floor 10,Smelting,"STORY_QUEST", +510,The Mines - Floor 15,Initiation,"STORY_QUEST", +511,Mountain,Robin's Lost Axe,"STORY_QUEST", +512,Town,Jodi's Request,"STORY_QUEST", +513,Town,"Mayor's ""Shorts""","STORY_QUEST", +514,Mountain,Blackberry Basket,"STORY_QUEST", +515,Marnie's Ranch,Marnie's Request,"STORY_QUEST", +516,Town,Pam Is Thirsty,"STORY_QUEST", +517,Wizard Tower,A Dark Reagent,"STORY_QUEST", +518,Forest,Cow's Delight,"STORY_QUEST", +519,Skull Cavern Entrance,The Skull Key,"STORY_QUEST", +520,Mountain,Crop Research,"STORY_QUEST", +521,Alex's House,Knee Therapy,"STORY_QUEST", +522,Mountain,Robin's Request,"STORY_QUEST", +523,Skull Cavern Floor 25,Qi's Challenge,"STORY_QUEST", +524,Desert,The Mysterious Qi,"STORY_QUEST", +525,Town,Carving Pumpkins,"STORY_QUEST", +526,Town,A Winter Mystery,"STORY_QUEST", +527,Secret Woods,Strange Note,"STORY_QUEST", +528,Skull Cavern Floor 100,Cryptic Note,"STORY_QUEST", +529,Town,Fresh Fruit,"STORY_QUEST", +530,Mountain,Aquatic Research,"STORY_QUEST", +531,Town,A Soldier's Star,"STORY_QUEST", +532,Town,Mayor's Need,"STORY_QUEST", +533,Saloon,Wanted: Lobster,"STORY_QUEST", +534,Town,Pam Needs Juice,"STORY_QUEST", +535,Sam's House,Fish Casserole,"STORY_QUEST", +536,Beach,Catch A Squid,"STORY_QUEST", +537,Saloon,Fish Stew,"STORY_QUEST", +538,Pierre's General Store,Pierre's Notice,"STORY_QUEST", +539,Clint's Blacksmith,Clint's Attempt,"STORY_QUEST", +540,Town,A Favor For Clint,"STORY_QUEST", +541,Wizard Tower,Staff Of Power,"STORY_QUEST", +542,Town,Granny's Gift,"STORY_QUEST", +543,Desert,Exotic Spirits,"STORY_QUEST", +544,Fishing,Catch a Lingcod,"STORY_QUEST", +545,Island West,The Pirate's Wife,"GINGER_ISLAND,STORY_QUEST", +546,Mutant Bug Lair,Dark Talisman,"STORY_QUEST", +547,Witch's Swamp,Goblin Problem,"STORY_QUEST", +548,Witch's Hut,Magic Ink,"STORY_QUEST", +601,JotPK World 1,JotPK: Boots 1,"ARCADE_MACHINE,JOTPK", +602,JotPK World 1,JotPK: Boots 2,"ARCADE_MACHINE,JOTPK", +603,JotPK World 1,JotPK: Gun 1,"ARCADE_MACHINE,JOTPK", +604,JotPK World 2,JotPK: Gun 2,"ARCADE_MACHINE,JOTPK", +605,JotPK World 2,JotPK: Gun 3,"ARCADE_MACHINE,JOTPK", +606,JotPK World 3,JotPK: Super Gun,"ARCADE_MACHINE,JOTPK", +607,JotPK World 1,JotPK: Ammo 1,"ARCADE_MACHINE,JOTPK", +608,JotPK World 2,JotPK: Ammo 2,"ARCADE_MACHINE,JOTPK", +609,JotPK World 3,JotPK: Ammo 3,"ARCADE_MACHINE,JOTPK", +610,JotPK World 1,JotPK: Cowboy 1,"ARCADE_MACHINE,JOTPK", +611,JotPK World 2,JotPK: Cowboy 2,"ARCADE_MACHINE,JOTPK", +612,Junimo Kart 1,Junimo Kart: Crumble Cavern,"ARCADE_MACHINE,JUNIMO_KART", +613,Junimo Kart 1,Junimo Kart: Slippery Slopes,"ARCADE_MACHINE,JUNIMO_KART", +614,Junimo Kart 2,Junimo Kart: Secret Level,"ARCADE_MACHINE,JUNIMO_KART", +615,Junimo Kart 2,Junimo Kart: The Gem Sea Giant,"ARCADE_MACHINE,JUNIMO_KART", +616,Junimo Kart 2,Junimo Kart: Slomp's Stomp,"ARCADE_MACHINE,JUNIMO_KART", +617,Junimo Kart 2,Junimo Kart: Ghastly Galleon,"ARCADE_MACHINE,JUNIMO_KART", +618,Junimo Kart 3,Junimo Kart: Glowshroom Grotto,"ARCADE_MACHINE,JUNIMO_KART", +619,Junimo Kart 3,Junimo Kart: Red Hot Rollercoaster,"ARCADE_MACHINE,JUNIMO_KART", +620,JotPK World 3,Journey of the Prairie King Victory,"ARCADE_MACHINE_VICTORY,JOTPK", +621,Junimo Kart 3,Junimo Kart: Sunset Speedway (Victory),"ARCADE_MACHINE_VICTORY,JUNIMO_KART", +701,Secret Woods,Old Master Cannoli,MANDATORY, +702,Beach,Beach Bridge Repair,MANDATORY, +703,Desert,Galaxy Sword Shrine,MANDATORY, +704,Farmhouse,Have a Baby,BABY, +705,Farmhouse,Have Another Baby,BABY, +706,Farmhouse,Spouse Stardrop,, +707,Sewer,Krobus Stardrop,MANDATORY, +801,Forest,Help Wanted: Gathering 1,HELP_WANTED, +802,Forest,Help Wanted: Gathering 2,HELP_WANTED, +803,Forest,Help Wanted: Gathering 3,HELP_WANTED, +804,Forest,Help Wanted: Gathering 4,HELP_WANTED, +805,Forest,Help Wanted: Gathering 5,HELP_WANTED, +806,Forest,Help Wanted: Gathering 6,HELP_WANTED, +807,Forest,Help Wanted: Gathering 7,HELP_WANTED, +808,Forest,Help Wanted: Gathering 8,HELP_WANTED, +811,The Mines - Floor 5,Help Wanted: Slay Monsters 1,HELP_WANTED, +812,The Mines - Floor 15,Help Wanted: Slay Monsters 2,HELP_WANTED, +813,The Mines - Floor 25,Help Wanted: Slay Monsters 3,HELP_WANTED, +814,The Mines - Floor 35,Help Wanted: Slay Monsters 4,HELP_WANTED, +815,The Mines - Floor 45,Help Wanted: Slay Monsters 5,HELP_WANTED, +816,The Mines - Floor 55,Help Wanted: Slay Monsters 6,HELP_WANTED, +817,The Mines - Floor 65,Help Wanted: Slay Monsters 7,HELP_WANTED, +818,The Mines - Floor 75,Help Wanted: Slay Monsters 8,HELP_WANTED, +821,Fishing,Help Wanted: Fishing 1,HELP_WANTED, +822,Fishing,Help Wanted: Fishing 2,HELP_WANTED, +823,Fishing,Help Wanted: Fishing 3,HELP_WANTED, +824,Fishing,Help Wanted: Fishing 4,HELP_WANTED, +825,Fishing,Help Wanted: Fishing 5,HELP_WANTED, +826,Fishing,Help Wanted: Fishing 6,HELP_WANTED, +827,Fishing,Help Wanted: Fishing 7,HELP_WANTED, +828,Fishing,Help Wanted: Fishing 8,HELP_WANTED, +841,Town,Help Wanted: Item Delivery 1,HELP_WANTED, +842,Town,Help Wanted: Item Delivery 2,HELP_WANTED, +843,Town,Help Wanted: Item Delivery 3,HELP_WANTED, +844,Town,Help Wanted: Item Delivery 4,HELP_WANTED, +845,Town,Help Wanted: Item Delivery 5,HELP_WANTED, +846,Town,Help Wanted: Item Delivery 6,HELP_WANTED, +847,Town,Help Wanted: Item Delivery 7,HELP_WANTED, +848,Town,Help Wanted: Item Delivery 8,HELP_WANTED, +849,Town,Help Wanted: Item Delivery 9,HELP_WANTED, +850,Town,Help Wanted: Item Delivery 10,HELP_WANTED, +851,Town,Help Wanted: Item Delivery 11,HELP_WANTED, +852,Town,Help Wanted: Item Delivery 12,HELP_WANTED, +853,Town,Help Wanted: Item Delivery 13,HELP_WANTED, +854,Town,Help Wanted: Item Delivery 14,HELP_WANTED, +855,Town,Help Wanted: Item Delivery 15,HELP_WANTED, +856,Town,Help Wanted: Item Delivery 16,HELP_WANTED, +857,Town,Help Wanted: Item Delivery 17,HELP_WANTED, +858,Town,Help Wanted: Item Delivery 18,HELP_WANTED, +859,Town,Help Wanted: Item Delivery 19,HELP_WANTED, +860,Town,Help Wanted: Item Delivery 20,HELP_WANTED, +861,Town,Help Wanted: Item Delivery 21,HELP_WANTED, +862,Town,Help Wanted: Item Delivery 22,HELP_WANTED, +863,Town,Help Wanted: Item Delivery 23,HELP_WANTED, +864,Town,Help Wanted: Item Delivery 24,HELP_WANTED, +865,Town,Help Wanted: Item Delivery 25,HELP_WANTED, +866,Town,Help Wanted: Item Delivery 26,HELP_WANTED, +867,Town,Help Wanted: Item Delivery 27,HELP_WANTED, +868,Town,Help Wanted: Item Delivery 28,HELP_WANTED, +869,Town,Help Wanted: Item Delivery 29,HELP_WANTED, +870,Town,Help Wanted: Item Delivery 30,HELP_WANTED, +871,Town,Help Wanted: Item Delivery 31,HELP_WANTED, +872,Town,Help Wanted: Item Delivery 32,HELP_WANTED, +901,Traveling Cart Sunday,Traveling Merchant Sunday Item 1,"MANDATORY,TRAVELING_MERCHANT", +902,Traveling Cart Sunday,Traveling Merchant Sunday Item 2,"MANDATORY,TRAVELING_MERCHANT", +903,Traveling Cart Sunday,Traveling Merchant Sunday Item 3,"MANDATORY,TRAVELING_MERCHANT", +911,Traveling Cart Monday,Traveling Merchant Monday Item 1,"MANDATORY,TRAVELING_MERCHANT", +912,Traveling Cart Monday,Traveling Merchant Monday Item 2,"MANDATORY,TRAVELING_MERCHANT", +913,Traveling Cart Monday,Traveling Merchant Monday Item 3,"MANDATORY,TRAVELING_MERCHANT", +921,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 1,"MANDATORY,TRAVELING_MERCHANT", +922,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 2,"MANDATORY,TRAVELING_MERCHANT", +923,Traveling Cart Tuesday,Traveling Merchant Tuesday Item 3,"MANDATORY,TRAVELING_MERCHANT", +931,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 1,"MANDATORY,TRAVELING_MERCHANT", +932,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 2,"MANDATORY,TRAVELING_MERCHANT", +933,Traveling Cart Wednesday,Traveling Merchant Wednesday Item 3,"MANDATORY,TRAVELING_MERCHANT", +941,Traveling Cart Thursday,Traveling Merchant Thursday Item 1,"MANDATORY,TRAVELING_MERCHANT", +942,Traveling Cart Thursday,Traveling Merchant Thursday Item 2,"MANDATORY,TRAVELING_MERCHANT", +943,Traveling Cart Thursday,Traveling Merchant Thursday Item 3,"MANDATORY,TRAVELING_MERCHANT", +951,Traveling Cart Friday,Traveling Merchant Friday Item 1,"MANDATORY,TRAVELING_MERCHANT", +952,Traveling Cart Friday,Traveling Merchant Friday Item 2,"MANDATORY,TRAVELING_MERCHANT", +953,Traveling Cart Friday,Traveling Merchant Friday Item 3,"MANDATORY,TRAVELING_MERCHANT", +961,Traveling Cart Saturday,Traveling Merchant Saturday Item 1,"MANDATORY,TRAVELING_MERCHANT", +962,Traveling Cart Saturday,Traveling Merchant Saturday Item 2,"MANDATORY,TRAVELING_MERCHANT", +963,Traveling Cart Saturday,Traveling Merchant Saturday Item 3,"MANDATORY,TRAVELING_MERCHANT", +1001,Fishing,Fishsanity: Carp,FISHSANITY, +1002,Fishing,Fishsanity: Herring,FISHSANITY, +1003,Fishing,Fishsanity: Smallmouth Bass,FISHSANITY, +1004,Fishing,Fishsanity: Anchovy,FISHSANITY, +1005,Fishing,Fishsanity: Sardine,FISHSANITY, +1006,Fishing,Fishsanity: Sunfish,FISHSANITY, +1007,Fishing,Fishsanity: Perch,FISHSANITY, +1008,Fishing,Fishsanity: Chub,FISHSANITY, +1009,Fishing,Fishsanity: Bream,FISHSANITY, +1010,Fishing,Fishsanity: Red Snapper,FISHSANITY, +1011,Fishing,Fishsanity: Sea Cucumber,FISHSANITY, +1012,Fishing,Fishsanity: Rainbow Trout,FISHSANITY, +1013,Fishing,Fishsanity: Walleye,FISHSANITY, +1014,Fishing,Fishsanity: Shad,FISHSANITY, +1015,Fishing,Fishsanity: Bullhead,FISHSANITY, +1016,Fishing,Fishsanity: Largemouth Bass,FISHSANITY, +1017,Fishing,Fishsanity: Salmon,FISHSANITY, +1018,Fishing,Fishsanity: Ghostfish,FISHSANITY, +1019,Fishing,Fishsanity: Tilapia,FISHSANITY, +1020,Fishing,Fishsanity: Woodskip,FISHSANITY, +1021,Fishing,Fishsanity: Flounder,FISHSANITY, +1022,Fishing,Fishsanity: Halibut,FISHSANITY, +1023,Fishing,Fishsanity: Lionfish,"FISHSANITY,GINGER_ISLAND", +1024,Fishing,Fishsanity: Slimejack,FISHSANITY, +1025,Fishing,Fishsanity: Midnight Carp,FISHSANITY, +1026,Fishing,Fishsanity: Red Mullet,FISHSANITY, +1027,Fishing,Fishsanity: Pike,FISHSANITY, +1028,Fishing,Fishsanity: Tiger Trout,FISHSANITY, +1029,Fishing,Fishsanity: Blue Discus,"FISHSANITY,GINGER_ISLAND", +1030,Fishing,Fishsanity: Albacore,FISHSANITY, +1031,Fishing,Fishsanity: Sandfish,FISHSANITY, +1032,Fishing,Fishsanity: Stonefish,FISHSANITY, +1033,Fishing,Fishsanity: Tuna,FISHSANITY, +1034,Fishing,Fishsanity: Eel,FISHSANITY, +1035,Fishing,Fishsanity: Catfish,FISHSANITY, +1036,Fishing,Fishsanity: Squid,FISHSANITY, +1037,Fishing,Fishsanity: Sturgeon,FISHSANITY, +1038,Fishing,Fishsanity: Dorado,FISHSANITY, +1039,Fishing,Fishsanity: Pufferfish,FISHSANITY, +1040,Fishing,Fishsanity: Void Salmon,FISHSANITY, +1041,Fishing,Fishsanity: Super Cucumber,FISHSANITY, +1042,Fishing,Fishsanity: Stingray,"FISHSANITY,GINGER_ISLAND", +1043,Fishing,Fishsanity: Ice Pip,FISHSANITY, +1044,Fishing,Fishsanity: Lingcod,FISHSANITY, +1045,Desert,Fishsanity: Scorpion Carp,FISHSANITY, +1046,Fishing,Fishsanity: Lava Eel,FISHSANITY, +1047,Fishing,Fishsanity: Octopus,FISHSANITY, +1048,Fishing,Fishsanity: Midnight Squid,FISHSANITY, +1049,Fishing,Fishsanity: Spook Fish,FISHSANITY, +1050,Fishing,Fishsanity: Blobfish,FISHSANITY, +1051,Fishing,Fishsanity: Crimsonfish,FISHSANITY, +1052,Fishing,Fishsanity: Angler,FISHSANITY, +1053,Fishing,Fishsanity: Legend,FISHSANITY, +1054,Fishing,Fishsanity: Glacierfish,FISHSANITY, +1055,Fishing,Fishsanity: Mutant Carp,FISHSANITY, +1056,Town,Fishsanity: Crayfish,FISHSANITY, +1057,Town,Fishsanity: Snail,FISHSANITY, +1058,Town,Fishsanity: Periwinkle,FISHSANITY, +1059,Beach,Fishsanity: Lobster,FISHSANITY, +1060,Beach,Fishsanity: Clam,FISHSANITY, +1061,Beach,Fishsanity: Crab,FISHSANITY, +1062,Beach,Fishsanity: Cockle,FISHSANITY, +1063,Beach,Fishsanity: Mussel,FISHSANITY, +1064,Beach,Fishsanity: Shrimp,FISHSANITY, +1065,Beach,Fishsanity: Oyster,FISHSANITY, +1066,Beach,Fishsanity: Son of Crimsonfish,"FISHSANITY,GINGER_ISLAND,REQUIRES_QI_ORDERS", +1067,Beach,Fishsanity: Glacierfish Jr.,"FISHSANITY,GINGER_ISLAND,REQUIRES_QI_ORDERS", +1068,Beach,Fishsanity: Legend II,"FISHSANITY,GINGER_ISLAND,REQUIRES_QI_ORDERS", +1069,Beach,Fishsanity: Ms. Angler,"FISHSANITY,GINGER_ISLAND,REQUIRES_QI_ORDERS", +1070,Beach,Fishsanity: Radioactive Carp,"FISHSANITY,GINGER_ISLAND,REQUIRES_QI_ORDERS", +1100,Museum,Museumsanity: 5 Donations,MUSEUM_MILESTONES, +1101,Museum,Museumsanity: 10 Donations,MUSEUM_MILESTONES, +1102,Museum,Museumsanity: 15 Donations,MUSEUM_MILESTONES, +1103,Museum,Museumsanity: 20 Donations,MUSEUM_MILESTONES, +1104,Museum,Museumsanity: 25 Donations,MUSEUM_MILESTONES, +1105,Museum,Museumsanity: 30 Donations,MUSEUM_MILESTONES, +1106,Museum,Museumsanity: 35 Donations,MUSEUM_MILESTONES, +1107,Museum,Museumsanity: 40 Donations,MUSEUM_MILESTONES, +1108,Museum,Museumsanity: 50 Donations,MUSEUM_MILESTONES, +1109,Museum,Museumsanity: 60 Donations,MUSEUM_MILESTONES, +1110,Museum,Museumsanity: 70 Donations,MUSEUM_MILESTONES, +1111,Museum,Museumsanity: 80 Donations,MUSEUM_MILESTONES, +1112,Museum,Museumsanity: 90 Donations,MUSEUM_MILESTONES, +1113,Museum,Museumsanity: 95 Donations,MUSEUM_MILESTONES, +1114,Museum,Museumsanity: 11 Minerals,MUSEUM_MILESTONES, +1115,Museum,Museumsanity: 21 Minerals,MUSEUM_MILESTONES, +1116,Museum,Museumsanity: 31 Minerals,MUSEUM_MILESTONES, +1117,Museum,Museumsanity: 41 Minerals,MUSEUM_MILESTONES, +1118,Museum,Museumsanity: 50 Minerals,MUSEUM_MILESTONES, +1119,Museum,Museumsanity: 3 Artifacts,MUSEUM_MILESTONES, +1120,Museum,Museumsanity: 6 Artifacts,MUSEUM_MILESTONES, +1121,Museum,Museumsanity: 9 Artifacts,MUSEUM_MILESTONES, +1122,Museum,Museumsanity: 11 Artifacts,MUSEUM_MILESTONES, +1123,Museum,Museumsanity: 15 Artifacts,MUSEUM_MILESTONES, +1124,Museum,Museumsanity: 20 Artifacts,MUSEUM_MILESTONES, +1125,Museum,Museumsanity: Dwarf Scrolls,MUSEUM_MILESTONES, +1126,Museum,Museumsanity: Skeleton Front,MUSEUM_MILESTONES, +1127,Museum,Museumsanity: Skeleton Middle,MUSEUM_MILESTONES, +1128,Museum,Museumsanity: Skeleton Back,MUSEUM_MILESTONES, +1201,Museum,Museumsanity: Dwarf Scroll I,MUSEUM_DONATIONS, +1202,Museum,Museumsanity: Dwarf Scroll II,MUSEUM_DONATIONS, +1203,Museum,Museumsanity: Dwarf Scroll III,MUSEUM_DONATIONS, +1204,Museum,Museumsanity: Dwarf Scroll IV,MUSEUM_DONATIONS, +1205,Museum,Museumsanity: Chipped Amphora,MUSEUM_DONATIONS, +1206,Museum,Museumsanity: Arrowhead,MUSEUM_DONATIONS, +1207,Museum,Museumsanity: Ancient Doll,MUSEUM_DONATIONS, +1208,Museum,Museumsanity: Elvish Jewelry,MUSEUM_DONATIONS, +1209,Museum,Museumsanity: Chewing Stick,MUSEUM_DONATIONS, +1210,Museum,Museumsanity: Ornamental Fan,MUSEUM_DONATIONS, +1211,Museum,Museumsanity: Dinosaur Egg,MUSEUM_DONATIONS, +1212,Museum,Museumsanity: Rare Disc,MUSEUM_DONATIONS, +1213,Museum,Museumsanity: Ancient Sword,MUSEUM_DONATIONS, +1214,Museum,Museumsanity: Rusty Spoon,MUSEUM_DONATIONS, +1215,Museum,Museumsanity: Rusty Spur,MUSEUM_DONATIONS, +1216,Museum,Museumsanity: Rusty Cog,MUSEUM_DONATIONS, +1217,Museum,Museumsanity: Chicken Statue,MUSEUM_DONATIONS, +1218,Museum,Museumsanity: Ancient Seed,"MUSEUM_DONATIONS,MUSEUM_MILESTONES", +1219,Museum,Museumsanity: Prehistoric Tool,MUSEUM_DONATIONS, +1220,Museum,Museumsanity: Dried Starfish,MUSEUM_DONATIONS, +1221,Museum,Museumsanity: Anchor,MUSEUM_DONATIONS, +1222,Museum,Museumsanity: Glass Shards,MUSEUM_DONATIONS, +1223,Museum,Museumsanity: Bone Flute,MUSEUM_DONATIONS, +1224,Museum,Museumsanity: Prehistoric Handaxe,MUSEUM_DONATIONS, +1225,Museum,Museumsanity: Dwarvish Helm,MUSEUM_DONATIONS, +1226,Museum,Museumsanity: Dwarf Gadget,MUSEUM_DONATIONS, +1227,Museum,Museumsanity: Ancient Drum,MUSEUM_DONATIONS, +1228,Museum,Museumsanity: Golden Mask,MUSEUM_DONATIONS, +1229,Museum,Museumsanity: Golden Relic,MUSEUM_DONATIONS, +1230,Museum,Museumsanity: Strange Doll (Green),MUSEUM_DONATIONS, +1231,Museum,Museumsanity: Strange Doll,MUSEUM_DONATIONS, +1232,Museum,Museumsanity: Prehistoric Scapula,MUSEUM_DONATIONS, +1233,Museum,Museumsanity: Prehistoric Tibia,MUSEUM_DONATIONS, +1234,Museum,Museumsanity: Prehistoric Skull,MUSEUM_DONATIONS, +1235,Museum,Museumsanity: Skeletal Hand,MUSEUM_DONATIONS, +1236,Museum,Museumsanity: Prehistoric Rib,MUSEUM_DONATIONS, +1237,Museum,Museumsanity: Prehistoric Vertebra,MUSEUM_DONATIONS, +1238,Museum,Museumsanity: Skeletal Tail,MUSEUM_DONATIONS, +1239,Museum,Museumsanity: Nautilus Fossil,MUSEUM_DONATIONS, +1240,Museum,Museumsanity: Amphibian Fossil,MUSEUM_DONATIONS, +1241,Museum,Museumsanity: Palm Fossil,MUSEUM_DONATIONS, +1242,Museum,Museumsanity: Trilobite,MUSEUM_DONATIONS, +1243,Museum,Museumsanity: Quartz,MUSEUM_DONATIONS, +1244,Museum,Museumsanity: Fire Quartz,MUSEUM_DONATIONS, +1245,Museum,Museumsanity: Frozen Tear,MUSEUM_DONATIONS, +1246,Museum,Museumsanity: Earth Crystal,MUSEUM_DONATIONS, +1247,Museum,Museumsanity: Emerald,MUSEUM_DONATIONS, +1248,Museum,Museumsanity: Aquamarine,MUSEUM_DONATIONS, +1249,Museum,Museumsanity: Ruby,MUSEUM_DONATIONS, +1250,Museum,Museumsanity: Amethyst,MUSEUM_DONATIONS, +1251,Museum,Museumsanity: Topaz,MUSEUM_DONATIONS, +1252,Museum,Museumsanity: Jade,MUSEUM_DONATIONS, +1253,Museum,Museumsanity: Diamond,MUSEUM_DONATIONS, +1254,Museum,Museumsanity: Prismatic Shard,MUSEUM_DONATIONS, +1255,Museum,Museumsanity: Alamite,MUSEUM_DONATIONS, +1256,Museum,Museumsanity: Bixite,MUSEUM_DONATIONS, +1257,Museum,Museumsanity: Baryte,MUSEUM_DONATIONS, +1258,Museum,Museumsanity: Aerinite,MUSEUM_DONATIONS, +1259,Museum,Museumsanity: Calcite,MUSEUM_DONATIONS, +1260,Museum,Museumsanity: Dolomite,MUSEUM_DONATIONS, +1261,Museum,Museumsanity: Esperite,MUSEUM_DONATIONS, +1262,Museum,Museumsanity: Fluorapatite,MUSEUM_DONATIONS, +1263,Museum,Museumsanity: Geminite,MUSEUM_DONATIONS, +1264,Museum,Museumsanity: Helvite,MUSEUM_DONATIONS, +1265,Museum,Museumsanity: Jamborite,MUSEUM_DONATIONS, +1266,Museum,Museumsanity: Jagoite,MUSEUM_DONATIONS, +1267,Museum,Museumsanity: Kyanite,MUSEUM_DONATIONS, +1268,Museum,Museumsanity: Lunarite,MUSEUM_DONATIONS, +1269,Museum,Museumsanity: Malachite,MUSEUM_DONATIONS, +1270,Museum,Museumsanity: Neptunite,MUSEUM_DONATIONS, +1271,Museum,Museumsanity: Lemon Stone,MUSEUM_DONATIONS, +1272,Museum,Museumsanity: Nekoite,MUSEUM_DONATIONS, +1273,Museum,Museumsanity: Orpiment,MUSEUM_DONATIONS, +1274,Museum,Museumsanity: Petrified Slime,MUSEUM_DONATIONS, +1275,Museum,Museumsanity: Thunder Egg,MUSEUM_DONATIONS, +1276,Museum,Museumsanity: Pyrite,MUSEUM_DONATIONS, +1277,Museum,Museumsanity: Ocean Stone,MUSEUM_DONATIONS, +1278,Museum,Museumsanity: Ghost Crystal,MUSEUM_DONATIONS, +1279,Museum,Museumsanity: Tigerseye,MUSEUM_DONATIONS, +1280,Museum,Museumsanity: Jasper,MUSEUM_DONATIONS, +1281,Museum,Museumsanity: Opal,MUSEUM_DONATIONS, +1282,Museum,Museumsanity: Fire Opal,MUSEUM_DONATIONS, +1283,Museum,Museumsanity: Celestine,MUSEUM_DONATIONS, +1284,Museum,Museumsanity: Marble,MUSEUM_DONATIONS, +1285,Museum,Museumsanity: Sandstone,MUSEUM_DONATIONS, +1286,Museum,Museumsanity: Granite,MUSEUM_DONATIONS, +1287,Museum,Museumsanity: Basalt,MUSEUM_DONATIONS, +1288,Museum,Museumsanity: Limestone,MUSEUM_DONATIONS, +1289,Museum,Museumsanity: Soapstone,MUSEUM_DONATIONS, +1290,Museum,Museumsanity: Hematite,MUSEUM_DONATIONS, +1291,Museum,Museumsanity: Mudstone,MUSEUM_DONATIONS, +1292,Museum,Museumsanity: Obsidian,MUSEUM_DONATIONS, +1293,Museum,Museumsanity: Slate,MUSEUM_DONATIONS, +1294,Museum,Museumsanity: Fairy Stone,MUSEUM_DONATIONS, +1295,Museum,Museumsanity: Star Shards,MUSEUM_DONATIONS, +1301,Alex's House,Friendsanity: Alex 1 <3,FRIENDSANITY, +1302,Alex's House,Friendsanity: Alex 2 <3,FRIENDSANITY, +1303,Alex's House,Friendsanity: Alex 3 <3,FRIENDSANITY, +1304,Alex's House,Friendsanity: Alex 4 <3,FRIENDSANITY, +1305,Alex's House,Friendsanity: Alex 5 <3,FRIENDSANITY, +1306,Alex's House,Friendsanity: Alex 6 <3,FRIENDSANITY, +1307,Alex's House,Friendsanity: Alex 7 <3,FRIENDSANITY, +1308,Alex's House,Friendsanity: Alex 8 <3,FRIENDSANITY, +1309,Alex's House,Friendsanity: Alex 9 <3,FRIENDSANITY, +1310,Alex's House,Friendsanity: Alex 10 <3,FRIENDSANITY, +1311,Alex's House,Friendsanity: Alex 11 <3,FRIENDSANITY, +1312,Alex's House,Friendsanity: Alex 12 <3,FRIENDSANITY, +1313,Alex's House,Friendsanity: Alex 13 <3,FRIENDSANITY, +1314,Alex's House,Friendsanity: Alex 14 <3,FRIENDSANITY, +1315,Elliott's House,Friendsanity: Elliott 1 <3,FRIENDSANITY, +1316,Elliott's House,Friendsanity: Elliott 2 <3,FRIENDSANITY, +1317,Elliott's House,Friendsanity: Elliott 3 <3,FRIENDSANITY, +1318,Elliott's House,Friendsanity: Elliott 4 <3,FRIENDSANITY, +1319,Elliott's House,Friendsanity: Elliott 5 <3,FRIENDSANITY, +1320,Elliott's House,Friendsanity: Elliott 6 <3,FRIENDSANITY, +1321,Elliott's House,Friendsanity: Elliott 7 <3,FRIENDSANITY, +1322,Elliott's House,Friendsanity: Elliott 8 <3,FRIENDSANITY, +1323,Elliott's House,Friendsanity: Elliott 9 <3,FRIENDSANITY, +1324,Elliott's House,Friendsanity: Elliott 10 <3,FRIENDSANITY, +1325,Elliott's House,Friendsanity: Elliott 11 <3,FRIENDSANITY, +1326,Elliott's House,Friendsanity: Elliott 12 <3,FRIENDSANITY, +1327,Elliott's House,Friendsanity: Elliott 13 <3,FRIENDSANITY, +1328,Elliott's House,Friendsanity: Elliott 14 <3,FRIENDSANITY, +1329,Hospital,Friendsanity: Harvey 1 <3,FRIENDSANITY, +1330,Hospital,Friendsanity: Harvey 2 <3,FRIENDSANITY, +1331,Hospital,Friendsanity: Harvey 3 <3,FRIENDSANITY, +1332,Hospital,Friendsanity: Harvey 4 <3,FRIENDSANITY, +1333,Hospital,Friendsanity: Harvey 5 <3,FRIENDSANITY, +1334,Hospital,Friendsanity: Harvey 6 <3,FRIENDSANITY, +1335,Hospital,Friendsanity: Harvey 7 <3,FRIENDSANITY, +1336,Hospital,Friendsanity: Harvey 8 <3,FRIENDSANITY, +1337,Hospital,Friendsanity: Harvey 9 <3,FRIENDSANITY, +1338,Hospital,Friendsanity: Harvey 10 <3,FRIENDSANITY, +1339,Hospital,Friendsanity: Harvey 11 <3,FRIENDSANITY, +1340,Hospital,Friendsanity: Harvey 12 <3,FRIENDSANITY, +1341,Hospital,Friendsanity: Harvey 13 <3,FRIENDSANITY, +1342,Hospital,Friendsanity: Harvey 14 <3,FRIENDSANITY, +1343,Sam's House,Friendsanity: Sam 1 <3,FRIENDSANITY, +1344,Sam's House,Friendsanity: Sam 2 <3,FRIENDSANITY, +1345,Sam's House,Friendsanity: Sam 3 <3,FRIENDSANITY, +1346,Sam's House,Friendsanity: Sam 4 <3,FRIENDSANITY, +1347,Sam's House,Friendsanity: Sam 5 <3,FRIENDSANITY, +1348,Sam's House,Friendsanity: Sam 6 <3,FRIENDSANITY, +1349,Sam's House,Friendsanity: Sam 7 <3,FRIENDSANITY, +1350,Sam's House,Friendsanity: Sam 8 <3,FRIENDSANITY, +1351,Sam's House,Friendsanity: Sam 9 <3,FRIENDSANITY, +1352,Sam's House,Friendsanity: Sam 10 <3,FRIENDSANITY, +1353,Sam's House,Friendsanity: Sam 11 <3,FRIENDSANITY, +1354,Sam's House,Friendsanity: Sam 12 <3,FRIENDSANITY, +1355,Sam's House,Friendsanity: Sam 13 <3,FRIENDSANITY, +1356,Sam's House,Friendsanity: Sam 14 <3,FRIENDSANITY, +1357,Carpenter Shop,Friendsanity: Sebastian 1 <3,FRIENDSANITY, +1358,Carpenter Shop,Friendsanity: Sebastian 2 <3,FRIENDSANITY, +1359,Carpenter Shop,Friendsanity: Sebastian 3 <3,FRIENDSANITY, +1360,Carpenter Shop,Friendsanity: Sebastian 4 <3,FRIENDSANITY, +1361,Carpenter Shop,Friendsanity: Sebastian 5 <3,FRIENDSANITY, +1362,Carpenter Shop,Friendsanity: Sebastian 6 <3,FRIENDSANITY, +1363,Carpenter Shop,Friendsanity: Sebastian 7 <3,FRIENDSANITY, +1364,Carpenter Shop,Friendsanity: Sebastian 8 <3,FRIENDSANITY, +1365,Carpenter Shop,Friendsanity: Sebastian 9 <3,FRIENDSANITY, +1366,Carpenter Shop,Friendsanity: Sebastian 10 <3,FRIENDSANITY, +1367,Carpenter Shop,Friendsanity: Sebastian 11 <3,FRIENDSANITY, +1368,Carpenter Shop,Friendsanity: Sebastian 12 <3,FRIENDSANITY, +1369,Carpenter Shop,Friendsanity: Sebastian 13 <3,FRIENDSANITY, +1370,Carpenter Shop,Friendsanity: Sebastian 14 <3,FRIENDSANITY, +1371,Marnie's Ranch,Friendsanity: Shane 1 <3,FRIENDSANITY, +1372,Marnie's Ranch,Friendsanity: Shane 2 <3,FRIENDSANITY, +1373,Marnie's Ranch,Friendsanity: Shane 3 <3,FRIENDSANITY, +1374,Marnie's Ranch,Friendsanity: Shane 4 <3,FRIENDSANITY, +1375,Marnie's Ranch,Friendsanity: Shane 5 <3,FRIENDSANITY, +1376,Marnie's Ranch,Friendsanity: Shane 6 <3,FRIENDSANITY, +1377,Marnie's Ranch,Friendsanity: Shane 7 <3,FRIENDSANITY, +1378,Marnie's Ranch,Friendsanity: Shane 8 <3,FRIENDSANITY, +1379,Marnie's Ranch,Friendsanity: Shane 9 <3,FRIENDSANITY, +1380,Marnie's Ranch,Friendsanity: Shane 10 <3,FRIENDSANITY, +1381,Marnie's Ranch,Friendsanity: Shane 11 <3,FRIENDSANITY, +1382,Marnie's Ranch,Friendsanity: Shane 12 <3,FRIENDSANITY, +1383,Marnie's Ranch,Friendsanity: Shane 13 <3,FRIENDSANITY, +1384,Marnie's Ranch,Friendsanity: Shane 14 <3,FRIENDSANITY, +1385,Pierre's General Store,Friendsanity: Abigail 1 <3,FRIENDSANITY, +1386,Pierre's General Store,Friendsanity: Abigail 2 <3,FRIENDSANITY, +1387,Pierre's General Store,Friendsanity: Abigail 3 <3,FRIENDSANITY, +1388,Pierre's General Store,Friendsanity: Abigail 4 <3,FRIENDSANITY, +1389,Pierre's General Store,Friendsanity: Abigail 5 <3,FRIENDSANITY, +1390,Pierre's General Store,Friendsanity: Abigail 6 <3,FRIENDSANITY, +1391,Pierre's General Store,Friendsanity: Abigail 7 <3,FRIENDSANITY, +1392,Pierre's General Store,Friendsanity: Abigail 8 <3,FRIENDSANITY, +1393,Pierre's General Store,Friendsanity: Abigail 9 <3,FRIENDSANITY, +1394,Pierre's General Store,Friendsanity: Abigail 10 <3,FRIENDSANITY, +1395,Pierre's General Store,Friendsanity: Abigail 11 <3,FRIENDSANITY, +1396,Pierre's General Store,Friendsanity: Abigail 12 <3,FRIENDSANITY, +1397,Pierre's General Store,Friendsanity: Abigail 13 <3,FRIENDSANITY, +1398,Pierre's General Store,Friendsanity: Abigail 14 <3,FRIENDSANITY, +1399,Haley's House,Friendsanity: Emily 1 <3,FRIENDSANITY, +1400,Haley's House,Friendsanity: Emily 2 <3,FRIENDSANITY, +1401,Haley's House,Friendsanity: Emily 3 <3,FRIENDSANITY, +1402,Haley's House,Friendsanity: Emily 4 <3,FRIENDSANITY, +1403,Haley's House,Friendsanity: Emily 5 <3,FRIENDSANITY, +1404,Haley's House,Friendsanity: Emily 6 <3,FRIENDSANITY, +1405,Haley's House,Friendsanity: Emily 7 <3,FRIENDSANITY, +1406,Haley's House,Friendsanity: Emily 8 <3,FRIENDSANITY, +1407,Haley's House,Friendsanity: Emily 9 <3,FRIENDSANITY, +1408,Haley's House,Friendsanity: Emily 10 <3,FRIENDSANITY, +1409,Haley's House,Friendsanity: Emily 11 <3,FRIENDSANITY, +1410,Haley's House,Friendsanity: Emily 12 <3,FRIENDSANITY, +1411,Haley's House,Friendsanity: Emily 13 <3,FRIENDSANITY, +1412,Haley's House,Friendsanity: Emily 14 <3,FRIENDSANITY, +1413,Haley's House,Friendsanity: Haley 1 <3,FRIENDSANITY, +1414,Haley's House,Friendsanity: Haley 2 <3,FRIENDSANITY, +1415,Haley's House,Friendsanity: Haley 3 <3,FRIENDSANITY, +1416,Haley's House,Friendsanity: Haley 4 <3,FRIENDSANITY, +1417,Haley's House,Friendsanity: Haley 5 <3,FRIENDSANITY, +1418,Haley's House,Friendsanity: Haley 6 <3,FRIENDSANITY, +1419,Haley's House,Friendsanity: Haley 7 <3,FRIENDSANITY, +1420,Haley's House,Friendsanity: Haley 8 <3,FRIENDSANITY, +1421,Haley's House,Friendsanity: Haley 9 <3,FRIENDSANITY, +1422,Haley's House,Friendsanity: Haley 10 <3,FRIENDSANITY, +1423,Haley's House,Friendsanity: Haley 11 <3,FRIENDSANITY, +1424,Haley's House,Friendsanity: Haley 12 <3,FRIENDSANITY, +1425,Haley's House,Friendsanity: Haley 13 <3,FRIENDSANITY, +1426,Haley's House,Friendsanity: Haley 14 <3,FRIENDSANITY, +1427,Leah's Cottage,Friendsanity: Leah 1 <3,FRIENDSANITY, +1428,Leah's Cottage,Friendsanity: Leah 2 <3,FRIENDSANITY, +1429,Leah's Cottage,Friendsanity: Leah 3 <3,FRIENDSANITY, +1430,Leah's Cottage,Friendsanity: Leah 4 <3,FRIENDSANITY, +1431,Leah's Cottage,Friendsanity: Leah 5 <3,FRIENDSANITY, +1432,Leah's Cottage,Friendsanity: Leah 6 <3,FRIENDSANITY, +1433,Leah's Cottage,Friendsanity: Leah 7 <3,FRIENDSANITY, +1434,Leah's Cottage,Friendsanity: Leah 8 <3,FRIENDSANITY, +1435,Leah's Cottage,Friendsanity: Leah 9 <3,FRIENDSANITY, +1436,Leah's Cottage,Friendsanity: Leah 10 <3,FRIENDSANITY, +1437,Leah's Cottage,Friendsanity: Leah 11 <3,FRIENDSANITY, +1438,Leah's Cottage,Friendsanity: Leah 12 <3,FRIENDSANITY, +1439,Leah's Cottage,Friendsanity: Leah 13 <3,FRIENDSANITY, +1440,Leah's Cottage,Friendsanity: Leah 14 <3,FRIENDSANITY, +1441,Carpenter Shop,Friendsanity: Maru 1 <3,FRIENDSANITY, +1442,Carpenter Shop,Friendsanity: Maru 2 <3,FRIENDSANITY, +1443,Carpenter Shop,Friendsanity: Maru 3 <3,FRIENDSANITY, +1444,Carpenter Shop,Friendsanity: Maru 4 <3,FRIENDSANITY, +1445,Carpenter Shop,Friendsanity: Maru 5 <3,FRIENDSANITY, +1446,Carpenter Shop,Friendsanity: Maru 6 <3,FRIENDSANITY, +1447,Carpenter Shop,Friendsanity: Maru 7 <3,FRIENDSANITY, +1448,Carpenter Shop,Friendsanity: Maru 8 <3,FRIENDSANITY, +1449,Carpenter Shop,Friendsanity: Maru 9 <3,FRIENDSANITY, +1450,Carpenter Shop,Friendsanity: Maru 10 <3,FRIENDSANITY, +1451,Carpenter Shop,Friendsanity: Maru 11 <3,FRIENDSANITY, +1452,Carpenter Shop,Friendsanity: Maru 12 <3,FRIENDSANITY, +1453,Carpenter Shop,Friendsanity: Maru 13 <3,FRIENDSANITY, +1454,Carpenter Shop,Friendsanity: Maru 14 <3,FRIENDSANITY, +1455,Trailer,Friendsanity: Penny 1 <3,FRIENDSANITY, +1456,Trailer,Friendsanity: Penny 2 <3,FRIENDSANITY, +1457,Trailer,Friendsanity: Penny 3 <3,FRIENDSANITY, +1458,Trailer,Friendsanity: Penny 4 <3,FRIENDSANITY, +1459,Trailer,Friendsanity: Penny 5 <3,FRIENDSANITY, +1460,Trailer,Friendsanity: Penny 6 <3,FRIENDSANITY, +1461,Trailer,Friendsanity: Penny 7 <3,FRIENDSANITY, +1462,Trailer,Friendsanity: Penny 8 <3,FRIENDSANITY, +1463,Trailer,Friendsanity: Penny 9 <3,FRIENDSANITY, +1464,Trailer,Friendsanity: Penny 10 <3,FRIENDSANITY, +1465,Trailer,Friendsanity: Penny 11 <3,FRIENDSANITY, +1466,Trailer,Friendsanity: Penny 12 <3,FRIENDSANITY, +1467,Trailer,Friendsanity: Penny 13 <3,FRIENDSANITY, +1468,Trailer,Friendsanity: Penny 14 <3,FRIENDSANITY, +1469,Pierre's General Store,Friendsanity: Caroline 1 <3,FRIENDSANITY, +1470,Pierre's General Store,Friendsanity: Caroline 2 <3,FRIENDSANITY, +1471,Pierre's General Store,Friendsanity: Caroline 3 <3,FRIENDSANITY, +1472,Pierre's General Store,Friendsanity: Caroline 4 <3,FRIENDSANITY, +1473,Pierre's General Store,Friendsanity: Caroline 5 <3,FRIENDSANITY, +1474,Pierre's General Store,Friendsanity: Caroline 6 <3,FRIENDSANITY, +1475,Pierre's General Store,Friendsanity: Caroline 7 <3,FRIENDSANITY, +1476,Pierre's General Store,Friendsanity: Caroline 8 <3,FRIENDSANITY, +1477,Pierre's General Store,Friendsanity: Caroline 9 <3,FRIENDSANITY, +1478,Pierre's General Store,Friendsanity: Caroline 10 <3,FRIENDSANITY, +1480,Clint's Blacksmith,Friendsanity: Clint 1 <3,FRIENDSANITY, +1481,Clint's Blacksmith,Friendsanity: Clint 2 <3,FRIENDSANITY, +1482,Clint's Blacksmith,Friendsanity: Clint 3 <3,FRIENDSANITY, +1483,Clint's Blacksmith,Friendsanity: Clint 4 <3,FRIENDSANITY, +1484,Clint's Blacksmith,Friendsanity: Clint 5 <3,FRIENDSANITY, +1485,Clint's Blacksmith,Friendsanity: Clint 6 <3,FRIENDSANITY, +1486,Clint's Blacksmith,Friendsanity: Clint 7 <3,FRIENDSANITY, +1487,Clint's Blacksmith,Friendsanity: Clint 8 <3,FRIENDSANITY, +1488,Clint's Blacksmith,Friendsanity: Clint 9 <3,FRIENDSANITY, +1489,Clint's Blacksmith,Friendsanity: Clint 10 <3,FRIENDSANITY, +1491,Carpenter Shop,Friendsanity: Demetrius 1 <3,FRIENDSANITY, +1492,Carpenter Shop,Friendsanity: Demetrius 2 <3,FRIENDSANITY, +1493,Carpenter Shop,Friendsanity: Demetrius 3 <3,FRIENDSANITY, +1494,Carpenter Shop,Friendsanity: Demetrius 4 <3,FRIENDSANITY, +1495,Carpenter Shop,Friendsanity: Demetrius 5 <3,FRIENDSANITY, +1496,Carpenter Shop,Friendsanity: Demetrius 6 <3,FRIENDSANITY, +1497,Carpenter Shop,Friendsanity: Demetrius 7 <3,FRIENDSANITY, +1498,Carpenter Shop,Friendsanity: Demetrius 8 <3,FRIENDSANITY, +1499,Carpenter Shop,Friendsanity: Demetrius 9 <3,FRIENDSANITY, +1500,Carpenter Shop,Friendsanity: Demetrius 10 <3,FRIENDSANITY, +1502,Mines Dwarf Shop,Friendsanity: Dwarf 1 <3,FRIENDSANITY, +1503,Mines Dwarf Shop,Friendsanity: Dwarf 2 <3,FRIENDSANITY, +1504,Mines Dwarf Shop,Friendsanity: Dwarf 3 <3,FRIENDSANITY, +1505,Mines Dwarf Shop,Friendsanity: Dwarf 4 <3,FRIENDSANITY, +1506,Mines Dwarf Shop,Friendsanity: Dwarf 5 <3,FRIENDSANITY, +1507,Mines Dwarf Shop,Friendsanity: Dwarf 6 <3,FRIENDSANITY, +1508,Mines Dwarf Shop,Friendsanity: Dwarf 7 <3,FRIENDSANITY, +1509,Mines Dwarf Shop,Friendsanity: Dwarf 8 <3,FRIENDSANITY, +1510,Mines Dwarf Shop,Friendsanity: Dwarf 9 <3,FRIENDSANITY, +1511,Mines Dwarf Shop,Friendsanity: Dwarf 10 <3,FRIENDSANITY, +1513,Alex's House,Friendsanity: Evelyn 1 <3,FRIENDSANITY, +1514,Alex's House,Friendsanity: Evelyn 2 <3,FRIENDSANITY, +1515,Alex's House,Friendsanity: Evelyn 3 <3,FRIENDSANITY, +1516,Alex's House,Friendsanity: Evelyn 4 <3,FRIENDSANITY, +1517,Alex's House,Friendsanity: Evelyn 5 <3,FRIENDSANITY, +1518,Alex's House,Friendsanity: Evelyn 6 <3,FRIENDSANITY, +1519,Alex's House,Friendsanity: Evelyn 7 <3,FRIENDSANITY, +1520,Alex's House,Friendsanity: Evelyn 8 <3,FRIENDSANITY, +1521,Alex's House,Friendsanity: Evelyn 9 <3,FRIENDSANITY, +1522,Alex's House,Friendsanity: Evelyn 10 <3,FRIENDSANITY, +1524,Alex's House,Friendsanity: George 1 <3,FRIENDSANITY, +1525,Alex's House,Friendsanity: George 2 <3,FRIENDSANITY, +1526,Alex's House,Friendsanity: George 3 <3,FRIENDSANITY, +1527,Alex's House,Friendsanity: George 4 <3,FRIENDSANITY, +1528,Alex's House,Friendsanity: George 5 <3,FRIENDSANITY, +1529,Alex's House,Friendsanity: George 6 <3,FRIENDSANITY, +1530,Alex's House,Friendsanity: George 7 <3,FRIENDSANITY, +1531,Alex's House,Friendsanity: George 8 <3,FRIENDSANITY, +1532,Alex's House,Friendsanity: George 9 <3,FRIENDSANITY, +1533,Alex's House,Friendsanity: George 10 <3,FRIENDSANITY, +1535,Saloon,Friendsanity: Gus 1 <3,FRIENDSANITY, +1536,Saloon,Friendsanity: Gus 2 <3,FRIENDSANITY, +1537,Saloon,Friendsanity: Gus 3 <3,FRIENDSANITY, +1538,Saloon,Friendsanity: Gus 4 <3,FRIENDSANITY, +1539,Saloon,Friendsanity: Gus 5 <3,FRIENDSANITY, +1540,Saloon,Friendsanity: Gus 6 <3,FRIENDSANITY, +1541,Saloon,Friendsanity: Gus 7 <3,FRIENDSANITY, +1542,Saloon,Friendsanity: Gus 8 <3,FRIENDSANITY, +1543,Saloon,Friendsanity: Gus 9 <3,FRIENDSANITY, +1544,Saloon,Friendsanity: Gus 10 <3,FRIENDSANITY, +1546,Marnie's Ranch,Friendsanity: Jas 1 <3,FRIENDSANITY, +1547,Marnie's Ranch,Friendsanity: Jas 2 <3,FRIENDSANITY, +1548,Marnie's Ranch,Friendsanity: Jas 3 <3,FRIENDSANITY, +1549,Marnie's Ranch,Friendsanity: Jas 4 <3,FRIENDSANITY, +1550,Marnie's Ranch,Friendsanity: Jas 5 <3,FRIENDSANITY, +1551,Marnie's Ranch,Friendsanity: Jas 6 <3,FRIENDSANITY, +1552,Marnie's Ranch,Friendsanity: Jas 7 <3,FRIENDSANITY, +1553,Marnie's Ranch,Friendsanity: Jas 8 <3,FRIENDSANITY, +1554,Marnie's Ranch,Friendsanity: Jas 9 <3,FRIENDSANITY, +1555,Marnie's Ranch,Friendsanity: Jas 10 <3,FRIENDSANITY, +1557,Sam's House,Friendsanity: Jodi 1 <3,FRIENDSANITY, +1558,Sam's House,Friendsanity: Jodi 2 <3,FRIENDSANITY, +1559,Sam's House,Friendsanity: Jodi 3 <3,FRIENDSANITY, +1560,Sam's House,Friendsanity: Jodi 4 <3,FRIENDSANITY, +1561,Sam's House,Friendsanity: Jodi 5 <3,FRIENDSANITY, +1562,Sam's House,Friendsanity: Jodi 6 <3,FRIENDSANITY, +1563,Sam's House,Friendsanity: Jodi 7 <3,FRIENDSANITY, +1564,Sam's House,Friendsanity: Jodi 8 <3,FRIENDSANITY, +1565,Sam's House,Friendsanity: Jodi 9 <3,FRIENDSANITY, +1566,Sam's House,Friendsanity: Jodi 10 <3,FRIENDSANITY, +1568,Sam's House,Friendsanity: Kent 1 <3,FRIENDSANITY, +1569,Sam's House,Friendsanity: Kent 2 <3,FRIENDSANITY, +1570,Sam's House,Friendsanity: Kent 3 <3,FRIENDSANITY, +1571,Sam's House,Friendsanity: Kent 4 <3,FRIENDSANITY, +1572,Sam's House,Friendsanity: Kent 5 <3,FRIENDSANITY, +1573,Sam's House,Friendsanity: Kent 6 <3,FRIENDSANITY, +1574,Sam's House,Friendsanity: Kent 7 <3,FRIENDSANITY, +1575,Sam's House,Friendsanity: Kent 8 <3,FRIENDSANITY, +1576,Sam's House,Friendsanity: Kent 9 <3,FRIENDSANITY, +1577,Sam's House,Friendsanity: Kent 10 <3,FRIENDSANITY, +1579,Sewer,Friendsanity: Krobus 1 <3,FRIENDSANITY, +1580,Sewer,Friendsanity: Krobus 2 <3,FRIENDSANITY, +1581,Sewer,Friendsanity: Krobus 3 <3,FRIENDSANITY, +1582,Sewer,Friendsanity: Krobus 4 <3,FRIENDSANITY, +1583,Sewer,Friendsanity: Krobus 5 <3,FRIENDSANITY, +1584,Sewer,Friendsanity: Krobus 6 <3,FRIENDSANITY, +1585,Sewer,Friendsanity: Krobus 7 <3,FRIENDSANITY, +1586,Sewer,Friendsanity: Krobus 8 <3,FRIENDSANITY, +1587,Sewer,Friendsanity: Krobus 9 <3,FRIENDSANITY, +1588,Sewer,Friendsanity: Krobus 10 <3,FRIENDSANITY, +1590,Leo's Hut,Friendsanity: Leo 1 <3,"FRIENDSANITY,GINGER_ISLAND", +1591,Leo's Hut,Friendsanity: Leo 2 <3,"FRIENDSANITY,GINGER_ISLAND", +1592,Leo's Hut,Friendsanity: Leo 3 <3,"FRIENDSANITY,GINGER_ISLAND", +1593,Leo's Hut,Friendsanity: Leo 4 <3,"FRIENDSANITY,GINGER_ISLAND", +1594,Leo's Hut,Friendsanity: Leo 5 <3,"FRIENDSANITY,GINGER_ISLAND", +1595,Leo's Hut,Friendsanity: Leo 6 <3,"FRIENDSANITY,GINGER_ISLAND", +1596,Leo's Hut,Friendsanity: Leo 7 <3,"FRIENDSANITY,GINGER_ISLAND", +1597,Leo's Hut,Friendsanity: Leo 8 <3,"FRIENDSANITY,GINGER_ISLAND", +1598,Leo's Hut,Friendsanity: Leo 9 <3,"FRIENDSANITY,GINGER_ISLAND", +1599,Leo's Hut,Friendsanity: Leo 10 <3,"FRIENDSANITY,GINGER_ISLAND", +1601,Mayor's Manor,Friendsanity: Lewis 1 <3,FRIENDSANITY, +1602,Mayor's Manor,Friendsanity: Lewis 2 <3,FRIENDSANITY, +1603,Mayor's Manor,Friendsanity: Lewis 3 <3,FRIENDSANITY, +1604,Mayor's Manor,Friendsanity: Lewis 4 <3,FRIENDSANITY, +1605,Mayor's Manor,Friendsanity: Lewis 5 <3,FRIENDSANITY, +1606,Mayor's Manor,Friendsanity: Lewis 6 <3,FRIENDSANITY, +1607,Mayor's Manor,Friendsanity: Lewis 7 <3,FRIENDSANITY, +1608,Mayor's Manor,Friendsanity: Lewis 8 <3,FRIENDSANITY, +1609,Mayor's Manor,Friendsanity: Lewis 9 <3,FRIENDSANITY, +1610,Mayor's Manor,Friendsanity: Lewis 10 <3,FRIENDSANITY, +1612,Tent,Friendsanity: Linus 1 <3,FRIENDSANITY, +1613,Tent,Friendsanity: Linus 2 <3,FRIENDSANITY, +1614,Tent,Friendsanity: Linus 3 <3,FRIENDSANITY, +1615,Tent,Friendsanity: Linus 4 <3,FRIENDSANITY, +1616,Tent,Friendsanity: Linus 5 <3,FRIENDSANITY, +1617,Tent,Friendsanity: Linus 6 <3,FRIENDSANITY, +1618,Tent,Friendsanity: Linus 7 <3,FRIENDSANITY, +1619,Tent,Friendsanity: Linus 8 <3,FRIENDSANITY, +1620,Tent,Friendsanity: Linus 9 <3,FRIENDSANITY, +1621,Tent,Friendsanity: Linus 10 <3,FRIENDSANITY, +1623,Marnie's Ranch,Friendsanity: Marnie 1 <3,FRIENDSANITY, +1624,Marnie's Ranch,Friendsanity: Marnie 2 <3,FRIENDSANITY, +1625,Marnie's Ranch,Friendsanity: Marnie 3 <3,FRIENDSANITY, +1626,Marnie's Ranch,Friendsanity: Marnie 4 <3,FRIENDSANITY, +1627,Marnie's Ranch,Friendsanity: Marnie 5 <3,FRIENDSANITY, +1628,Marnie's Ranch,Friendsanity: Marnie 6 <3,FRIENDSANITY, +1629,Marnie's Ranch,Friendsanity: Marnie 7 <3,FRIENDSANITY, +1630,Marnie's Ranch,Friendsanity: Marnie 8 <3,FRIENDSANITY, +1631,Marnie's Ranch,Friendsanity: Marnie 9 <3,FRIENDSANITY, +1632,Marnie's Ranch,Friendsanity: Marnie 10 <3,FRIENDSANITY, +1634,Trailer,Friendsanity: Pam 1 <3,FRIENDSANITY, +1635,Trailer,Friendsanity: Pam 2 <3,FRIENDSANITY, +1636,Trailer,Friendsanity: Pam 3 <3,FRIENDSANITY, +1637,Trailer,Friendsanity: Pam 4 <3,FRIENDSANITY, +1638,Trailer,Friendsanity: Pam 5 <3,FRIENDSANITY, +1639,Trailer,Friendsanity: Pam 6 <3,FRIENDSANITY, +1640,Trailer,Friendsanity: Pam 7 <3,FRIENDSANITY, +1641,Trailer,Friendsanity: Pam 8 <3,FRIENDSANITY, +1642,Trailer,Friendsanity: Pam 9 <3,FRIENDSANITY, +1643,Trailer,Friendsanity: Pam 10 <3,FRIENDSANITY, +1645,Pierre's General Store,Friendsanity: Pierre 1 <3,FRIENDSANITY, +1646,Pierre's General Store,Friendsanity: Pierre 2 <3,FRIENDSANITY, +1647,Pierre's General Store,Friendsanity: Pierre 3 <3,FRIENDSANITY, +1648,Pierre's General Store,Friendsanity: Pierre 4 <3,FRIENDSANITY, +1649,Pierre's General Store,Friendsanity: Pierre 5 <3,FRIENDSANITY, +1650,Pierre's General Store,Friendsanity: Pierre 6 <3,FRIENDSANITY, +1651,Pierre's General Store,Friendsanity: Pierre 7 <3,FRIENDSANITY, +1652,Pierre's General Store,Friendsanity: Pierre 8 <3,FRIENDSANITY, +1653,Pierre's General Store,Friendsanity: Pierre 9 <3,FRIENDSANITY, +1654,Pierre's General Store,Friendsanity: Pierre 10 <3,FRIENDSANITY, +1656,Carpenter Shop,Friendsanity: Robin 1 <3,FRIENDSANITY, +1657,Carpenter Shop,Friendsanity: Robin 2 <3,FRIENDSANITY, +1658,Carpenter Shop,Friendsanity: Robin 3 <3,FRIENDSANITY, +1659,Carpenter Shop,Friendsanity: Robin 4 <3,FRIENDSANITY, +1660,Carpenter Shop,Friendsanity: Robin 5 <3,FRIENDSANITY, +1661,Carpenter Shop,Friendsanity: Robin 6 <3,FRIENDSANITY, +1662,Carpenter Shop,Friendsanity: Robin 7 <3,FRIENDSANITY, +1663,Carpenter Shop,Friendsanity: Robin 8 <3,FRIENDSANITY, +1664,Carpenter Shop,Friendsanity: Robin 9 <3,FRIENDSANITY, +1665,Carpenter Shop,Friendsanity: Robin 10 <3,FRIENDSANITY, +1667,Oasis,Friendsanity: Sandy 1 <3,FRIENDSANITY, +1668,Oasis,Friendsanity: Sandy 2 <3,FRIENDSANITY, +1669,Oasis,Friendsanity: Sandy 3 <3,FRIENDSANITY, +1670,Oasis,Friendsanity: Sandy 4 <3,FRIENDSANITY, +1671,Oasis,Friendsanity: Sandy 5 <3,FRIENDSANITY, +1672,Oasis,Friendsanity: Sandy 6 <3,FRIENDSANITY, +1673,Oasis,Friendsanity: Sandy 7 <3,FRIENDSANITY, +1674,Oasis,Friendsanity: Sandy 8 <3,FRIENDSANITY, +1675,Oasis,Friendsanity: Sandy 9 <3,FRIENDSANITY, +1676,Oasis,Friendsanity: Sandy 10 <3,FRIENDSANITY, +1678,Sam's House,Friendsanity: Vincent 1 <3,FRIENDSANITY, +1679,Sam's House,Friendsanity: Vincent 2 <3,FRIENDSANITY, +1680,Sam's House,Friendsanity: Vincent 3 <3,FRIENDSANITY, +1681,Sam's House,Friendsanity: Vincent 4 <3,FRIENDSANITY, +1682,Sam's House,Friendsanity: Vincent 5 <3,FRIENDSANITY, +1683,Sam's House,Friendsanity: Vincent 6 <3,FRIENDSANITY, +1684,Sam's House,Friendsanity: Vincent 7 <3,FRIENDSANITY, +1685,Sam's House,Friendsanity: Vincent 8 <3,FRIENDSANITY, +1686,Sam's House,Friendsanity: Vincent 9 <3,FRIENDSANITY, +1687,Sam's House,Friendsanity: Vincent 10 <3,FRIENDSANITY, +1689,Willy's Fish Shop,Friendsanity: Willy 1 <3,FRIENDSANITY, +1690,Willy's Fish Shop,Friendsanity: Willy 2 <3,FRIENDSANITY, +1691,Willy's Fish Shop,Friendsanity: Willy 3 <3,FRIENDSANITY, +1692,Willy's Fish Shop,Friendsanity: Willy 4 <3,FRIENDSANITY, +1693,Willy's Fish Shop,Friendsanity: Willy 5 <3,FRIENDSANITY, +1694,Willy's Fish Shop,Friendsanity: Willy 6 <3,FRIENDSANITY, +1695,Willy's Fish Shop,Friendsanity: Willy 7 <3,FRIENDSANITY, +1696,Willy's Fish Shop,Friendsanity: Willy 8 <3,FRIENDSANITY, +1697,Willy's Fish Shop,Friendsanity: Willy 9 <3,FRIENDSANITY, +1698,Willy's Fish Shop,Friendsanity: Willy 10 <3,FRIENDSANITY, +1700,Wizard Tower,Friendsanity: Wizard 1 <3,FRIENDSANITY, +1701,Wizard Tower,Friendsanity: Wizard 2 <3,FRIENDSANITY, +1702,Wizard Tower,Friendsanity: Wizard 3 <3,FRIENDSANITY, +1703,Wizard Tower,Friendsanity: Wizard 4 <3,FRIENDSANITY, +1704,Wizard Tower,Friendsanity: Wizard 5 <3,FRIENDSANITY, +1705,Wizard Tower,Friendsanity: Wizard 6 <3,FRIENDSANITY, +1706,Wizard Tower,Friendsanity: Wizard 7 <3,FRIENDSANITY, +1707,Wizard Tower,Friendsanity: Wizard 8 <3,FRIENDSANITY, +1708,Wizard Tower,Friendsanity: Wizard 9 <3,FRIENDSANITY, +1709,Wizard Tower,Friendsanity: Wizard 10 <3,FRIENDSANITY, +1710,Farm,Friendsanity: Pet 1 <3,FRIENDSANITY, +1711,Farm,Friendsanity: Pet 2 <3,FRIENDSANITY, +1712,Farm,Friendsanity: Pet 3 <3,FRIENDSANITY, +1713,Farm,Friendsanity: Pet 4 <3,FRIENDSANITY, +1714,Farm,Friendsanity: Pet 5 <3,FRIENDSANITY, +1715,Town,Friendsanity: Friend 1 <3,FRIENDSANITY, +1716,Town,Friendsanity: Friend 2 <3,FRIENDSANITY, +1717,Town,Friendsanity: Friend 3 <3,FRIENDSANITY, +1718,Town,Friendsanity: Friend 4 <3,FRIENDSANITY, +1719,Town,Friendsanity: Friend 5 <3,FRIENDSANITY, +1720,Town,Friendsanity: Friend 6 <3,FRIENDSANITY, +1721,Town,Friendsanity: Friend 7 <3,FRIENDSANITY, +1722,Town,Friendsanity: Friend 8 <3,FRIENDSANITY, +1723,Town,Friendsanity: Suitor 9 <3,FRIENDSANITY, +1724,Town,Friendsanity: Suitor 10 <3,FRIENDSANITY, +1725,Town,Friendsanity: Spouse 11 <3,FRIENDSANITY, +1726,Town,Friendsanity: Spouse 12 <3,FRIENDSANITY, +1727,Town,Friendsanity: Spouse 13 <3,FRIENDSANITY, +1728,Town,Friendsanity: Spouse 14 <3,FRIENDSANITY, +2001,Egg Festival,Egg Hunt Victory,FESTIVAL, +2002,Egg Festival,Egg Festival: Strawberry Seeds,FESTIVAL, +2003,Flower Dance,Dance with someone,FESTIVAL, +2004,Flower Dance,Rarecrow #5 (Woman),FESTIVAL, +2005,Luau,Luau Soup,FESTIVAL, +2006,Dance of the Moonlight Jellies,Dance of the Moonlight Jellies,FESTIVAL, +2007,Stardew Valley Fair,Smashing Stone,FESTIVAL, +2008,Stardew Valley Fair,Grange Display,FESTIVAL, +2009,Stardew Valley Fair,Rarecrow #1 (Turnip Head),FESTIVAL, +2010,Stardew Valley Fair,Fair Stardrop,FESTIVAL, +2011,Spirit's Eve,Spirit's Eve Maze,FESTIVAL, +2012,Spirit's Eve,Rarecrow #2 (Witch),FESTIVAL, +2013,Festival of Ice,Win Fishing Competition,FESTIVAL, +2014,Festival of Ice,Rarecrow #4 (Snowman),FESTIVAL, +2015,Night Market,Mermaid Pearl,FESTIVAL, +2016,Night Market,Cone Hat,FESTIVAL_HARD, +2017,Night Market,Iridium Fireplace,FESTIVAL_HARD, +2018,Night Market,Rarecrow #7 (Tanuki),FESTIVAL, +2019,Night Market,Rarecrow #8 (Tribal Mask),FESTIVAL, +2020,Night Market,Lupini: Red Eagle,FESTIVAL, +2021,Night Market,Lupini: Portrait Of A Mermaid,FESTIVAL, +2022,Night Market,Lupini: Solar Kingdom,FESTIVAL, +2023,Night Market,Lupini: Clouds,FESTIVAL_HARD, +2024,Night Market,Lupini: 1000 Years From Now,FESTIVAL_HARD, +2025,Night Market,Lupini: Three Trees,FESTIVAL_HARD, +2026,Night Market,Lupini: The Serpent,FESTIVAL_HARD, +2027,Night Market,Lupini: 'Tropical Fish #173',FESTIVAL_HARD, +2028,Night Market,Lupini: Land Of Clay,FESTIVAL_HARD, +2029,Feast of the Winter Star,Secret Santa,FESTIVAL, +2030,Feast of the Winter Star,The Legend of the Winter Star,FESTIVAL, +2031,Farm,Collect All Rarecrows,FESTIVAL, +2032,Flower Dance,Tub o' Flowers Recipe,FESTIVAL, +2033,Spirit's Eve,Jack-O-Lantern Recipe,FESTIVAL, +2034,Dance of the Moonlight Jellies,Moonlight Jellies Banner,FESTIVAL, +2035,Dance of the Moonlight Jellies,Starport Decal,FESTIVAL, +2036,Casino,Rarecrow #3 (Alien),FESTIVAL, +2101,Town,Island Ingredients,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", +2102,The Mines - Floor 75,Cave Patrol,SPECIAL_ORDER_BOARD, +2103,Fishing,Aquatic Overpopulation,SPECIAL_ORDER_BOARD, +2104,Fishing,Biome Balance,SPECIAL_ORDER_BOARD, +2105,Haley's House,Rock Rejuvenation,SPECIAL_ORDER_BOARD, +2106,Alex's House,Gifts for George,SPECIAL_ORDER_BOARD, +2107,Museum,Fragments of the past,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", +2108,Saloon,Gus' Famous Omelet,SPECIAL_ORDER_BOARD, +2109,Farm,Crop Order,SPECIAL_ORDER_BOARD, +2110,Railroad,Community Cleanup,SPECIAL_ORDER_BOARD, +2111,Trailer,The Strong Stuff,SPECIAL_ORDER_BOARD, +2112,Pierre's General Store,Pierre's Prime Produce,SPECIAL_ORDER_BOARD, +2113,Carpenter Shop,Robin's Project,SPECIAL_ORDER_BOARD, +2114,Carpenter Shop,Robin's Resource Rush,SPECIAL_ORDER_BOARD, +2115,Beach,Juicy Bugs Wanted!,SPECIAL_ORDER_BOARD, +2116,Town,Tropical Fish,"GINGER_ISLAND,SPECIAL_ORDER_BOARD", +2117,The Mines - Floor 75,A Curious Substance,SPECIAL_ORDER_BOARD, +2118,The Mines - Floor 35,Prismatic Jelly,SPECIAL_ORDER_BOARD, +2151,Qi's Walnut Room,Qi's Crop,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2152,Qi's Walnut Room,Let's Play A Game,"GINGER_ISLAND,JUNIMO_KART,SPECIAL_ORDER_QI", +2153,Qi's Walnut Room,Four Precious Stones,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2154,Qi's Walnut Room,Qi's Hungry Challenge,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2155,Qi's Walnut Room,Qi's Cuisine,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2156,Qi's Walnut Room,Qi's Kindness,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2157,Qi's Walnut Room,Extended Family,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2158,Qi's Walnut Room,Danger In The Deep,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2159,Qi's Walnut Room,Skull Cavern Invasion,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2160,Qi's Walnut Room,Qi's Prismatic Grange,"GINGER_ISLAND,SPECIAL_ORDER_QI", +2201,Boat Tunnel,Repair Ticket Machine,GINGER_ISLAND, +2202,Boat Tunnel,Repair Boat Hull,GINGER_ISLAND, +2203,Boat Tunnel,Repair Boat Anchor,GINGER_ISLAND, +2204,Leo's Hut,Leo's Parrot,"GINGER_ISLAND,WALNUT_PURCHASE", +2205,Island South,Island West Turtle,"GINGER_ISLAND,WALNUT_PURCHASE", +2206,Island West,Island Farmhouse,"GINGER_ISLAND,WALNUT_PURCHASE", +2207,Island Farmhouse,Island Mailbox,"GINGER_ISLAND,WALNUT_PURCHASE", +2208,Island Farmhouse,Farm Obelisk,"GINGER_ISLAND,WALNUT_PURCHASE", +2209,Island North,Dig Site Bridge,"GINGER_ISLAND,WALNUT_PURCHASE", +2210,Island North,Island Trader,"GINGER_ISLAND,WALNUT_PURCHASE", +2211,Volcano Entrance,Volcano Bridge,"GINGER_ISLAND,WALNUT_PURCHASE", +2212,Volcano - Floor 5,Volcano Exit Shortcut,"GINGER_ISLAND,WALNUT_PURCHASE", +2213,Island South,Island Resort,"GINGER_ISLAND,WALNUT_PURCHASE", +2214,Island West,Parrot Express,"GINGER_ISLAND,WALNUT_PURCHASE", +2215,Dig Site,Open Professor Snail Cave,GINGER_ISLAND, +2216,Field Office,Complete Island Field Office,GINGER_ISLAND, +2301,Farming,Harvest Amaranth,CROPSANITY, +2302,Farming,Harvest Artichoke,CROPSANITY, +2303,Farming,Harvest Beet,CROPSANITY, +2304,Farming,Harvest Blue Jazz,CROPSANITY, +2305,Farming,Harvest Blueberry,CROPSANITY, +2306,Farming,Harvest Bok Choy,CROPSANITY, +2307,Farming,Harvest Cauliflower,CROPSANITY, +2308,Farming,Harvest Corn,CROPSANITY, +2309,Farming,Harvest Cranberries,CROPSANITY, +2310,Farming,Harvest Eggplant,CROPSANITY, +2311,Farming,Harvest Fairy Rose,CROPSANITY, +2312,Farming,Harvest Garlic,CROPSANITY, +2313,Farming,Harvest Grape,CROPSANITY, +2314,Farming,Harvest Green Bean,CROPSANITY, +2315,Farming,Harvest Hops,CROPSANITY, +2316,Farming,Harvest Hot Pepper,CROPSANITY, +2317,Farming,Harvest Kale,CROPSANITY, +2318,Farming,Harvest Melon,CROPSANITY, +2319,Farming,Harvest Parsnip,CROPSANITY, +2320,Farming,Harvest Poppy,CROPSANITY, +2321,Farming,Harvest Potato,CROPSANITY, +2322,Farming,Harvest Pumpkin,CROPSANITY, +2323,Farming,Harvest Radish,CROPSANITY, +2324,Farming,Harvest Red Cabbage,CROPSANITY, +2325,Farming,Harvest Rhubarb,CROPSANITY, +2326,Farming,Harvest Starfruit,CROPSANITY, +2327,Farming,Harvest Strawberry,CROPSANITY, +2328,Farming,Harvest Summer Spangle,CROPSANITY, +2329,Farming,Harvest Sunflower,CROPSANITY, +2330,Farming,Harvest Tomato,CROPSANITY, +2331,Farming,Harvest Tulip,CROPSANITY, +2332,Farming,Harvest Unmilled Rice,CROPSANITY, +2333,Farming,Harvest Wheat,CROPSANITY, +2334,Farming,Harvest Yam,CROPSANITY, +2335,Farming,Harvest Cactus Fruit,CROPSANITY, +2336,Farming,Harvest Pineapple,"CROPSANITY,GINGER_ISLAND", +2337,Farming,Harvest Taro Root,"CROPSANITY,GINGER_ISLAND", +2338,Farming,Harvest Sweet Gem Berry,CROPSANITY, +2339,Farming,Harvest Apple,CROPSANITY, +2340,Farming,Harvest Apricot,CROPSANITY, +2341,Farming,Harvest Cherry,CROPSANITY, +2342,Farming,Harvest Orange,CROPSANITY, +2343,Farming,Harvest Pomegranate,CROPSANITY, +2344,Farming,Harvest Peach,CROPSANITY, +2345,Farming,Harvest Banana,"CROPSANITY,GINGER_ISLAND", +2346,Farming,Harvest Mango,"CROPSANITY,GINGER_ISLAND", +2347,Farming,Harvest Coffee Bean,CROPSANITY, +2401,Shipping,Shipsanity: Duck Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2402,Shipping,Shipsanity: Duck Feather,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2403,Shipping,Shipsanity: Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2404,Shipping,Shipsanity: Egg (Brown),"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2405,Shipping,Shipsanity: Goat Milk,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2406,Shipping,Shipsanity: Large Goat Milk,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2407,Shipping,Shipsanity: Large Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2408,Shipping,Shipsanity: Large Egg (Brown),"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2409,Shipping,Shipsanity: Large Milk,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2410,Shipping,Shipsanity: Milk,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2411,Shipping,Shipsanity: Rabbit's Foot,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2412,Shipping,Shipsanity: Roe,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2413,Shipping,Shipsanity: Truffle,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2414,Shipping,Shipsanity: Void Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2415,Shipping,Shipsanity: Wool,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2416,Shipping,Shipsanity: Anchor,SHIPSANITY, +2417,Shipping,Shipsanity: Ancient Doll,SHIPSANITY, +2418,Shipping,Shipsanity: Ancient Drum,SHIPSANITY, +2419,Shipping,Shipsanity: Ancient Seed,SHIPSANITY, +2420,Shipping,Shipsanity: Ancient Sword,SHIPSANITY, +2421,Shipping,Shipsanity: Arrowhead,SHIPSANITY, +2422,Shipping,Shipsanity: Artifact Trove,SHIPSANITY, +2423,Shipping,Shipsanity: Bone Flute,SHIPSANITY, +2424,Shipping,Shipsanity: Chewing Stick,SHIPSANITY, +2425,Shipping,Shipsanity: Chicken Statue,SHIPSANITY, +2426,Shipping,Shipsanity: Chipped Amphora,SHIPSANITY, +2427,Shipping,Shipsanity: Dinosaur Egg,SHIPSANITY, +2428,Shipping,Shipsanity: Dried Starfish,SHIPSANITY, +2429,Shipping,Shipsanity: Dwarf Gadget,SHIPSANITY, +2430,Shipping,Shipsanity: Dwarf Scroll I,SHIPSANITY, +2431,Shipping,Shipsanity: Dwarf Scroll II,SHIPSANITY, +2432,Shipping,Shipsanity: Dwarf Scroll III,SHIPSANITY, +2433,Shipping,Shipsanity: Dwarf Scroll IV,SHIPSANITY, +2434,Shipping,Shipsanity: Dwarvish Helm,SHIPSANITY, +2435,Shipping,Shipsanity: Elvish Jewelry,SHIPSANITY, +2436,Shipping,Shipsanity: Glass Shards,SHIPSANITY, +2437,Shipping,Shipsanity: Golden Mask,SHIPSANITY, +2438,Shipping,Shipsanity: Golden Relic,SHIPSANITY, +2439,Shipping,Shipsanity: Ornamental Fan,SHIPSANITY, +2440,Shipping,Shipsanity: Prehistoric Handaxe,SHIPSANITY, +2441,Shipping,Shipsanity: Prehistoric Tool,SHIPSANITY, +2442,Shipping,Shipsanity: Rare Disc,SHIPSANITY, +2443,Shipping,Shipsanity: Rusty Cog,SHIPSANITY, +2444,Shipping,Shipsanity: Rusty Spoon,SHIPSANITY, +2445,Shipping,Shipsanity: Rusty Spur,SHIPSANITY, +2446,Shipping,Shipsanity: Strange Doll,SHIPSANITY, +2447,Shipping,Shipsanity: Strange Doll (Green),SHIPSANITY, +2448,Shipping,Shipsanity: Treasure Chest,SHIPSANITY, +2449,Shipping,Shipsanity: Aged Roe,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2450,Shipping,Shipsanity: Beer,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2451,Shipping,Shipsanity: Caviar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2452,Shipping,Shipsanity: Cheese,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2453,Shipping,Shipsanity: Cloth,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2454,Shipping,Shipsanity: Coffee,SHIPSANITY, +2455,Shipping,Shipsanity: Dinosaur Mayonnaise,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2456,Shipping,Shipsanity: Duck Mayonnaise,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2457,Shipping,Shipsanity: Goat Cheese,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2458,Shipping,Shipsanity: Green Tea,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2459,Shipping,Shipsanity: Honey,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2460,Shipping,Shipsanity: Jelly,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2461,Shipping,Shipsanity: Juice,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2462,Shipping,Shipsanity: Maple Syrup,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2463,Shipping,Shipsanity: Mayonnaise,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2464,Shipping,Shipsanity: Mead,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2465,Shipping,Shipsanity: Oak Resin,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2466,Shipping,Shipsanity: Pale Ale,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2467,Shipping,Shipsanity: Pickles,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2468,Shipping,Shipsanity: Pine Tar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2469,Shipping,Shipsanity: Truffle Oil,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2470,Shipping,Shipsanity: Void Mayonnaise,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2471,Shipping,Shipsanity: Wine,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2472,Shipping,Shipsanity: Algae Soup,SHIPSANITY, +2473,Shipping,Shipsanity: Artichoke Dip,SHIPSANITY, +2474,Shipping,Shipsanity: Autumn's Bounty,SHIPSANITY, +2475,Shipping,Shipsanity: Baked Fish,SHIPSANITY, +2476,Shipping,Shipsanity: Bean Hotpot,SHIPSANITY, +2477,Shipping,Shipsanity: Blackberry Cobbler,SHIPSANITY, +2478,Shipping,Shipsanity: Blueberry Tart,SHIPSANITY, +2479,Shipping,Shipsanity: Bread,SHIPSANITY, +2480,Shipping,Shipsanity: Bruschetta,SHIPSANITY, +2481,Shipping,Shipsanity: Carp Surprise,SHIPSANITY, +2482,Shipping,Shipsanity: Cheese Cauliflower,SHIPSANITY, +2483,Shipping,Shipsanity: Chocolate Cake,SHIPSANITY, +2484,Shipping,Shipsanity: Chowder,SHIPSANITY, +2485,Shipping,Shipsanity: Coleslaw,SHIPSANITY, +2486,Shipping,Shipsanity: Complete Breakfast,SHIPSANITY, +2487,Shipping,Shipsanity: Cookies,SHIPSANITY, +2488,Shipping,Shipsanity: Crab Cakes,SHIPSANITY, +2489,Shipping,Shipsanity: Cranberry Candy,SHIPSANITY, +2490,Shipping,Shipsanity: Cranberry Sauce,SHIPSANITY, +2491,Shipping,Shipsanity: Crispy Bass,SHIPSANITY, +2492,Shipping,Shipsanity: Dish O' The Sea,SHIPSANITY, +2493,Shipping,Shipsanity: Eggplant Parmesan,SHIPSANITY, +2494,Shipping,Shipsanity: Escargot,SHIPSANITY, +2495,Shipping,Shipsanity: Farmer's Lunch,SHIPSANITY, +2496,Shipping,Shipsanity: Fiddlehead Risotto,SHIPSANITY, +2497,Shipping,Shipsanity: Fish Stew,SHIPSANITY, +2498,Shipping,Shipsanity: Fish Taco,SHIPSANITY, +2499,Shipping,Shipsanity: Fried Calamari,SHIPSANITY, +2500,Shipping,Shipsanity: Fried Eel,SHIPSANITY, +2501,Shipping,Shipsanity: Fried Egg,SHIPSANITY, +2502,Shipping,Shipsanity: Fried Mushroom,SHIPSANITY, +2503,Shipping,Shipsanity: Fruit Salad,SHIPSANITY, +2504,Shipping,Shipsanity: Glazed Yams,SHIPSANITY, +2505,Shipping,Shipsanity: Hashbrowns,SHIPSANITY, +2506,Shipping,Shipsanity: Ice Cream,SHIPSANITY, +2507,Shipping,Shipsanity: Lobster Bisque,SHIPSANITY, +2508,Shipping,Shipsanity: Lucky Lunch,SHIPSANITY, +2509,Shipping,Shipsanity: Maki Roll,SHIPSANITY, +2510,Shipping,Shipsanity: Maple Bar,SHIPSANITY, +2511,Shipping,Shipsanity: Miner's Treat,SHIPSANITY, +2512,Shipping,Shipsanity: Omelet,SHIPSANITY, +2513,Shipping,Shipsanity: Pale Broth,SHIPSANITY, +2514,Shipping,Shipsanity: Pancakes,SHIPSANITY, +2515,Shipping,Shipsanity: Parsnip Soup,SHIPSANITY, +2516,Shipping,Shipsanity: Pepper Poppers,SHIPSANITY, +2517,Shipping,Shipsanity: Pink Cake,SHIPSANITY, +2518,Shipping,Shipsanity: Pizza,SHIPSANITY, +2519,Shipping,Shipsanity: Plum Pudding,SHIPSANITY, +2520,Shipping,Shipsanity: Poppyseed Muffin,SHIPSANITY, +2521,Shipping,Shipsanity: Pumpkin Pie,SHIPSANITY, +2522,Shipping,Shipsanity: Pumpkin Soup,SHIPSANITY, +2523,Shipping,Shipsanity: Radish Salad,SHIPSANITY, +2524,Shipping,Shipsanity: Red Plate,SHIPSANITY, +2525,Shipping,Shipsanity: Rhubarb Pie,SHIPSANITY, +2526,Shipping,Shipsanity: Rice Pudding,SHIPSANITY, +2527,Shipping,Shipsanity: Roasted Hazelnuts,SHIPSANITY, +2528,Shipping,Shipsanity: Roots Platter,SHIPSANITY, +2529,Shipping,Shipsanity: Salad,SHIPSANITY, +2530,Shipping,Shipsanity: Salmon Dinner,SHIPSANITY, +2531,Shipping,Shipsanity: Sashimi,SHIPSANITY, +2532,Shipping,Shipsanity: Seafoam Pudding,SHIPSANITY, +2533,Shipping,Shipsanity: Shrimp Cocktail,SHIPSANITY, +2534,Shipping,Shipsanity: Spaghetti,SHIPSANITY, +2535,Shipping,Shipsanity: Spicy Eel,SHIPSANITY, +2536,Shipping,Shipsanity: Squid Ink Ravioli,SHIPSANITY, +2537,Shipping,Shipsanity: Stir Fry,SHIPSANITY, +2538,Shipping,Shipsanity: Strange Bun,SHIPSANITY, +2539,Shipping,Shipsanity: Stuffing,SHIPSANITY, +2540,Shipping,Shipsanity: Super Meal,SHIPSANITY, +2541,Shipping,Shipsanity: Survival Burger,SHIPSANITY, +2542,Shipping,Shipsanity: Tom Kha Soup,SHIPSANITY, +2543,Shipping,Shipsanity: Tortilla,SHIPSANITY, +2544,Shipping,Shipsanity: Triple Shot Espresso,SHIPSANITY, +2545,Shipping,Shipsanity: Trout Soup,SHIPSANITY, +2546,Shipping,Shipsanity: Vegetable Medley,SHIPSANITY, +2547,Shipping,Shipsanity: Bait,SHIPSANITY, +2548,Shipping,Shipsanity: Barbed Hook,SHIPSANITY, +2549,Shipping,Shipsanity: Basic Fertilizer,SHIPSANITY, +2550,Shipping,Shipsanity: Basic Retaining Soil,SHIPSANITY, +2551,Shipping,Shipsanity: Blue Slime Egg,SHIPSANITY, +2552,Shipping,Shipsanity: Bomb,SHIPSANITY, +2553,Shipping,Shipsanity: Brick Floor,SHIPSANITY, +2554,Shipping,Shipsanity: Bug Steak,SHIPSANITY, +2555,Shipping,Shipsanity: Cherry Bomb,SHIPSANITY, +2556,Shipping,Shipsanity: Cobblestone Path,SHIPSANITY, +2557,Shipping,Shipsanity: Cookout Kit,SHIPSANITY, +2558,Shipping,Shipsanity: Cork Bobber,SHIPSANITY, +2559,Shipping,Shipsanity: Crab Pot,SHIPSANITY, +2560,Shipping,Shipsanity: Crystal Floor,SHIPSANITY, +2561,Shipping,Shipsanity: Crystal Path,SHIPSANITY, +2562,Shipping,Shipsanity: Deluxe Speed-Gro,SHIPSANITY, +2563,Shipping,Shipsanity: Dressed Spinner,SHIPSANITY, +2564,Shipping,Shipsanity: Drum Block,SHIPSANITY, +2565,Shipping,Shipsanity: Explosive Ammo,SHIPSANITY, +2566,Shipping,Shipsanity: Fiber Seeds,SHIPSANITY, +2567,Shipping,Shipsanity: Field Snack,SHIPSANITY, +2568,Shipping,Shipsanity: Flute Block,SHIPSANITY, +2569,Shipping,Shipsanity: Gate,SHIPSANITY, +2570,Shipping,Shipsanity: Gravel Path,SHIPSANITY, +2571,Shipping,Shipsanity: Green Slime Egg,SHIPSANITY, +2572,Shipping,Shipsanity: Hardwood Fence,SHIPSANITY, +2573,Shipping,Shipsanity: Iridium Sprinkler,SHIPSANITY, +2574,Shipping,Shipsanity: Iron Fence,SHIPSANITY, +2575,Shipping,Shipsanity: Jack-O-Lantern,SHIPSANITY, +2576,Shipping,Shipsanity: Lead Bobber,SHIPSANITY, +2577,Shipping,Shipsanity: Life Elixir,SHIPSANITY, +2578,Shipping,Shipsanity: Magnet,SHIPSANITY, +2579,Shipping,Shipsanity: Mega Bomb,SHIPSANITY, +2580,Shipping,Shipsanity: Monster Musk,SHIPSANITY, +2581,Shipping,Shipsanity: Oil of Garlic,SHIPSANITY, +2582,Shipping,Shipsanity: Purple Slime Egg,SHIPSANITY, +2583,Shipping,Shipsanity: Quality Bobber,SHIPSANITY, +2584,Shipping,Shipsanity: Quality Fertilizer,SHIPSANITY, +2585,Shipping,Shipsanity: Quality Retaining Soil,SHIPSANITY, +2586,Shipping,Shipsanity: Quality Sprinkler,SHIPSANITY, +2587,Shipping,Shipsanity: Rain Totem,SHIPSANITY, +2588,Shipping,Shipsanity: Red Slime Egg,SHIPSANITY, +2589,Shipping,Shipsanity: Rustic Plank Floor,SHIPSANITY, +2590,Shipping,Shipsanity: Speed-Gro,SHIPSANITY, +2591,Shipping,Shipsanity: Spinner,SHIPSANITY, +2592,Shipping,Shipsanity: Sprinkler,SHIPSANITY, +2593,Shipping,Shipsanity: Stepping Stone Path,SHIPSANITY, +2594,Shipping,Shipsanity: Stone Fence,SHIPSANITY, +2595,Shipping,Shipsanity: Stone Floor,SHIPSANITY, +2596,Shipping,Shipsanity: Stone Walkway Floor,SHIPSANITY, +2597,Shipping,Shipsanity: Straw Floor,SHIPSANITY, +2598,Shipping,Shipsanity: Torch,SHIPSANITY, +2599,Shipping,Shipsanity: Trap Bobber,SHIPSANITY, +2600,Shipping,Shipsanity: Treasure Hunter,SHIPSANITY, +2601,Shipping,Shipsanity: Tree Fertilizer,SHIPSANITY, +2602,Shipping,Shipsanity: Warp Totem: Beach,SHIPSANITY, +2603,Shipping,Shipsanity: Warp Totem: Desert,SHIPSANITY, +2604,Shipping,Shipsanity: Warp Totem: Farm,SHIPSANITY, +2605,Shipping,Shipsanity: Warp Totem: Island,"SHIPSANITY,GINGER_ISLAND", +2606,Shipping,Shipsanity: Warp Totem: Mountains,SHIPSANITY, +2607,Shipping,Shipsanity: Weathered Floor,SHIPSANITY, +2608,Shipping,Shipsanity: Wild Bait,SHIPSANITY, +2609,Shipping,Shipsanity: Wood Fence,SHIPSANITY, +2610,Shipping,Shipsanity: Wood Floor,SHIPSANITY, +2611,Shipping,Shipsanity: Wood Path,SHIPSANITY, +2612,Shipping,Shipsanity: Amaranth,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2613,Shipping,Shipsanity: Ancient Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2614,Shipping,Shipsanity: Apple,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2615,Shipping,Shipsanity: Apricot,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2616,Shipping,Shipsanity: Artichoke,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2617,Shipping,Shipsanity: Beet,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2618,Shipping,Shipsanity: Blue Jazz,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2619,Shipping,Shipsanity: Blueberry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2620,Shipping,Shipsanity: Bok Choy,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2621,Shipping,Shipsanity: Cauliflower,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2622,Shipping,Shipsanity: Cherry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2623,Shipping,Shipsanity: Corn,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2624,Shipping,Shipsanity: Cranberries,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2625,Shipping,Shipsanity: Eggplant,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2626,Shipping,Shipsanity: Fairy Rose,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2627,Shipping,Shipsanity: Garlic,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2628,Shipping,Shipsanity: Grape,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2629,Shipping,Shipsanity: Green Bean,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2630,Shipping,Shipsanity: Hops,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2631,Shipping,Shipsanity: Hot Pepper,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2632,Shipping,Shipsanity: Kale,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2633,Shipping,Shipsanity: Melon,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2634,Shipping,Shipsanity: Orange,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2635,Shipping,Shipsanity: Parsnip,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2636,Shipping,Shipsanity: Peach,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2637,Shipping,Shipsanity: Pomegranate,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2638,Shipping,Shipsanity: Poppy,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2639,Shipping,Shipsanity: Potato,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2640,Shipping,Shipsanity: Pumpkin,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2641,Shipping,Shipsanity: Radish,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2642,Shipping,Shipsanity: Red Cabbage,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2643,Shipping,Shipsanity: Rhubarb,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2644,Shipping,Shipsanity: Starfruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2645,Shipping,Shipsanity: Strawberry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2646,Shipping,Shipsanity: Summer Spangle,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2647,Shipping,Shipsanity: Sunflower,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2648,Shipping,Shipsanity: Sweet Gem Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2649,Shipping,Shipsanity: Tea Leaves,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2650,Shipping,Shipsanity: Tomato,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2651,Shipping,Shipsanity: Tulip,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2652,Shipping,Shipsanity: Unmilled Rice,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2653,Shipping,Shipsanity: Wheat,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2654,Shipping,Shipsanity: Yam,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2655,Shipping,Shipsanity: Albacore,"SHIPSANITY,SHIPSANITY_FISH", +2656,Shipping,Shipsanity: Anchovy,"SHIPSANITY,SHIPSANITY_FISH", +2657,Shipping,Shipsanity: Angler,"SHIPSANITY,SHIPSANITY_FISH", +2658,Shipping,Shipsanity: Blobfish,"SHIPSANITY,SHIPSANITY_FISH", +2659,Shipping,Shipsanity: Bream,"SHIPSANITY,SHIPSANITY_FISH", +2660,Shipping,Shipsanity: Bullhead,"SHIPSANITY,SHIPSANITY_FISH", +2661,Shipping,Shipsanity: Carp,"SHIPSANITY,SHIPSANITY_FISH", +2662,Shipping,Shipsanity: Catfish,"SHIPSANITY,SHIPSANITY_FISH", +2663,Shipping,Shipsanity: Chub,"SHIPSANITY,SHIPSANITY_FISH", +2664,Shipping,Shipsanity: Cockle,"SHIPSANITY,SHIPSANITY_FISH", +2665,Shipping,Shipsanity: Crab,"SHIPSANITY,SHIPSANITY_FISH", +2666,Shipping,Shipsanity: Crayfish,"SHIPSANITY,SHIPSANITY_FISH", +2667,Shipping,Shipsanity: Crimsonfish,"SHIPSANITY,SHIPSANITY_FISH", +2668,Shipping,Shipsanity: Dorado,"SHIPSANITY,SHIPSANITY_FISH", +2669,Shipping,Shipsanity: Eel,"SHIPSANITY,SHIPSANITY_FISH", +2670,Shipping,Shipsanity: Flounder,"SHIPSANITY,SHIPSANITY_FISH", +2671,Shipping,Shipsanity: Ghostfish,"SHIPSANITY,SHIPSANITY_FISH", +2672,Shipping,Shipsanity: Glacierfish,"SHIPSANITY,SHIPSANITY_FISH", +2673,Shipping,Shipsanity: Halibut,"SHIPSANITY,SHIPSANITY_FISH", +2674,Shipping,Shipsanity: Herring,"SHIPSANITY,SHIPSANITY_FISH", +2675,Shipping,Shipsanity: Ice Pip,"SHIPSANITY,SHIPSANITY_FISH", +2676,Shipping,Shipsanity: Largemouth Bass,"SHIPSANITY,SHIPSANITY_FISH", +2677,Shipping,Shipsanity: Lava Eel,"SHIPSANITY,SHIPSANITY_FISH", +2678,Shipping,Shipsanity: Legend,"SHIPSANITY,SHIPSANITY_FISH", +2679,Shipping,Shipsanity: Lingcod,"SHIPSANITY,SHIPSANITY_FISH", +2680,Shipping,Shipsanity: Lobster,"SHIPSANITY,SHIPSANITY_FISH", +2681,Shipping,Shipsanity: Midnight Carp,"SHIPSANITY,SHIPSANITY_FISH", +2682,Shipping,Shipsanity: Midnight Squid,"SHIPSANITY,SHIPSANITY_FISH", +2683,Shipping,Shipsanity: Mussel,"SHIPSANITY,SHIPSANITY_FISH", +2684,Shipping,Shipsanity: Mutant Carp,"SHIPSANITY,SHIPSANITY_FISH", +2685,Shipping,Shipsanity: Octopus,"SHIPSANITY,SHIPSANITY_FISH", +2686,Shipping,Shipsanity: Oyster,"SHIPSANITY,SHIPSANITY_FISH", +2687,Shipping,Shipsanity: Perch,"SHIPSANITY,SHIPSANITY_FISH", +2688,Shipping,Shipsanity: Periwinkle,"SHIPSANITY,SHIPSANITY_FISH", +2689,Shipping,Shipsanity: Pike,"SHIPSANITY,SHIPSANITY_FISH", +2690,Shipping,Shipsanity: Pufferfish,"SHIPSANITY,SHIPSANITY_FISH", +2691,Shipping,Shipsanity: Rainbow Trout,"SHIPSANITY,SHIPSANITY_FISH", +2692,Shipping,Shipsanity: Red Mullet,"SHIPSANITY,SHIPSANITY_FISH", +2693,Shipping,Shipsanity: Red Snapper,"SHIPSANITY,SHIPSANITY_FISH", +2694,Shipping,Shipsanity: Salmon,"SHIPSANITY,SHIPSANITY_FISH", +2695,Shipping,Shipsanity: Sandfish,"SHIPSANITY,SHIPSANITY_FISH", +2696,Shipping,Shipsanity: Sardine,"SHIPSANITY,SHIPSANITY_FISH", +2697,Shipping,Shipsanity: Scorpion Carp,"SHIPSANITY,SHIPSANITY_FISH", +2698,Shipping,Shipsanity: Sea Cucumber,"SHIPSANITY,SHIPSANITY_FISH", +2699,Shipping,Shipsanity: Shad,"SHIPSANITY,SHIPSANITY_FISH", +2700,Shipping,Shipsanity: Shrimp,"SHIPSANITY,SHIPSANITY_FISH", +2701,Shipping,Shipsanity: Slimejack,"SHIPSANITY,SHIPSANITY_FISH", +2702,Shipping,Shipsanity: Smallmouth Bass,"SHIPSANITY,SHIPSANITY_FISH", +2703,Shipping,Shipsanity: Snail,"SHIPSANITY,SHIPSANITY_FISH", +2704,Shipping,Shipsanity: Spook Fish,"SHIPSANITY,SHIPSANITY_FISH", +2705,Shipping,Shipsanity: Squid,"SHIPSANITY,SHIPSANITY_FISH", +2706,Shipping,Shipsanity: Stonefish,"SHIPSANITY,SHIPSANITY_FISH", +2707,Shipping,Shipsanity: Sturgeon,"SHIPSANITY,SHIPSANITY_FISH", +2708,Shipping,Shipsanity: Sunfish,"SHIPSANITY,SHIPSANITY_FISH", +2709,Shipping,Shipsanity: Super Cucumber,"SHIPSANITY,SHIPSANITY_FISH", +2710,Shipping,Shipsanity: Tiger Trout,"SHIPSANITY,SHIPSANITY_FISH", +2711,Shipping,Shipsanity: Tilapia,"SHIPSANITY,SHIPSANITY_FISH", +2712,Shipping,Shipsanity: Tuna,"SHIPSANITY,SHIPSANITY_FISH", +2713,Shipping,Shipsanity: Void Salmon,"SHIPSANITY,SHIPSANITY_FISH", +2714,Shipping,Shipsanity: Walleye,"SHIPSANITY,SHIPSANITY_FISH", +2715,Shipping,Shipsanity: Woodskip,"SHIPSANITY,SHIPSANITY_FISH", +2716,Shipping,Shipsanity: Blackberry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2717,Shipping,Shipsanity: Cactus Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2718,Shipping,Shipsanity: Cave Carrot,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2719,Shipping,Shipsanity: Chanterelle,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2720,Shipping,Shipsanity: Clam,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2721,Shipping,Shipsanity: Coconut,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2722,Shipping,Shipsanity: Common Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2723,Shipping,Shipsanity: Coral,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2724,Shipping,Shipsanity: Crocus,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2725,Shipping,Shipsanity: Crystal Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2726,Shipping,Shipsanity: Daffodil,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2727,Shipping,Shipsanity: Dandelion,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2728,Shipping,Shipsanity: Fiddlehead Fern,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2729,Shipping,Shipsanity: Hazelnut,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2730,Shipping,Shipsanity: Holly,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2731,Shipping,Shipsanity: Leek,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2732,Shipping,Shipsanity: Morel,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2733,Shipping,Shipsanity: Nautilus Shell,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2734,Shipping,Shipsanity: Purple Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2735,Shipping,Shipsanity: Rainbow Shell,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2736,Shipping,Shipsanity: Red Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2737,Shipping,Shipsanity: Salmonberry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2738,Shipping,Shipsanity: Sea Urchin,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2739,Shipping,Shipsanity: Snow Yam,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2740,Shipping,Shipsanity: Spice Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2741,Shipping,Shipsanity: Spring Onion,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2742,Shipping,Shipsanity: Sweet Pea,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2743,Shipping,Shipsanity: Wild Horseradish,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2744,Shipping,Shipsanity: Wild Plum,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2745,Shipping,Shipsanity: Winter Root,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2746,Shipping,Shipsanity: Tea Set,SHIPSANITY, +2747,Shipping,Shipsanity: Battery Pack,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2748,Shipping,Shipsanity: Clay,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2749,Shipping,Shipsanity: Copper Bar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2750,Shipping,Shipsanity: Fiber,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2751,Shipping,Shipsanity: Gold Bar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2752,Shipping,Shipsanity: Hardwood,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2753,Shipping,Shipsanity: Iridium Bar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2754,Shipping,Shipsanity: Iron Bar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2755,Shipping,Shipsanity: Oil,SHIPSANITY, +2756,Shipping,Shipsanity: Refined Quartz,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2757,Shipping,Shipsanity: Rice,SHIPSANITY, +2758,Shipping,Shipsanity: Sap,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2759,Shipping,Shipsanity: Stone,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2760,Shipping,Shipsanity: Sugar,SHIPSANITY, +2761,Shipping,Shipsanity: Vinegar,SHIPSANITY, +2762,Shipping,Shipsanity: Wheat Flour,SHIPSANITY, +2763,Shipping,Shipsanity: Wood,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2764,Shipping,Shipsanity: Aerinite,SHIPSANITY, +2765,Shipping,Shipsanity: Alamite,SHIPSANITY, +2766,Shipping,Shipsanity: Amethyst,SHIPSANITY, +2767,Shipping,Shipsanity: Amphibian Fossil,SHIPSANITY, +2768,Shipping,Shipsanity: Aquamarine,SHIPSANITY, +2769,Shipping,Shipsanity: Baryte,SHIPSANITY, +2770,Shipping,Shipsanity: Basalt,SHIPSANITY, +2771,Shipping,Shipsanity: Bixite,SHIPSANITY, +2772,Shipping,Shipsanity: Calcite,SHIPSANITY, +2773,Shipping,Shipsanity: Celestine,SHIPSANITY, +2774,Shipping,Shipsanity: Coal,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2775,Shipping,Shipsanity: Copper Ore,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2776,Shipping,Shipsanity: Diamond,SHIPSANITY, +2777,Shipping,Shipsanity: Dolomite,SHIPSANITY, +2778,Shipping,Shipsanity: Earth Crystal,SHIPSANITY, +2779,Shipping,Shipsanity: Emerald,SHIPSANITY, +2780,Shipping,Shipsanity: Esperite,SHIPSANITY, +2781,Shipping,Shipsanity: Fairy Stone,SHIPSANITY, +2782,Shipping,Shipsanity: Fire Opal,SHIPSANITY, +2783,Shipping,Shipsanity: Fire Quartz,SHIPSANITY, +2784,Shipping,Shipsanity: Fluorapatite,SHIPSANITY, +2785,Shipping,Shipsanity: Frozen Geode,SHIPSANITY, +2786,Shipping,Shipsanity: Frozen Tear,SHIPSANITY, +2787,Shipping,Shipsanity: Geminite,SHIPSANITY, +2788,Shipping,Shipsanity: Geode,SHIPSANITY, +2789,Shipping,Shipsanity: Ghost Crystal,SHIPSANITY, +2790,Shipping,Shipsanity: Gold Ore,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2791,Shipping,Shipsanity: Granite,SHIPSANITY, +2792,Shipping,Shipsanity: Helvite,SHIPSANITY, +2793,Shipping,Shipsanity: Hematite,SHIPSANITY, +2794,Shipping,Shipsanity: Iridium Ore,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2795,Shipping,Shipsanity: Iron Ore,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2796,Shipping,Shipsanity: Jade,SHIPSANITY, +2797,Shipping,Shipsanity: Jagoite,SHIPSANITY, +2798,Shipping,Shipsanity: Jamborite,SHIPSANITY, +2799,Shipping,Shipsanity: Jasper,SHIPSANITY, +2800,Shipping,Shipsanity: Kyanite,SHIPSANITY, +2801,Shipping,Shipsanity: Lemon Stone,SHIPSANITY, +2802,Shipping,Shipsanity: Limestone,SHIPSANITY, +2803,Shipping,Shipsanity: Lunarite,SHIPSANITY, +2804,Shipping,Shipsanity: Magma Geode,SHIPSANITY, +2805,Shipping,Shipsanity: Malachite,SHIPSANITY, +2806,Shipping,Shipsanity: Marble,SHIPSANITY, +2807,Shipping,Shipsanity: Mudstone,SHIPSANITY, +2808,Shipping,Shipsanity: Nautilus Fossil,SHIPSANITY, +2809,Shipping,Shipsanity: Nekoite,SHIPSANITY, +2810,Shipping,Shipsanity: Neptunite,SHIPSANITY, +2811,Shipping,Shipsanity: Obsidian,SHIPSANITY, +2812,Shipping,Shipsanity: Ocean Stone,SHIPSANITY, +2813,Shipping,Shipsanity: Omni Geode,SHIPSANITY, +2814,Shipping,Shipsanity: Opal,SHIPSANITY, +2815,Shipping,Shipsanity: Orpiment,SHIPSANITY, +2816,Shipping,Shipsanity: Palm Fossil,SHIPSANITY, +2817,Shipping,Shipsanity: Petrified Slime,SHIPSANITY, +2818,Shipping,Shipsanity: Prehistoric Rib,SHIPSANITY, +2819,Shipping,Shipsanity: Prehistoric Scapula,SHIPSANITY, +2820,Shipping,Shipsanity: Prehistoric Skull,SHIPSANITY, +2821,Shipping,Shipsanity: Prehistoric Tibia,SHIPSANITY, +2822,Shipping,Shipsanity: Prehistoric Vertebra,SHIPSANITY, +2823,Shipping,Shipsanity: Prismatic Shard,SHIPSANITY, +2824,Shipping,Shipsanity: Pyrite,SHIPSANITY, +2825,Shipping,Shipsanity: Quartz,SHIPSANITY, +2826,Shipping,Shipsanity: Ruby,SHIPSANITY, +2827,Shipping,Shipsanity: Sandstone,SHIPSANITY, +2828,Shipping,Shipsanity: Skeletal Hand,SHIPSANITY, +2829,Shipping,Shipsanity: Skeletal Tail,SHIPSANITY, +2830,Shipping,Shipsanity: Slate,SHIPSANITY, +2831,Shipping,Shipsanity: Soapstone,SHIPSANITY, +2832,Shipping,Shipsanity: Star Shards,SHIPSANITY, +2833,Shipping,Shipsanity: Thunder Egg,SHIPSANITY, +2834,Shipping,Shipsanity: Tigerseye,SHIPSANITY, +2835,Shipping,Shipsanity: Topaz,SHIPSANITY, +2836,Shipping,Shipsanity: Trilobite,SHIPSANITY, +2837,Shipping,Shipsanity: Bat Wing,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2838,Shipping,Shipsanity: Bone Fragment,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2839,Shipping,Shipsanity: Curiosity Lure,SHIPSANITY, +2840,Shipping,Shipsanity: Slime,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2841,Shipping,Shipsanity: Solar Essence,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2842,Shipping,Shipsanity: Squid Ink,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2843,Shipping,Shipsanity: Void Essence,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2844,Shipping,Shipsanity: Bouquet,SHIPSANITY, +2845,Shipping,Shipsanity: Energy Tonic,SHIPSANITY, +2846,Shipping,Shipsanity: Golden Pumpkin,SHIPSANITY, +2847,Shipping,Shipsanity: Green Algae,SHIPSANITY, +2848,Shipping,Shipsanity: Hay,SHIPSANITY, +2849,Shipping,Shipsanity: Magic Rock Candy,SHIPSANITY, +2850,Shipping,Shipsanity: Muscle Remedy,SHIPSANITY, +2851,Shipping,Shipsanity: Pearl,SHIPSANITY, +2852,Shipping,Shipsanity: Rotten Plant,SHIPSANITY, +2853,Shipping,Shipsanity: Seaweed,SHIPSANITY, +2854,Shipping,Shipsanity: Void Ghost Pendant,SHIPSANITY, +2855,Shipping,Shipsanity: White Algae,SHIPSANITY, +2856,Shipping,Shipsanity: Wilted Bouquet,SHIPSANITY, +2857,Shipping,Shipsanity: Secret Note,SHIPSANITY, +2858,Shipping,Shipsanity: Acorn,SHIPSANITY, +2859,Shipping,Shipsanity: Amaranth Seeds,SHIPSANITY, +2860,Shipping,Shipsanity: Ancient Seeds,SHIPSANITY, +2861,Shipping,Shipsanity: Apple Sapling,SHIPSANITY, +2862,Shipping,Shipsanity: Apricot Sapling,SHIPSANITY, +2863,Shipping,Shipsanity: Artichoke Seeds,SHIPSANITY, +2864,Shipping,Shipsanity: Bean Starter,SHIPSANITY, +2865,Shipping,Shipsanity: Beet Seeds,SHIPSANITY, +2866,Shipping,Shipsanity: Blueberry Seeds,SHIPSANITY, +2867,Shipping,Shipsanity: Bok Choy Seeds,SHIPSANITY, +2868,Shipping,Shipsanity: Cactus Seeds,SHIPSANITY, +2869,Shipping,Shipsanity: Cauliflower Seeds,SHIPSANITY, +2870,Shipping,Shipsanity: Cherry Sapling,SHIPSANITY, +2871,Shipping,Shipsanity: Coffee Bean,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2872,Shipping,Shipsanity: Corn Seeds,SHIPSANITY, +2873,Shipping,Shipsanity: Cranberry Seeds,SHIPSANITY, +2874,Shipping,Shipsanity: Eggplant Seeds,SHIPSANITY, +2875,Shipping,Shipsanity: Fairy Seeds,SHIPSANITY, +2876,Shipping,Shipsanity: Fall Seeds,SHIPSANITY, +2877,Shipping,Shipsanity: Garlic Seeds,SHIPSANITY, +2878,Shipping,Shipsanity: Grape Starter,SHIPSANITY, +2879,Shipping,Shipsanity: Grass Starter,SHIPSANITY, +2880,Shipping,Shipsanity: Hops Starter,SHIPSANITY, +2881,Shipping,Shipsanity: Jazz Seeds,SHIPSANITY, +2882,Shipping,Shipsanity: Kale Seeds,SHIPSANITY, +2883,Shipping,Shipsanity: Mahogany Seed,SHIPSANITY, +2884,Shipping,Shipsanity: Maple Seed,SHIPSANITY, +2885,Shipping,Shipsanity: Melon Seeds,SHIPSANITY, +2886,Shipping,Shipsanity: Mixed Seeds,SHIPSANITY, +2887,Shipping,Shipsanity: Orange Sapling,SHIPSANITY, +2888,Shipping,Shipsanity: Parsnip Seeds,SHIPSANITY, +2889,Shipping,Shipsanity: Peach Sapling,SHIPSANITY, +2890,Shipping,Shipsanity: Pepper Seeds,SHIPSANITY, +2891,Shipping,Shipsanity: Pine Cone,SHIPSANITY, +2892,Shipping,Shipsanity: Pomegranate Sapling,SHIPSANITY, +2893,Shipping,Shipsanity: Poppy Seeds,SHIPSANITY, +2894,Shipping,Shipsanity: Potato Seeds,SHIPSANITY, +2895,Shipping,Shipsanity: Pumpkin Seeds,SHIPSANITY, +2896,Shipping,Shipsanity: Radish Seeds,SHIPSANITY, +2897,Shipping,Shipsanity: Rare Seed,SHIPSANITY, +2898,Shipping,Shipsanity: Red Cabbage Seeds,SHIPSANITY, +2899,Shipping,Shipsanity: Rhubarb Seeds,SHIPSANITY, +2900,Shipping,Shipsanity: Rice Shoot,SHIPSANITY, +2901,Shipping,Shipsanity: Spangle Seeds,SHIPSANITY, +2902,Shipping,Shipsanity: Spring Seeds,SHIPSANITY, +2903,Shipping,Shipsanity: Starfruit Seeds,SHIPSANITY, +2904,Shipping,Shipsanity: Strawberry Seeds,SHIPSANITY, +2905,Shipping,Shipsanity: Summer Seeds,SHIPSANITY, +2906,Shipping,Shipsanity: Sunflower Seeds,SHIPSANITY, +2907,Shipping,Shipsanity: Tea Sapling,SHIPSANITY, +2908,Shipping,Shipsanity: Tomato Seeds,SHIPSANITY, +2909,Shipping,Shipsanity: Tulip Bulb,SHIPSANITY, +2910,Shipping,Shipsanity: Wheat Seeds,SHIPSANITY, +2911,Shipping,Shipsanity: Winter Seeds,SHIPSANITY, +2912,Shipping,Shipsanity: Yam Seeds,SHIPSANITY, +2913,Shipping,Shipsanity: Broken CD,SHIPSANITY, +2914,Shipping,Shipsanity: Broken Glasses,SHIPSANITY, +2915,Shipping,Shipsanity: Driftwood,SHIPSANITY, +2916,Shipping,Shipsanity: Joja Cola,SHIPSANITY, +2917,Shipping,Shipsanity: Soggy Newspaper,SHIPSANITY, +2918,Shipping,Shipsanity: Trash,SHIPSANITY, +2919,Shipping,Shipsanity: Bug Meat,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2920,Shipping,Shipsanity: Golden Egg,SHIPSANITY, +2921,Shipping,Shipsanity: Ostrich Egg,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2922,Shipping,Shipsanity: Fossilized Leg,"GINGER_ISLAND,SHIPSANITY", +2923,Shipping,Shipsanity: Fossilized Ribs,"GINGER_ISLAND,SHIPSANITY", +2924,Shipping,Shipsanity: Fossilized Skull,"GINGER_ISLAND,SHIPSANITY", +2925,Shipping,Shipsanity: Fossilized Spine,"GINGER_ISLAND,SHIPSANITY", +2926,Shipping,Shipsanity: Fossilized Tail,"GINGER_ISLAND,SHIPSANITY", +2927,Shipping,Shipsanity: Mummified Bat,"GINGER_ISLAND,SHIPSANITY", +2928,Shipping,Shipsanity: Mummified Frog,"GINGER_ISLAND,SHIPSANITY", +2929,Shipping,Shipsanity: Snake Skull,"GINGER_ISLAND,SHIPSANITY", +2930,Shipping,Shipsanity: Snake Vertebrae,"GINGER_ISLAND,SHIPSANITY", +2931,Shipping,Shipsanity: Banana Pudding,"GINGER_ISLAND,SHIPSANITY", +2932,Shipping,Shipsanity: Ginger Ale,"GINGER_ISLAND,SHIPSANITY", +2933,Shipping,Shipsanity: Mango Sticky Rice,"GINGER_ISLAND,SHIPSANITY", +2934,Shipping,Shipsanity: Pina Colada,"GINGER_ISLAND,SHIPSANITY", +2935,Shipping,Shipsanity: Poi,"GINGER_ISLAND,SHIPSANITY", +2936,Shipping,Shipsanity: Tropical Curry,"GINGER_ISLAND,SHIPSANITY", +2937,Shipping,Shipsanity: Deluxe Fertilizer,"GINGER_ISLAND,SHIPSANITY", +2938,Shipping,Shipsanity: Deluxe Retaining Soil,"GINGER_ISLAND,SHIPSANITY", +2939,Shipping,Shipsanity: Fairy Dust,"GINGER_ISLAND,SHIPSANITY", +2940,Shipping,Shipsanity: Hyper Speed-Gro,"GINGER_ISLAND,SHIPSANITY", +2941,Shipping,Shipsanity: Magic Bait,"GINGER_ISLAND,SHIPSANITY", +2942,Shipping,Shipsanity: Banana,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2943,Shipping,Shipsanity: Mango,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2944,Shipping,Shipsanity: Pineapple,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2945,Shipping,Shipsanity: Qi Fruit,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,REQUIRES_QI_ORDERS", +2946,Shipping,Shipsanity: Taro Root,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2947,Shipping,Shipsanity: Blue Discus,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH", +2948,Shipping,Shipsanity: Glacierfish Jr.,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH,REQUIRES_QI_ORDERS", +2949,Shipping,Shipsanity: Legend II,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH,REQUIRES_QI_ORDERS", +2950,Shipping,Shipsanity: Lionfish,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH", +2951,Shipping,Shipsanity: Ms. Angler,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH,REQUIRES_QI_ORDERS", +2952,Shipping,Shipsanity: Radioactive Carp,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH,REQUIRES_QI_ORDERS", +2953,Shipping,Shipsanity: Son of Crimsonfish,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH,REQUIRES_QI_ORDERS", +2954,Shipping,Shipsanity: Stingray,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FISH", +2955,Shipping,Shipsanity: Ginger,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2956,Shipping,Shipsanity: Magma Cap,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT", +2957,Shipping,Shipsanity: Cinder Shard,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FULL_SHIPMENT", +2958,Shipping,Shipsanity: Dragon Tooth,"GINGER_ISLAND,SHIPSANITY", +2959,Shipping,Shipsanity: Qi Seasoning,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS", +2960,Shipping,Shipsanity: Radioactive Bar,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,REQUIRES_QI_ORDERS", +2961,Shipping,Shipsanity: Radioactive Ore,"GINGER_ISLAND,SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,REQUIRES_QI_ORDERS", +2962,Shipping,Shipsanity: Enricher,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS", +2963,Shipping,Shipsanity: Pressure Nozzle,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS", +2964,Shipping,Shipsanity: Galaxy Soul,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS", +2965,Shipping,Shipsanity: Tiger Slime Egg,"GINGER_ISLAND,SHIPSANITY", +2966,Shipping,Shipsanity: Movie Ticket,"SHIPSANITY", +2967,Shipping,Shipsanity: Journal Scrap,"GINGER_ISLAND,SHIPSANITY", +2968,Shipping,Shipsanity: Banana Sapling,"GINGER_ISLAND,SHIPSANITY", +2969,Shipping,Shipsanity: Mango Sapling,"GINGER_ISLAND,SHIPSANITY", +2970,Shipping,Shipsanity: Mushroom Tree Seed,"GINGER_ISLAND,SHIPSANITY,REQUIRES_QI_ORDERS", +2971,Shipping,Shipsanity: Pineapple Seeds,"GINGER_ISLAND,SHIPSANITY", +2972,Shipping,Shipsanity: Qi Bean,"GINGER_ISLAND,SHIPSANITY", +2973,Shipping,Shipsanity: Taro Tuber,"GINGER_ISLAND,SHIPSANITY", +3001,Adventurer's Guild,Monster Eradication: Slimes,"MONSTERSANITY,MONSTERSANITY_GOALS", +3002,Adventurer's Guild,Monster Eradication: Void Spirits,"MONSTERSANITY,MONSTERSANITY_GOALS", +3003,Adventurer's Guild,Monster Eradication: Bats,"MONSTERSANITY,MONSTERSANITY_GOALS", +3004,Adventurer's Guild,Monster Eradication: Skeletons,"MONSTERSANITY,MONSTERSANITY_GOALS", +3005,Adventurer's Guild,Monster Eradication: Cave Insects,"MONSTERSANITY,MONSTERSANITY_GOALS", +3006,Adventurer's Guild,Monster Eradication: Duggies,"MONSTERSANITY,MONSTERSANITY_GOALS", +3007,Adventurer's Guild,Monster Eradication: Dust Sprites,"MONSTERSANITY,MONSTERSANITY_GOALS", +3008,Adventurer's Guild,Monster Eradication: Rock Crabs,"MONSTERSANITY,MONSTERSANITY_GOALS", +3009,Adventurer's Guild,Monster Eradication: Mummies,"MONSTERSANITY,MONSTERSANITY_GOALS", +3010,Adventurer's Guild,Monster Eradication: Pepper Rex,"MONSTERSANITY,MONSTERSANITY_GOALS,MONSTERSANITY_MONSTER", +3011,Adventurer's Guild,Monster Eradication: Serpents,"MONSTERSANITY,MONSTERSANITY_GOALS", +3012,Adventurer's Guild,Monster Eradication: Magma Sprites,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_GOALS", +3020,Adventurer's Guild,Monster Eradication: 200 Slimes,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3021,Adventurer's Guild,Monster Eradication: 400 Slimes,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3022,Adventurer's Guild,Monster Eradication: 600 Slimes,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3023,Adventurer's Guild,Monster Eradication: 800 Slimes,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3024,Adventurer's Guild,Monster Eradication: 30 Void Spirits,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3025,Adventurer's Guild,Monster Eradication: 60 Void Spirits,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3026,Adventurer's Guild,Monster Eradication: 90 Void Spirits,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3027,Adventurer's Guild,Monster Eradication: 120 Void Spirits,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3028,Adventurer's Guild,Monster Eradication: 40 Bats,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3029,Adventurer's Guild,Monster Eradication: 80 Bats,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3030,Adventurer's Guild,Monster Eradication: 120 Bats,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3031,Adventurer's Guild,Monster Eradication: 160 Bats,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3032,Adventurer's Guild,Monster Eradication: 10 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3033,Adventurer's Guild,Monster Eradication: 20 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3034,Adventurer's Guild,Monster Eradication: 30 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3035,Adventurer's Guild,Monster Eradication: 40 Skeletons,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3036,Adventurer's Guild,Monster Eradication: 25 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3037,Adventurer's Guild,Monster Eradication: 50 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3038,Adventurer's Guild,Monster Eradication: 75 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3039,Adventurer's Guild,Monster Eradication: 100 Cave Insects,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3040,Adventurer's Guild,Monster Eradication: 6 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3041,Adventurer's Guild,Monster Eradication: 12 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3042,Adventurer's Guild,Monster Eradication: 18 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3043,Adventurer's Guild,Monster Eradication: 24 Duggies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3044,Adventurer's Guild,Monster Eradication: 100 Dust Sprites,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3045,Adventurer's Guild,Monster Eradication: 200 Dust Sprites,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3046,Adventurer's Guild,Monster Eradication: 300 Dust Sprites,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3047,Adventurer's Guild,Monster Eradication: 400 Dust Sprites,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3048,Adventurer's Guild,Monster Eradication: 12 Rock Crabs,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3049,Adventurer's Guild,Monster Eradication: 24 Rock Crabs,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3050,Adventurer's Guild,Monster Eradication: 36 Rock Crabs,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3051,Adventurer's Guild,Monster Eradication: 48 Rock Crabs,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3052,Adventurer's Guild,Monster Eradication: 20 Mummies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3053,Adventurer's Guild,Monster Eradication: 40 Mummies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3054,Adventurer's Guild,Monster Eradication: 60 Mummies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3055,Adventurer's Guild,Monster Eradication: 80 Mummies,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3056,Adventurer's Guild,Monster Eradication: 10 Pepper Rex,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3057,Adventurer's Guild,Monster Eradication: 20 Pepper Rex,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3058,Adventurer's Guild,Monster Eradication: 30 Pepper Rex,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3059,Adventurer's Guild,Monster Eradication: 40 Pepper Rex,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3060,Adventurer's Guild,Monster Eradication: 50 Serpents,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3061,Adventurer's Guild,Monster Eradication: 100 Serpents,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3062,Adventurer's Guild,Monster Eradication: 150 Serpents,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3063,Adventurer's Guild,Monster Eradication: 200 Serpents,"MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3064,Adventurer's Guild,Monster Eradication: 30 Magma Sprites,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3065,Adventurer's Guild,Monster Eradication: 60 Magma Sprites,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3066,Adventurer's Guild,Monster Eradication: 90 Magma Sprites,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3067,Adventurer's Guild,Monster Eradication: 120 Magma Sprites,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_PROGRESSIVE_GOALS", +3101,Adventurer's Guild,Monster Eradication: Green Slime,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3102,Adventurer's Guild,Monster Eradication: Frost Jelly,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3103,Adventurer's Guild,Monster Eradication: Sludge,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3104,Adventurer's Guild,Monster Eradication: Tiger Slime,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_MONSTER", +3105,Adventurer's Guild,Monster Eradication: Shadow Shaman,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3106,Adventurer's Guild,Monster Eradication: Shadow Brute,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3107,Adventurer's Guild,Monster Eradication: Shadow Sniper,"GINGER_ISLAND,REQUIRES_QI_ORDERS,MONSTERSANITY,MONSTERSANITY_MONSTER", +3108,Adventurer's Guild,Monster Eradication: Bat,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3109,Adventurer's Guild,Monster Eradication: Frost Bat,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3110,Adventurer's Guild,Monster Eradication: Lava Bat,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3111,Adventurer's Guild,Monster Eradication: Iridium Bat,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3112,Adventurer's Guild,Monster Eradication: Skeleton,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3113,Adventurer's Guild,Monster Eradication: Skeleton Mage,"GINGER_ISLAND,REQUIRES_QI_ORDERS,MONSTERSANITY,MONSTERSANITY_MONSTER", +3114,Adventurer's Guild,Monster Eradication: Bug,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3115,Adventurer's Guild,Monster Eradication: Fly,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3116,Adventurer's Guild,Monster Eradication: Grub,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3117,Adventurer's Guild,Monster Eradication: Duggy,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3118,Adventurer's Guild,Monster Eradication: Magma Duggy,"GINGER_ISLAND,REQUIRES_QI_ORDERS,MONSTERSANITY,MONSTERSANITY_MONSTER", +3119,Adventurer's Guild,Monster Eradication: Dust Sprite,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3120,Adventurer's Guild,Monster Eradication: Rock Crab,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3121,Adventurer's Guild,Monster Eradication: Lava Crab,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3122,Adventurer's Guild,Monster Eradication: Iridium Crab,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3123,Adventurer's Guild,Monster Eradication: Mummy,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3124,Adventurer's Guild,Monster Eradication: Serpent,"MONSTERSANITY,MONSTERSANITY_MONSTER", +3125,Adventurer's Guild,Monster Eradication: Royal Serpent,"GINGER_ISLAND,REQUIRES_QI_ORDERS,MONSTERSANITY,MONSTERSANITY_MONSTER", +3126,Adventurer's Guild,Monster Eradication: Magma Sprite,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_MONSTER", +3127,Adventurer's Guild,Monster Eradication: Magma Sparker,"GINGER_ISLAND,MONSTERSANITY,MONSTERSANITY_MONSTER", +3201,Kitchen,Cook Algae Soup,COOKSANITY, +3202,Kitchen,Cook Artichoke Dip,"COOKSANITY,COOKSANITY_QOS", +3203,Kitchen,Cook Autumn's Bounty,COOKSANITY, +3204,Kitchen,Cook Baked Fish,"COOKSANITY,COOKSANITY_QOS", +3205,Kitchen,Cook Banana Pudding,"COOKSANITY,GINGER_ISLAND", +3206,Kitchen,Cook Bean Hotpot,COOKSANITY, +3207,Kitchen,Cook Blackberry Cobbler,"COOKSANITY,COOKSANITY_QOS", +3208,Kitchen,Cook Blueberry Tart,COOKSANITY, +3209,Kitchen,Cook Bread,"COOKSANITY,COOKSANITY_QOS", +3210,Kitchen,Cook Bruschetta,"COOKSANITY,COOKSANITY_QOS", +3211,Kitchen,Cook Carp Surprise,"COOKSANITY,COOKSANITY_QOS", +3212,Kitchen,Cook Cheese Cauliflower,COOKSANITY, +3213,Kitchen,Cook Chocolate Cake,"COOKSANITY,COOKSANITY_QOS", +3214,Kitchen,Cook Chowder,COOKSANITY, +3215,Kitchen,Cook Coleslaw,"COOKSANITY,COOKSANITY_QOS", +3216,Kitchen,Cook Complete Breakfast,"COOKSANITY,COOKSANITY_QOS", +3217,Kitchen,Cook Cookies,COOKSANITY, +3218,Kitchen,Cook Crab Cakes,"COOKSANITY,COOKSANITY_QOS", +3219,Kitchen,Cook Cranberry Candy,"COOKSANITY,COOKSANITY_QOS", +3220,Kitchen,Cook Cranberry Sauce,COOKSANITY, +3221,Kitchen,Cook Crispy Bass,COOKSANITY, +3222,Kitchen,Cook Dish O' The Sea,COOKSANITY, +3223,Kitchen,Cook Eggplant Parmesan,COOKSANITY, +3224,Kitchen,Cook Escargot,COOKSANITY, +3225,Kitchen,Cook Farmer's Lunch,COOKSANITY, +3226,Kitchen,Cook Fiddlehead Risotto,"COOKSANITY,COOKSANITY_QOS", +3227,Kitchen,Cook Fish Stew,COOKSANITY, +3228,Kitchen,Cook Fish Taco,COOKSANITY, +3229,Kitchen,Cook Fried Calamari,COOKSANITY, +3230,Kitchen,Cook Fried Eel,COOKSANITY, +3231,Kitchen,Cook Fried Egg,COOKSANITY, +3232,Kitchen,Cook Fried Mushroom,COOKSANITY, +3233,Kitchen,Cook Fruit Salad,"COOKSANITY,COOKSANITY_QOS", +3234,Kitchen,Cook Ginger Ale,"COOKSANITY,GINGER_ISLAND", +3235,Kitchen,Cook Glazed Yams,"COOKSANITY,COOKSANITY_QOS", +3236,Kitchen,Cook Hashbrowns,"COOKSANITY,COOKSANITY_QOS", +3237,Kitchen,Cook Ice Cream,COOKSANITY, +3238,Kitchen,Cook Lobster Bisque,"COOKSANITY,COOKSANITY_QOS", +3239,Kitchen,Cook Lucky Lunch,"COOKSANITY,COOKSANITY_QOS", +3240,Kitchen,Cook Maki Roll,"COOKSANITY,COOKSANITY_QOS", +3241,Kitchen,Cook Mango Sticky Rice,"COOKSANITY,GINGER_ISLAND", +3242,Kitchen,Cook Maple Bar,"COOKSANITY,COOKSANITY_QOS", +3243,Kitchen,Cook Miner's Treat,COOKSANITY, +3244,Kitchen,Cook Omelet,"COOKSANITY,COOKSANITY_QOS", +3245,Kitchen,Cook Pale Broth,COOKSANITY, +3246,Kitchen,Cook Pancakes,"COOKSANITY,COOKSANITY_QOS", +3247,Kitchen,Cook Parsnip Soup,COOKSANITY, +3248,Kitchen,Cook Pepper Poppers,COOKSANITY, +3249,Kitchen,Cook Pink Cake,"COOKSANITY,COOKSANITY_QOS", +3250,Kitchen,Cook Pizza,"COOKSANITY,COOKSANITY_QOS", +3251,Kitchen,Cook Plum Pudding,"COOKSANITY,COOKSANITY_QOS", +3252,Kitchen,Cook Poi,"COOKSANITY,GINGER_ISLAND", +3253,Kitchen,Cook Poppyseed Muffin,"COOKSANITY,COOKSANITY_QOS", +3254,Kitchen,Cook Pumpkin Pie,"COOKSANITY,COOKSANITY_QOS", +3255,Kitchen,Cook Pumpkin Soup,COOKSANITY, +3256,Kitchen,Cook Radish Salad,"COOKSANITY,COOKSANITY_QOS", +3257,Kitchen,Cook Red Plate,COOKSANITY, +3258,Kitchen,Cook Rhubarb Pie,COOKSANITY, +3259,Kitchen,Cook Rice Pudding,COOKSANITY, +3260,Kitchen,Cook Roasted Hazelnuts,"COOKSANITY,COOKSANITY_QOS", +3261,Kitchen,Cook Roots Platter,COOKSANITY, +3262,Kitchen,Cook Salad,COOKSANITY, +3263,Kitchen,Cook Salmon Dinner,COOKSANITY, +3264,Kitchen,Cook Sashimi,COOKSANITY, +3265,Kitchen,Cook Seafoam Pudding,COOKSANITY, +3266,Kitchen,Cook Shrimp Cocktail,"COOKSANITY,COOKSANITY_QOS", +3267,Kitchen,Cook Spaghetti,COOKSANITY, +3268,Kitchen,Cook Spicy Eel,COOKSANITY, +3269,Kitchen,Cook Squid Ink Ravioli,COOKSANITY, +3270,Kitchen,Cook Stir Fry,"COOKSANITY,COOKSANITY_QOS", +3271,Kitchen,Cook Strange Bun,COOKSANITY, +3272,Kitchen,Cook Stuffing,COOKSANITY, +3273,Kitchen,Cook Super Meal,COOKSANITY, +3274,Kitchen,Cook Survival Burger,COOKSANITY, +3275,Kitchen,Cook Tom Kha Soup,COOKSANITY, +3276,Kitchen,Cook Tortilla,"COOKSANITY,COOKSANITY_QOS", +3277,Kitchen,Cook Triple Shot Espresso,COOKSANITY, +3278,Kitchen,Cook Tropical Curry,"COOKSANITY,GINGER_ISLAND", +3279,Kitchen,Cook Trout Soup,"COOKSANITY,COOKSANITY_QOS", +3280,Kitchen,Cook Vegetable Medley,COOKSANITY, +3301,Farm,Algae Soup Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3302,The Queen of Sauce,Artichoke Dip Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3303,Farm,Autumn's Bounty Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3304,The Queen of Sauce,Baked Fish Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3305,Farm,Banana Pudding Recipe,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +3306,Farm,Bean Hotpot Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3307,The Queen of Sauce,Blackberry Cobbler Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3308,Farm,Blueberry Tart Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3309,The Queen of Sauce,Bread Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_FRIENDSHIP,CHEFSANITY_PURCHASE", +3310,The Queen of Sauce,Bruschetta Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3311,The Queen of Sauce,Carp Surprise Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3312,Farm,Cheese Cauliflower Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3313,The Queen of Sauce,Chocolate Cake Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3314,Farm,Chowder Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3315,The Queen of Sauce,Coleslaw Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3316,The Queen of Sauce,Complete Breakfast Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3317,Farm,Cookies Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3318,The Queen of Sauce,Crab Cakes Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3319,The Queen of Sauce,Cranberry Candy Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3320,Farm,Cranberry Sauce Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3321,Farm,Crispy Bass Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3322,Farm,Dish O' The Sea Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3323,Farm,Eggplant Parmesan Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3324,Farm,Escargot Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3325,Farm,Farmer's Lunch Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3326,The Queen of Sauce,Fiddlehead Risotto Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3327,Farm,Fish Stew Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3328,Farm,Fish Taco Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3329,Farm,Fried Calamari Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3330,Farm,Fried Eel Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3331,Farm,Fried Egg Recipe,CHEFSANITY_STARTER, +3332,Farm,Fried Mushroom Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3333,The Queen of Sauce,Fruit Salad Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3334,Farm,Ginger Ale Recipe,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +3335,The Queen of Sauce,Glazed Yams Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3336,The Queen of Sauce,Hashbrowns Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3337,Farm,Ice Cream Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3338,The Queen of Sauce,Lobster Bisque Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_FRIENDSHIP", +3339,The Queen of Sauce,Lucky Lunch Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3340,The Queen of Sauce,Maki Roll Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3341,Farm,Mango Sticky Rice Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP,GINGER_ISLAND", +3342,The Queen of Sauce,Maple Bar Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3343,Farm,Miner's Treat Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3344,The Queen of Sauce,Omelet Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3345,Farm,Pale Broth Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3346,The Queen of Sauce,Pancakes Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3347,Farm,Parsnip Soup Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3348,Farm,Pepper Poppers Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3349,The Queen of Sauce,Pink Cake Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3350,The Queen of Sauce,Pizza Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3351,The Queen of Sauce,Plum Pudding Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3352,Farm,Poi Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP,GINGER_ISLAND", +3353,The Queen of Sauce,Poppyseed Muffin Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3354,The Queen of Sauce,Pumpkin Pie Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3355,Farm,Pumpkin Soup Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3356,The Queen of Sauce,Radish Salad Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3357,Farm,Red Plate Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3358,Farm,Rhubarb Pie Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3359,Farm,Rice Pudding Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3360,The Queen of Sauce,Roasted Hazelnuts Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3361,Farm,Roots Platter Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3362,Farm,Salad Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3363,Farm,Salmon Dinner Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3364,Farm,Sashimi Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3365,Farm,Seafoam Pudding Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3366,The Queen of Sauce,Shrimp Cocktail Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3367,Farm,Spaghetti Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3368,Farm,Spicy Eel Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3369,Farm,Squid Ink Ravioli Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3370,The Queen of Sauce,Stir Fry Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3371,Farm,Strange Bun Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3372,Farm,Stuffing Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3373,Farm,Super Meal Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3374,Farm,Survival Burger Recipe,"CHEFSANITY,CHEFSANITY_SKILL", +3375,Farm,Tom Kha Soup Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3376,The Queen of Sauce,Tortilla Recipe,"CHEFSANITY,CHEFSANITY_QOS,CHEFSANITY_PURCHASE", +3377,Saloon,Triple Shot Espresso Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE", +3378,Island Resort,Tropical Curry Recipe,"CHEFSANITY,GINGER_ISLAND,CHEFSANITY_PURCHASE", +3379,The Queen of Sauce,Trout Soup Recipe,"CHEFSANITY,CHEFSANITY_QOS", +3380,Farm,Vegetable Medley Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP", +3401,Farm,Craft Cherry Bomb,CRAFTSANITY, +3402,Farm,Craft Bomb,CRAFTSANITY, +3403,Farm,Craft Mega Bomb,CRAFTSANITY, +3404,Farm,Craft Gate,CRAFTSANITY, +3405,Farm,Craft Wood Fence,CRAFTSANITY, +3406,Farm,Craft Stone Fence,CRAFTSANITY, +3407,Farm,Craft Iron Fence,CRAFTSANITY, +3408,Farm,Craft Hardwood Fence,CRAFTSANITY, +3409,Farm,Craft Sprinkler,CRAFTSANITY, +3410,Farm,Craft Quality Sprinkler,CRAFTSANITY, +3411,Farm,Craft Iridium Sprinkler,CRAFTSANITY, +3412,Farm,Craft Bee House,CRAFTSANITY, +3413,Farm,Craft Cask,CRAFTSANITY, +3414,Farm,Craft Cheese Press,CRAFTSANITY, +3415,Farm,Craft Keg,CRAFTSANITY, +3416,Farm,Craft Loom,CRAFTSANITY, +3417,Farm,Craft Mayonnaise Machine,CRAFTSANITY, +3418,Farm,Craft Oil Maker,CRAFTSANITY, +3419,Farm,Craft Preserves Jar,CRAFTSANITY, +3420,Farm,Craft Basic Fertilizer,CRAFTSANITY, +3421,Farm,Craft Quality Fertilizer,CRAFTSANITY, +3422,Farm,Craft Deluxe Fertilizer,CRAFTSANITY, +3423,Farm,Craft Speed-Gro,CRAFTSANITY, +3424,Farm,Craft Deluxe Speed-Gro,CRAFTSANITY, +3425,Farm,Craft Hyper Speed-Gro,"CRAFTSANITY,GINGER_ISLAND", +3426,Farm,Craft Basic Retaining Soil,CRAFTSANITY, +3427,Farm,Craft Quality Retaining Soil,CRAFTSANITY, +3428,Farm,Craft Deluxe Retaining Soil,"CRAFTSANITY,GINGER_ISLAND", +3429,Farm,Craft Tree Fertilizer,CRAFTSANITY, +3430,Farm,Craft Spring Seeds,CRAFTSANITY, +3431,Farm,Craft Summer Seeds,CRAFTSANITY, +3432,Farm,Craft Fall Seeds,CRAFTSANITY, +3433,Farm,Craft Winter Seeds,CRAFTSANITY, +3434,Farm,Craft Ancient Seeds,CRAFTSANITY, +3435,Farm,Craft Grass Starter,CRAFTSANITY, +3436,Farm,Craft Tea Sapling,CRAFTSANITY, +3437,Farm,Craft Fiber Seeds,CRAFTSANITY, +3438,Farm,Craft Wood Floor,CRAFTSANITY, +3439,Farm,Craft Rustic Plank Floor,CRAFTSANITY, +3440,Farm,Craft Straw Floor,CRAFTSANITY, +3441,Farm,Craft Weathered Floor,CRAFTSANITY, +3442,Farm,Craft Crystal Floor,CRAFTSANITY, +3443,Farm,Craft Stone Floor,CRAFTSANITY, +3444,Farm,Craft Stone Walkway Floor,CRAFTSANITY, +3445,Farm,Craft Brick Floor,CRAFTSANITY, +3446,Farm,Craft Wood Path,CRAFTSANITY, +3447,Farm,Craft Gravel Path,CRAFTSANITY, +3448,Farm,Craft Cobblestone Path,CRAFTSANITY, +3449,Farm,Craft Stepping Stone Path,CRAFTSANITY, +3450,Farm,Craft Crystal Path,CRAFTSANITY, +3451,Farm,Craft Spinner,CRAFTSANITY, +3452,Farm,Craft Trap Bobber,CRAFTSANITY, +3453,Farm,Craft Cork Bobber,CRAFTSANITY, +3454,Farm,Craft Quality Bobber,CRAFTSANITY, +3455,Farm,Craft Treasure Hunter,CRAFTSANITY, +3456,Farm,Craft Dressed Spinner,CRAFTSANITY, +3457,Farm,Craft Barbed Hook,CRAFTSANITY, +3458,Farm,Craft Magnet,CRAFTSANITY, +3459,Farm,Craft Bait,CRAFTSANITY, +3460,Farm,Craft Wild Bait,CRAFTSANITY, +3461,Farm,Craft Magic Bait,"CRAFTSANITY,GINGER_ISLAND", +3462,Farm,Craft Crab Pot,CRAFTSANITY, +3463,Farm,Craft Sturdy Ring,CRAFTSANITY, +3464,Farm,Craft Warrior Ring,CRAFTSANITY, +3465,Farm,Craft Ring of Yoba,CRAFTSANITY, +3466,Farm,Craft Thorns Ring,"CRAFTSANITY,GINGER_ISLAND", +3467,Farm,Craft Glowstone Ring,CRAFTSANITY, +3468,Farm,Craft Iridium Band,CRAFTSANITY, +3469,Farm,Craft Wedding Ring,CRAFTSANITY, +3470,Farm,Craft Field Snack,CRAFTSANITY, +3471,Farm,Craft Bug Steak,CRAFTSANITY, +3472,Farm,Craft Life Elixir,CRAFTSANITY, +3473,Farm,Craft Oil of Garlic,CRAFTSANITY, +3474,Farm,Craft Monster Musk,CRAFTSANITY, +3475,Farm,Craft Fairy Dust,CRAFTSANITY, +3476,Farm,Craft Warp Totem: Beach,CRAFTSANITY, +3477,Farm,Craft Warp Totem: Mountains,CRAFTSANITY, +3478,Farm,Craft Warp Totem: Farm,CRAFTSANITY, +3479,Farm,Craft Warp Totem: Desert,CRAFTSANITY, +3480,Farm,Craft Warp Totem: Island,"CRAFTSANITY,GINGER_ISLAND", +3481,Farm,Craft Rain Totem,CRAFTSANITY, +3482,Farm,Craft Torch,CRAFTSANITY, +3483,Farm,Craft Campfire,CRAFTSANITY, +3484,Farm,Craft Wooden Brazier,CRAFTSANITY, +3485,Farm,Craft Stone Brazier,CRAFTSANITY, +3486,Farm,Craft Gold Brazier,CRAFTSANITY, +3487,Farm,Craft Carved Brazier,CRAFTSANITY, +3488,Farm,Craft Stump Brazier,CRAFTSANITY, +3489,Farm,Craft Barrel Brazier,CRAFTSANITY, +3490,Farm,Craft Skull Brazier,CRAFTSANITY, +3491,Farm,Craft Marble Brazier,CRAFTSANITY, +3492,Farm,Craft Wood Lamp-post,CRAFTSANITY, +3493,Farm,Craft Iron Lamp-post,CRAFTSANITY, +3494,Farm,Craft Jack-O-Lantern,CRAFTSANITY, +3495,Farm,Craft Bone Mill,CRAFTSANITY, +3496,Farm,Craft Charcoal Kiln,CRAFTSANITY, +3497,Farm,Craft Crystalarium,CRAFTSANITY, +3498,Farm,Craft Furnace,CRAFTSANITY, +3499,Farm,Craft Geode Crusher,CRAFTSANITY, +3500,Farm,Craft Heavy Tapper,"CRAFTSANITY,GINGER_ISLAND", +3501,Farm,Craft Lightning Rod,CRAFTSANITY, +3502,Farm,Craft Ostrich Incubator,"CRAFTSANITY,GINGER_ISLAND", +3503,Farm,Craft Recycling Machine,CRAFTSANITY, +3504,Farm,Craft Seed Maker,CRAFTSANITY, +3505,Farm,Craft Slime Egg-Press,CRAFTSANITY, +3506,Farm,Craft Slime Incubator,CRAFTSANITY, +3507,Farm,Craft Solar Panel,"CRAFTSANITY,GINGER_ISLAND", +3508,Farm,Craft Tapper,CRAFTSANITY, +3509,Farm,Craft Worm Bin,CRAFTSANITY, +3510,Farm,Craft Tub o' Flowers,CRAFTSANITY, +3511,Farm,Craft Wicked Statue,CRAFTSANITY, +3512,Farm,Craft Flute Block,CRAFTSANITY, +3513,Farm,Craft Drum Block,CRAFTSANITY, +3514,Farm,Craft Chest,CRAFTSANITY, +3515,Farm,Craft Stone Chest,CRAFTSANITY, +3516,Farm,Craft Wood Sign,CRAFTSANITY, +3517,Farm,Craft Stone Sign,CRAFTSANITY, +3518,Farm,Craft Dark Sign,CRAFTSANITY, +3519,Farm,Craft Garden Pot,CRAFTSANITY, +3520,Farm,Craft Scarecrow,CRAFTSANITY, +3521,Farm,Craft Deluxe Scarecrow,CRAFTSANITY, +3522,Farm,Craft Staircase,CRAFTSANITY, +3523,Farm,Craft Explosive Ammo,CRAFTSANITY, +3524,Farm,Craft Transmute (Fe),CRAFTSANITY, +3525,Farm,Craft Transmute (Au),CRAFTSANITY, +3526,Farm,Craft Mini-Jukebox,CRAFTSANITY, +3527,Farm,Craft Mini-Obelisk,CRAFTSANITY, +3528,Farm,Craft Farm Computer,CRAFTSANITY, +3529,Farm,Craft Hopper,"CRAFTSANITY,GINGER_ISLAND", +3530,Farm,Craft Cookout Kit,CRAFTSANITY, +3551,Pierre's General Store,Grass Starter Recipe,CRAFTSANITY, +3552,Carpenter Shop,Wood Floor Recipe,CRAFTSANITY, +3553,Carpenter Shop,Rustic Plank Floor Recipe,CRAFTSANITY, +3554,Carpenter Shop,Straw Floor Recipe,CRAFTSANITY, +3555,Mines Dwarf Shop,Weathered Floor Recipe,CRAFTSANITY, +3556,Sewer,Crystal Floor Recipe,CRAFTSANITY, +3557,Carpenter Shop,Stone Floor Recipe,CRAFTSANITY, +3558,Carpenter Shop,Stone Walkway Floor Recipe,CRAFTSANITY, +3559,Carpenter Shop,Brick Floor Recipe,CRAFTSANITY, +3560,Carpenter Shop,Stepping Stone Path Recipe,CRAFTSANITY, +3561,Carpenter Shop,Crystal Path Recipe,CRAFTSANITY, +3562,Traveling Cart,Wedding Ring Recipe,CRAFTSANITY, +3563,Volcano Dwarf Shop,Warp Totem: Island Recipe,"CRAFTSANITY,GINGER_ISLAND", +3564,Carpenter Shop,Wooden Brazier Recipe,CRAFTSANITY, +3565,Carpenter Shop,Stone Brazier Recipe,CRAFTSANITY, +3566,Carpenter Shop,Gold Brazier Recipe,CRAFTSANITY, +3567,Carpenter Shop,Carved Brazier Recipe,CRAFTSANITY, +3568,Carpenter Shop,Stump Brazier Recipe,CRAFTSANITY, +3569,Carpenter Shop,Barrel Brazier Recipe,CRAFTSANITY, +3570,Carpenter Shop,Skull Brazier Recipe,CRAFTSANITY, +3571,Carpenter Shop,Marble Brazier Recipe,CRAFTSANITY, +3572,Carpenter Shop,Wood Lamp-post Recipe,CRAFTSANITY, +3573,Carpenter Shop,Iron Lamp-post Recipe,CRAFTSANITY, +3574,Sewer,Wicked Statue Recipe,CRAFTSANITY, +3575,Desert,Warp Totem: Desert Recipe,"CRAFTSANITY", +3576,Island Trader,Deluxe Retaining Soil Recipe,"CRAFTSANITY,GINGER_ISLAND", +5001,Stardew Valley,Level 1 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5002,Stardew Valley,Level 2 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5003,Stardew Valley,Level 3 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5004,Stardew Valley,Level 4 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5005,Stardew Valley,Level 5 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5006,Stardew Valley,Level 6 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5007,Stardew Valley,Level 7 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5008,Stardew Valley,Level 8 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5009,Stardew Valley,Level 9 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5010,Stardew Valley,Level 10 Luck,"LUCK_LEVEL,SKILL_LEVEL",Luck Skill +5011,Stardew Valley,Level 1 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5012,Stardew Valley,Level 2 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5013,Stardew Valley,Level 3 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5014,Stardew Valley,Level 4 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5015,Stardew Valley,Level 5 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5016,Stardew Valley,Level 6 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5017,Stardew Valley,Level 7 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5018,Stardew Valley,Level 8 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5019,Stardew Valley,Level 9 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5020,Stardew Valley,Level 10 Socializing,"SKILL_LEVEL,SOCIALIZING_LEVEL",Socializing Skill +5021,Magic Altar,Level 1 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5022,Magic Altar,Level 2 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5023,Magic Altar,Level 3 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5024,Magic Altar,Level 4 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5025,Magic Altar,Level 5 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5026,Magic Altar,Level 6 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5027,Magic Altar,Level 7 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5028,Magic Altar,Level 8 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5029,Magic Altar,Level 9 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5030,Magic Altar,Level 10 Magic,"MAGIC_LEVEL,SKILL_LEVEL",Magic +5031,Town,Level 1 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5032,Town,Level 2 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5033,Town,Level 3 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5034,Town,Level 4 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5035,Town,Level 5 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5036,Town,Level 6 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5037,Town,Level 7 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5038,Town,Level 8 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5039,Town,Level 9 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5040,Town,Level 10 Binning,"BINNING_LEVEL,SKILL_LEVEL",Binning Skill +5041,Stardew Valley,Level 1 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5042,Stardew Valley,Level 2 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5043,Stardew Valley,Level 3 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5044,Stardew Valley,Level 4 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5045,Stardew Valley,Level 5 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5046,Stardew Valley,Level 6 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5047,Stardew Valley,Level 7 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5048,Stardew Valley,Level 8 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5049,Stardew Valley,Level 9 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5050,Stardew Valley,Level 10 Archaeology,"ARCHAEOLOGY_LEVEL,SKILL_LEVEL",Archaeology +5051,Stardew Valley,Level 1 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5052,Stardew Valley,Level 2 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5053,Stardew Valley,Level 3 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5054,Stardew Valley,Level 4 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5055,Stardew Valley,Level 5 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5056,Stardew Valley,Level 6 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5057,Stardew Valley,Level 7 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5058,Stardew Valley,Level 8 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5059,Stardew Valley,Level 9 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5060,Stardew Valley,Level 10 Cooking,"COOKING_LEVEL,SKILL_LEVEL",Cooking Skill +5501,Magic Altar,Analyze: Clear Debris,MANDATORY,Magic +5502,Magic Altar,Analyze: Till,MANDATORY,Magic +5503,Magic Altar,Analyze: Water,MANDATORY,Magic +5504,Magic Altar,Analyze All Toil School Locations,MANDATORY,Magic +5505,Magic Altar,Analyze: Evac,MANDATORY,Magic +5506,Magic Altar,Analyze: Haste,MANDATORY,Magic +5507,Magic Altar,Analyze: Heal,MANDATORY,Magic +5508,Magic Altar,Analyze All Life School Locations,MANDATORY,Magic +5509,Magic Altar,Analyze: Descend,MANDATORY,Magic +5510,Magic Altar,Analyze: Fireball,MANDATORY,Magic +5511,Magic Altar,Analyze: Frostbolt,MANDATORY,Magic +5512,Magic Altar,Analyze All Elemental School Locations,MANDATORY,Magic +5513,Magic Altar,Analyze: Lantern,MANDATORY,Magic +5514,Magic Altar,Analyze: Tendrils,MANDATORY,Magic +5515,Magic Altar,Analyze: Shockwave,MANDATORY,Magic +5516,Magic Altar,Analyze All Nature School Locations,MANDATORY,Magic +5517,Magic Altar,Analyze: Meteor,MANDATORY,Magic +5518,Magic Altar,Analyze: Lucksteal,MANDATORY,Magic +5519,Magic Altar,Analyze: Bloodmana,MANDATORY,Magic +5520,Magic Altar,Analyze All Eldritch School Locations,MANDATORY,Magic +5521,Magic Altar,Analyze Every Magic School Location,MANDATORY,Magic +6001,Museum,Friendsanity: Jasper 1 <3,FRIENDSANITY,Professor Jasper Thomas +6002,Museum,Friendsanity: Jasper 2 <3,FRIENDSANITY,Professor Jasper Thomas +6003,Museum,Friendsanity: Jasper 3 <3,FRIENDSANITY,Professor Jasper Thomas +6004,Museum,Friendsanity: Jasper 4 <3,FRIENDSANITY,Professor Jasper Thomas +6005,Museum,Friendsanity: Jasper 5 <3,FRIENDSANITY,Professor Jasper Thomas +6006,Museum,Friendsanity: Jasper 6 <3,FRIENDSANITY,Professor Jasper Thomas +6007,Museum,Friendsanity: Jasper 7 <3,FRIENDSANITY,Professor Jasper Thomas +6008,Museum,Friendsanity: Jasper 8 <3,FRIENDSANITY,Professor Jasper Thomas +6009,Museum,Friendsanity: Jasper 9 <3,FRIENDSANITY,Professor Jasper Thomas +6010,Museum,Friendsanity: Jasper 10 <3,FRIENDSANITY,Professor Jasper Thomas +6011,Museum,Friendsanity: Jasper 11 <3,FRIENDSANITY,Professor Jasper Thomas +6012,Museum,Friendsanity: Jasper 12 <3,FRIENDSANITY,Professor Jasper Thomas +6013,Museum,Friendsanity: Jasper 13 <3,FRIENDSANITY,Professor Jasper Thomas +6014,Museum,Friendsanity: Jasper 14 <3,FRIENDSANITY,Professor Jasper Thomas +6015,Yoba's Clearing,Friendsanity: Yoba 1 <3,FRIENDSANITY,Custom NPC - Yoba +6016,Yoba's Clearing,Friendsanity: Yoba 2 <3,FRIENDSANITY,Custom NPC - Yoba +6017,Yoba's Clearing,Friendsanity: Yoba 3 <3,FRIENDSANITY,Custom NPC - Yoba +6018,Yoba's Clearing,Friendsanity: Yoba 4 <3,FRIENDSANITY,Custom NPC - Yoba +6019,Yoba's Clearing,Friendsanity: Yoba 5 <3,FRIENDSANITY,Custom NPC - Yoba +6020,Yoba's Clearing,Friendsanity: Yoba 6 <3,FRIENDSANITY,Custom NPC - Yoba +6021,Yoba's Clearing,Friendsanity: Yoba 7 <3,FRIENDSANITY,Custom NPC - Yoba +6022,Yoba's Clearing,Friendsanity: Yoba 8 <3,FRIENDSANITY,Custom NPC - Yoba +6023,Yoba's Clearing,Friendsanity: Yoba 9 <3,FRIENDSANITY,Custom NPC - Yoba +6024,Yoba's Clearing,Friendsanity: Yoba 10 <3,FRIENDSANITY,Custom NPC - Yoba +6025,Marnie's Ranch,Friendsanity: Mr. Ginger 1 <3,FRIENDSANITY,Mister Ginger (cat npc) +6026,Marnie's Ranch,Friendsanity: Mr. Ginger 2 <3,FRIENDSANITY,Mister Ginger (cat npc) +6027,Marnie's Ranch,Friendsanity: Mr. Ginger 3 <3,FRIENDSANITY,Mister Ginger (cat npc) +6028,Marnie's Ranch,Friendsanity: Mr. Ginger 4 <3,FRIENDSANITY,Mister Ginger (cat npc) +6029,Marnie's Ranch,Friendsanity: Mr. Ginger 5 <3,FRIENDSANITY,Mister Ginger (cat npc) +6030,Marnie's Ranch,Friendsanity: Mr. Ginger 6 <3,FRIENDSANITY,Mister Ginger (cat npc) +6031,Marnie's Ranch,Friendsanity: Mr. Ginger 7 <3,FRIENDSANITY,Mister Ginger (cat npc) +6032,Marnie's Ranch,Friendsanity: Mr. Ginger 8 <3,FRIENDSANITY,Mister Ginger (cat npc) +6033,Marnie's Ranch,Friendsanity: Mr. Ginger 9 <3,FRIENDSANITY,Mister Ginger (cat npc) +6034,Marnie's Ranch,Friendsanity: Mr. Ginger 10 <3,FRIENDSANITY,Mister Ginger (cat npc) +6035,Town,Friendsanity: Ayeisha 1 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6036,Town,Friendsanity: Ayeisha 2 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6037,Town,Friendsanity: Ayeisha 3 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6038,Town,Friendsanity: Ayeisha 4 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6039,Town,Friendsanity: Ayeisha 5 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6040,Town,Friendsanity: Ayeisha 6 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6041,Town,Friendsanity: Ayeisha 7 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6042,Town,Friendsanity: Ayeisha 8 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6043,Town,Friendsanity: Ayeisha 9 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6044,Town,Friendsanity: Ayeisha 10 <3,FRIENDSANITY,Ayeisha - The Postal Worker (Custom NPC) +6045,Saloon,Friendsanity: Shiko 1 <3,FRIENDSANITY,Shiko - New Custom NPC +6046,Saloon,Friendsanity: Shiko 2 <3,FRIENDSANITY,Shiko - New Custom NPC +6047,Saloon,Friendsanity: Shiko 3 <3,FRIENDSANITY,Shiko - New Custom NPC +6048,Saloon,Friendsanity: Shiko 4 <3,FRIENDSANITY,Shiko - New Custom NPC +6049,Saloon,Friendsanity: Shiko 5 <3,FRIENDSANITY,Shiko - New Custom NPC +6050,Saloon,Friendsanity: Shiko 6 <3,FRIENDSANITY,Shiko - New Custom NPC +6051,Saloon,Friendsanity: Shiko 7 <3,FRIENDSANITY,Shiko - New Custom NPC +6052,Saloon,Friendsanity: Shiko 8 <3,FRIENDSANITY,Shiko - New Custom NPC +6053,Saloon,Friendsanity: Shiko 9 <3,FRIENDSANITY,Shiko - New Custom NPC +6054,Saloon,Friendsanity: Shiko 10 <3,FRIENDSANITY,Shiko - New Custom NPC +6055,Saloon,Friendsanity: Shiko 11 <3,FRIENDSANITY,Shiko - New Custom NPC +6056,Saloon,Friendsanity: Shiko 12 <3,FRIENDSANITY,Shiko - New Custom NPC +6057,Saloon,Friendsanity: Shiko 13 <3,FRIENDSANITY,Shiko - New Custom NPC +6058,Saloon,Friendsanity: Shiko 14 <3,FRIENDSANITY,Shiko - New Custom NPC +6059,Wizard Tower,Friendsanity: Wellwick 1 <3,FRIENDSANITY,'Prophet' Wellwick +6060,Wizard Tower,Friendsanity: Wellwick 2 <3,FRIENDSANITY,'Prophet' Wellwick +6061,Wizard Tower,Friendsanity: Wellwick 3 <3,FRIENDSANITY,'Prophet' Wellwick +6062,Wizard Tower,Friendsanity: Wellwick 4 <3,FRIENDSANITY,'Prophet' Wellwick +6063,Wizard Tower,Friendsanity: Wellwick 5 <3,FRIENDSANITY,'Prophet' Wellwick +6064,Wizard Tower,Friendsanity: Wellwick 6 <3,FRIENDSANITY,'Prophet' Wellwick +6065,Wizard Tower,Friendsanity: Wellwick 7 <3,FRIENDSANITY,'Prophet' Wellwick +6066,Wizard Tower,Friendsanity: Wellwick 8 <3,FRIENDSANITY,'Prophet' Wellwick +6067,Wizard Tower,Friendsanity: Wellwick 9 <3,FRIENDSANITY,'Prophet' Wellwick +6068,Wizard Tower,Friendsanity: Wellwick 10 <3,FRIENDSANITY,'Prophet' Wellwick +6069,Wizard Tower,Friendsanity: Wellwick 11 <3,FRIENDSANITY,'Prophet' Wellwick +6070,Wizard Tower,Friendsanity: Wellwick 12 <3,FRIENDSANITY,'Prophet' Wellwick +6071,Wizard Tower,Friendsanity: Wellwick 13 <3,FRIENDSANITY,'Prophet' Wellwick +6072,Wizard Tower,Friendsanity: Wellwick 14 <3,FRIENDSANITY,'Prophet' Wellwick +6073,Forest,Friendsanity: Delores 1 <3,FRIENDSANITY,Delores - Custom NPC +6074,Forest,Friendsanity: Delores 2 <3,FRIENDSANITY,Delores - Custom NPC +6075,Forest,Friendsanity: Delores 3 <3,FRIENDSANITY,Delores - Custom NPC +6076,Forest,Friendsanity: Delores 4 <3,FRIENDSANITY,Delores - Custom NPC +6077,Forest,Friendsanity: Delores 5 <3,FRIENDSANITY,Delores - Custom NPC +6078,Forest,Friendsanity: Delores 6 <3,FRIENDSANITY,Delores - Custom NPC +6079,Forest,Friendsanity: Delores 7 <3,FRIENDSANITY,Delores - Custom NPC +6080,Forest,Friendsanity: Delores 8 <3,FRIENDSANITY,Delores - Custom NPC +6081,Forest,Friendsanity: Delores 9 <3,FRIENDSANITY,Delores - Custom NPC +6082,Forest,Friendsanity: Delores 10 <3,FRIENDSANITY,Delores - Custom NPC +6083,Forest,Friendsanity: Delores 11 <3,FRIENDSANITY,Delores - Custom NPC +6084,Forest,Friendsanity: Delores 12 <3,FRIENDSANITY,Delores - Custom NPC +6085,Forest,Friendsanity: Delores 13 <3,FRIENDSANITY,Delores - Custom NPC +6086,Forest,Friendsanity: Delores 14 <3,FRIENDSANITY,Delores - Custom NPC +6087,Alec's Pet Shop,Friendsanity: Alec 1 <3,FRIENDSANITY,Alec Revisited +6088,Alec's Pet Shop,Friendsanity: Alec 2 <3,FRIENDSANITY,Alec Revisited +6089,Alec's Pet Shop,Friendsanity: Alec 3 <3,FRIENDSANITY,Alec Revisited +6090,Alec's Pet Shop,Friendsanity: Alec 4 <3,FRIENDSANITY,Alec Revisited +6091,Alec's Pet Shop,Friendsanity: Alec 5 <3,FRIENDSANITY,Alec Revisited +6092,Alec's Pet Shop,Friendsanity: Alec 6 <3,FRIENDSANITY,Alec Revisited +6093,Alec's Pet Shop,Friendsanity: Alec 7 <3,FRIENDSANITY,Alec Revisited +6094,Alec's Pet Shop,Friendsanity: Alec 8 <3,FRIENDSANITY,Alec Revisited +6095,Alec's Pet Shop,Friendsanity: Alec 9 <3,FRIENDSANITY,Alec Revisited +6096,Alec's Pet Shop,Friendsanity: Alec 10 <3,FRIENDSANITY,Alec Revisited +6097,Alec's Pet Shop,Friendsanity: Alec 11 <3,FRIENDSANITY,Alec Revisited +6098,Alec's Pet Shop,Friendsanity: Alec 12 <3,FRIENDSANITY,Alec Revisited +6099,Alec's Pet Shop,Friendsanity: Alec 13 <3,FRIENDSANITY,Alec Revisited +6100,Alec's Pet Shop,Friendsanity: Alec 14 <3,FRIENDSANITY,Alec Revisited +6101,Eugene's Garden,Friendsanity: Eugene 1 <3,FRIENDSANITY,Custom NPC Eugene +6102,Eugene's Garden,Friendsanity: Eugene 2 <3,FRIENDSANITY,Custom NPC Eugene +6103,Eugene's Garden,Friendsanity: Eugene 3 <3,FRIENDSANITY,Custom NPC Eugene +6104,Eugene's Garden,Friendsanity: Eugene 4 <3,FRIENDSANITY,Custom NPC Eugene +6105,Eugene's Garden,Friendsanity: Eugene 5 <3,FRIENDSANITY,Custom NPC Eugene +6106,Eugene's Garden,Friendsanity: Eugene 6 <3,FRIENDSANITY,Custom NPC Eugene +6107,Eugene's Garden,Friendsanity: Eugene 7 <3,FRIENDSANITY,Custom NPC Eugene +6108,Eugene's Garden,Friendsanity: Eugene 8 <3,FRIENDSANITY,Custom NPC Eugene +6109,Eugene's Garden,Friendsanity: Eugene 9 <3,FRIENDSANITY,Custom NPC Eugene +6110,Eugene's Garden,Friendsanity: Eugene 10 <3,FRIENDSANITY,Custom NPC Eugene +6111,Eugene's Garden,Friendsanity: Eugene 11 <3,FRIENDSANITY,Custom NPC Eugene +6112,Eugene's Garden,Friendsanity: Eugene 12 <3,FRIENDSANITY,Custom NPC Eugene +6113,Eugene's Garden,Friendsanity: Eugene 13 <3,FRIENDSANITY,Custom NPC Eugene +6114,Eugene's Garden,Friendsanity: Eugene 14 <3,FRIENDSANITY,Custom NPC Eugene +6115,Forest,Friendsanity: Juna 1 <3,FRIENDSANITY,Juna - Roommate NPC +6116,Forest,Friendsanity: Juna 2 <3,FRIENDSANITY,Juna - Roommate NPC +6117,Forest,Friendsanity: Juna 3 <3,FRIENDSANITY,Juna - Roommate NPC +6118,Forest,Friendsanity: Juna 4 <3,FRIENDSANITY,Juna - Roommate NPC +6119,Forest,Friendsanity: Juna 5 <3,FRIENDSANITY,Juna - Roommate NPC +6120,Forest,Friendsanity: Juna 6 <3,FRIENDSANITY,Juna - Roommate NPC +6121,Forest,Friendsanity: Juna 7 <3,FRIENDSANITY,Juna - Roommate NPC +6122,Forest,Friendsanity: Juna 8 <3,FRIENDSANITY,Juna - Roommate NPC +6123,Forest,Friendsanity: Juna 9 <3,FRIENDSANITY,Juna - Roommate NPC +6124,Forest,Friendsanity: Juna 10 <3,FRIENDSANITY,Juna - Roommate NPC +6125,Riley's House,Friendsanity: Riley 1 <3,FRIENDSANITY,Custom NPC - Riley +6126,Riley's House,Friendsanity: Riley 2 <3,FRIENDSANITY,Custom NPC - Riley +6127,Riley's House,Friendsanity: Riley 3 <3,FRIENDSANITY,Custom NPC - Riley +6128,Riley's House,Friendsanity: Riley 4 <3,FRIENDSANITY,Custom NPC - Riley +6129,Riley's House,Friendsanity: Riley 5 <3,FRIENDSANITY,Custom NPC - Riley +6130,Riley's House,Friendsanity: Riley 6 <3,FRIENDSANITY,Custom NPC - Riley +6131,Riley's House,Friendsanity: Riley 7 <3,FRIENDSANITY,Custom NPC - Riley +6132,Riley's House,Friendsanity: Riley 8 <3,FRIENDSANITY,Custom NPC - Riley +6133,Riley's House,Friendsanity: Riley 9 <3,FRIENDSANITY,Custom NPC - Riley +6134,Riley's House,Friendsanity: Riley 10 <3,FRIENDSANITY,Custom NPC - Riley +6135,Riley's House,Friendsanity: Riley 11 <3,FRIENDSANITY,Custom NPC - Riley +6136,Riley's House,Friendsanity: Riley 12 <3,FRIENDSANITY,Custom NPC - Riley +6137,Riley's House,Friendsanity: Riley 13 <3,FRIENDSANITY,Custom NPC - Riley +6138,Riley's House,Friendsanity: Riley 14 <3,FRIENDSANITY,Custom NPC - Riley +6139,JojaMart,Friendsanity: Claire 1 <3,FRIENDSANITY,Stardew Valley Expanded +6140,JojaMart,Friendsanity: Claire 2 <3,FRIENDSANITY,Stardew Valley Expanded +6141,JojaMart,Friendsanity: Claire 3 <3,FRIENDSANITY,Stardew Valley Expanded +6142,JojaMart,Friendsanity: Claire 4 <3,FRIENDSANITY,Stardew Valley Expanded +6143,JojaMart,Friendsanity: Claire 5 <3,FRIENDSANITY,Stardew Valley Expanded +6144,JojaMart,Friendsanity: Claire 6 <3,FRIENDSANITY,Stardew Valley Expanded +6145,JojaMart,Friendsanity: Claire 7 <3,FRIENDSANITY,Stardew Valley Expanded +6146,JojaMart,Friendsanity: Claire 8 <3,FRIENDSANITY,Stardew Valley Expanded +6147,JojaMart,Friendsanity: Claire 9 <3,FRIENDSANITY,Stardew Valley Expanded +6148,JojaMart,Friendsanity: Claire 10 <3,FRIENDSANITY,Stardew Valley Expanded +6149,JojaMart,Friendsanity: Claire 11 <3,FRIENDSANITY,Stardew Valley Expanded +6150,JojaMart,Friendsanity: Claire 12 <3,FRIENDSANITY,Stardew Valley Expanded +6151,JojaMart,Friendsanity: Claire 13 <3,FRIENDSANITY,Stardew Valley Expanded +6152,JojaMart,Friendsanity: Claire 14 <3,FRIENDSANITY,Stardew Valley Expanded +6153,Galmoran Outpost,Friendsanity: Lance 1 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6154,Galmoran Outpost,Friendsanity: Lance 2 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6155,Galmoran Outpost,Friendsanity: Lance 3 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6156,Galmoran Outpost,Friendsanity: Lance 4 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6157,Galmoran Outpost,Friendsanity: Lance 5 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6158,Galmoran Outpost,Friendsanity: Lance 6 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6159,Galmoran Outpost,Friendsanity: Lance 7 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6160,Galmoran Outpost,Friendsanity: Lance 8 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6161,Galmoran Outpost,Friendsanity: Lance 9 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6162,Galmoran Outpost,Friendsanity: Lance 10 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6163,Galmoran Outpost,Friendsanity: Lance 11 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6164,Galmoran Outpost,Friendsanity: Lance 12 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6165,Galmoran Outpost,Friendsanity: Lance 13 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6166,Galmoran Outpost,Friendsanity: Lance 14 <3,"FRIENDSANITY,GINGER_ISLAND",Stardew Valley Expanded +6167,Jenkins' Residence,Friendsanity: Olivia 1 <3,FRIENDSANITY,Stardew Valley Expanded +6168,Jenkins' Residence,Friendsanity: Olivia 2 <3,FRIENDSANITY,Stardew Valley Expanded +6169,Jenkins' Residence,Friendsanity: Olivia 3 <3,FRIENDSANITY,Stardew Valley Expanded +6170,Jenkins' Residence,Friendsanity: Olivia 4 <3,FRIENDSANITY,Stardew Valley Expanded +6171,Jenkins' Residence,Friendsanity: Olivia 5 <3,FRIENDSANITY,Stardew Valley Expanded +6172,Jenkins' Residence,Friendsanity: Olivia 6 <3,FRIENDSANITY,Stardew Valley Expanded +6173,Jenkins' Residence,Friendsanity: Olivia 7 <3,FRIENDSANITY,Stardew Valley Expanded +6174,Jenkins' Residence,Friendsanity: Olivia 8 <3,FRIENDSANITY,Stardew Valley Expanded +6175,Jenkins' Residence,Friendsanity: Olivia 9 <3,FRIENDSANITY,Stardew Valley Expanded +6176,Jenkins' Residence,Friendsanity: Olivia 10 <3,FRIENDSANITY,Stardew Valley Expanded +6177,Jenkins' Residence,Friendsanity: Olivia 11 <3,FRIENDSANITY,Stardew Valley Expanded +6178,Jenkins' Residence,Friendsanity: Olivia 12 <3,FRIENDSANITY,Stardew Valley Expanded +6179,Jenkins' Residence,Friendsanity: Olivia 13 <3,FRIENDSANITY,Stardew Valley Expanded +6180,Jenkins' Residence,Friendsanity: Olivia 14 <3,FRIENDSANITY,Stardew Valley Expanded +6181,Wizard Tower,Friendsanity: Wizard 11 <3,FRIENDSANITY,Stardew Valley Expanded +6182,Wizard Tower,Friendsanity: Wizard 12 <3,FRIENDSANITY,Stardew Valley Expanded +6183,Wizard Tower,Friendsanity: Wizard 13 <3,FRIENDSANITY,Stardew Valley Expanded +6184,Wizard Tower,Friendsanity: Wizard 14 <3,FRIENDSANITY,Stardew Valley Expanded +6185,Blue Moon Vineyard,Friendsanity: Sophia 1 <3,FRIENDSANITY,Stardew Valley Expanded +6186,Blue Moon Vineyard,Friendsanity: Sophia 2 <3,FRIENDSANITY,Stardew Valley Expanded +6187,Blue Moon Vineyard,Friendsanity: Sophia 3 <3,FRIENDSANITY,Stardew Valley Expanded +6188,Blue Moon Vineyard,Friendsanity: Sophia 4 <3,FRIENDSANITY,Stardew Valley Expanded +6189,Blue Moon Vineyard,Friendsanity: Sophia 5 <3,FRIENDSANITY,Stardew Valley Expanded +6190,Blue Moon Vineyard,Friendsanity: Sophia 6 <3,FRIENDSANITY,Stardew Valley Expanded +6191,Blue Moon Vineyard,Friendsanity: Sophia 7 <3,FRIENDSANITY,Stardew Valley Expanded +6192,Blue Moon Vineyard,Friendsanity: Sophia 8 <3,FRIENDSANITY,Stardew Valley Expanded +6193,Blue Moon Vineyard,Friendsanity: Sophia 9 <3,FRIENDSANITY,Stardew Valley Expanded +6194,Blue Moon Vineyard,Friendsanity: Sophia 10 <3,FRIENDSANITY,Stardew Valley Expanded +6195,Blue Moon Vineyard,Friendsanity: Sophia 11 <3,FRIENDSANITY,Stardew Valley Expanded +6196,Blue Moon Vineyard,Friendsanity: Sophia 12 <3,FRIENDSANITY,Stardew Valley Expanded +6197,Blue Moon Vineyard,Friendsanity: Sophia 13 <3,FRIENDSANITY,Stardew Valley Expanded +6198,Blue Moon Vineyard,Friendsanity: Sophia 14 <3,FRIENDSANITY,Stardew Valley Expanded +6199,Jenkins' Residence,Friendsanity: Victor 1 <3,FRIENDSANITY,Stardew Valley Expanded +6200,Jenkins' Residence,Friendsanity: Victor 2 <3,FRIENDSANITY,Stardew Valley Expanded +6201,Jenkins' Residence,Friendsanity: Victor 3 <3,FRIENDSANITY,Stardew Valley Expanded +6202,Jenkins' Residence,Friendsanity: Victor 4 <3,FRIENDSANITY,Stardew Valley Expanded +6203,Jenkins' Residence,Friendsanity: Victor 5 <3,FRIENDSANITY,Stardew Valley Expanded +6204,Jenkins' Residence,Friendsanity: Victor 6 <3,FRIENDSANITY,Stardew Valley Expanded +6205,Jenkins' Residence,Friendsanity: Victor 7 <3,FRIENDSANITY,Stardew Valley Expanded +6206,Jenkins' Residence,Friendsanity: Victor 8 <3,FRIENDSANITY,Stardew Valley Expanded +6207,Jenkins' Residence,Friendsanity: Victor 9 <3,FRIENDSANITY,Stardew Valley Expanded +6208,Jenkins' Residence,Friendsanity: Victor 10 <3,FRIENDSANITY,Stardew Valley Expanded +6209,Jenkins' Residence,Friendsanity: Victor 11 <3,FRIENDSANITY,Stardew Valley Expanded +6210,Jenkins' Residence,Friendsanity: Victor 12 <3,FRIENDSANITY,Stardew Valley Expanded +6211,Jenkins' Residence,Friendsanity: Victor 13 <3,FRIENDSANITY,Stardew Valley Expanded +6212,Jenkins' Residence,Friendsanity: Victor 14 <3,FRIENDSANITY,Stardew Valley Expanded +6213,Fairhaven Farm,Friendsanity: Andy 1 <3,FRIENDSANITY,Stardew Valley Expanded +6214,Fairhaven Farm,Friendsanity: Andy 2 <3,FRIENDSANITY,Stardew Valley Expanded +6215,Fairhaven Farm,Friendsanity: Andy 3 <3,FRIENDSANITY,Stardew Valley Expanded +6216,Fairhaven Farm,Friendsanity: Andy 4 <3,FRIENDSANITY,Stardew Valley Expanded +6217,Fairhaven Farm,Friendsanity: Andy 5 <3,FRIENDSANITY,Stardew Valley Expanded +6218,Fairhaven Farm,Friendsanity: Andy 6 <3,FRIENDSANITY,Stardew Valley Expanded +6219,Fairhaven Farm,Friendsanity: Andy 7 <3,FRIENDSANITY,Stardew Valley Expanded +6220,Fairhaven Farm,Friendsanity: Andy 8 <3,FRIENDSANITY,Stardew Valley Expanded +6221,Fairhaven Farm,Friendsanity: Andy 9 <3,FRIENDSANITY,Stardew Valley Expanded +6222,Fairhaven Farm,Friendsanity: Andy 10 <3,FRIENDSANITY,Stardew Valley Expanded +6223,Aurora Vineyard,Friendsanity: Apples 1 <3,FRIENDSANITY,Stardew Valley Expanded +6224,Aurora Vineyard,Friendsanity: Apples 2 <3,FRIENDSANITY,Stardew Valley Expanded +6225,Aurora Vineyard,Friendsanity: Apples 3 <3,FRIENDSANITY,Stardew Valley Expanded +6226,Aurora Vineyard,Friendsanity: Apples 4 <3,FRIENDSANITY,Stardew Valley Expanded +6227,Aurora Vineyard,Friendsanity: Apples 5 <3,FRIENDSANITY,Stardew Valley Expanded +6228,Aurora Vineyard,Friendsanity: Apples 6 <3,FRIENDSANITY,Stardew Valley Expanded +6229,Aurora Vineyard,Friendsanity: Apples 7 <3,FRIENDSANITY,Stardew Valley Expanded +6230,Aurora Vineyard,Friendsanity: Apples 8 <3,FRIENDSANITY,Stardew Valley Expanded +6231,Aurora Vineyard,Friendsanity: Apples 9 <3,FRIENDSANITY,Stardew Valley Expanded +6232,Aurora Vineyard,Friendsanity: Apples 10 <3,FRIENDSANITY,Stardew Valley Expanded +6233,Museum,Friendsanity: Gunther 1 <3,FRIENDSANITY,Stardew Valley Expanded +6234,Museum,Friendsanity: Gunther 2 <3,FRIENDSANITY,Stardew Valley Expanded +6235,Museum,Friendsanity: Gunther 3 <3,FRIENDSANITY,Stardew Valley Expanded +6236,Museum,Friendsanity: Gunther 4 <3,FRIENDSANITY,Stardew Valley Expanded +6237,Museum,Friendsanity: Gunther 5 <3,FRIENDSANITY,Stardew Valley Expanded +6238,Museum,Friendsanity: Gunther 6 <3,FRIENDSANITY,Stardew Valley Expanded +6239,Museum,Friendsanity: Gunther 7 <3,FRIENDSANITY,Stardew Valley Expanded +6240,Museum,Friendsanity: Gunther 8 <3,FRIENDSANITY,Stardew Valley Expanded +6241,Museum,Friendsanity: Gunther 9 <3,FRIENDSANITY,Stardew Valley Expanded +6242,Museum,Friendsanity: Gunther 10 <3,FRIENDSANITY,Stardew Valley Expanded +6243,JojaMart,Friendsanity: Martin 1 <3,FRIENDSANITY,Stardew Valley Expanded +6244,JojaMart,Friendsanity: Martin 2 <3,FRIENDSANITY,Stardew Valley Expanded +6245,JojaMart,Friendsanity: Martin 3 <3,FRIENDSANITY,Stardew Valley Expanded +6246,JojaMart,Friendsanity: Martin 4 <3,FRIENDSANITY,Stardew Valley Expanded +6247,JojaMart,Friendsanity: Martin 5 <3,FRIENDSANITY,Stardew Valley Expanded +6248,JojaMart,Friendsanity: Martin 6 <3,FRIENDSANITY,Stardew Valley Expanded +6249,JojaMart,Friendsanity: Martin 7 <3,FRIENDSANITY,Stardew Valley Expanded +6250,JojaMart,Friendsanity: Martin 8 <3,FRIENDSANITY,Stardew Valley Expanded +6251,JojaMart,Friendsanity: Martin 9 <3,FRIENDSANITY,Stardew Valley Expanded +6252,JojaMart,Friendsanity: Martin 10 <3,FRIENDSANITY,Stardew Valley Expanded +6253,Adventurer's Guild,Friendsanity: Marlon 1 <3,FRIENDSANITY,Stardew Valley Expanded +6254,Adventurer's Guild,Friendsanity: Marlon 2 <3,FRIENDSANITY,Stardew Valley Expanded +6255,Adventurer's Guild,Friendsanity: Marlon 3 <3,FRIENDSANITY,Stardew Valley Expanded +6256,Adventurer's Guild,Friendsanity: Marlon 4 <3,FRIENDSANITY,Stardew Valley Expanded +6257,Adventurer's Guild,Friendsanity: Marlon 5 <3,FRIENDSANITY,Stardew Valley Expanded +6258,Adventurer's Guild,Friendsanity: Marlon 6 <3,FRIENDSANITY,Stardew Valley Expanded +6259,Adventurer's Guild,Friendsanity: Marlon 7 <3,FRIENDSANITY,Stardew Valley Expanded +6260,Adventurer's Guild,Friendsanity: Marlon 8 <3,FRIENDSANITY,Stardew Valley Expanded +6261,Adventurer's Guild,Friendsanity: Marlon 9 <3,FRIENDSANITY,Stardew Valley Expanded +6262,Adventurer's Guild,Friendsanity: Marlon 10 <3,FRIENDSANITY,Stardew Valley Expanded +6263,Wizard Tower,Friendsanity: Morgan 1 <3,FRIENDSANITY,Stardew Valley Expanded +6264,Wizard Tower,Friendsanity: Morgan 2 <3,FRIENDSANITY,Stardew Valley Expanded +6265,Wizard Tower,Friendsanity: Morgan 3 <3,FRIENDSANITY,Stardew Valley Expanded +6266,Wizard Tower,Friendsanity: Morgan 4 <3,FRIENDSANITY,Stardew Valley Expanded +6267,Wizard Tower,Friendsanity: Morgan 5 <3,FRIENDSANITY,Stardew Valley Expanded +6268,Wizard Tower,Friendsanity: Morgan 6 <3,FRIENDSANITY,Stardew Valley Expanded +6269,Wizard Tower,Friendsanity: Morgan 7 <3,FRIENDSANITY,Stardew Valley Expanded +6270,Wizard Tower,Friendsanity: Morgan 8 <3,FRIENDSANITY,Stardew Valley Expanded +6271,Wizard Tower,Friendsanity: Morgan 9 <3,FRIENDSANITY,Stardew Valley Expanded +6272,Wizard Tower,Friendsanity: Morgan 10 <3,FRIENDSANITY,Stardew Valley Expanded +6273,Scarlett's House,Friendsanity: Scarlett 1 <3,FRIENDSANITY,Stardew Valley Expanded +6274,Scarlett's House,Friendsanity: Scarlett 2 <3,FRIENDSANITY,Stardew Valley Expanded +6275,Scarlett's House,Friendsanity: Scarlett 3 <3,FRIENDSANITY,Stardew Valley Expanded +6276,Scarlett's House,Friendsanity: Scarlett 4 <3,FRIENDSANITY,Stardew Valley Expanded +6277,Scarlett's House,Friendsanity: Scarlett 5 <3,FRIENDSANITY,Stardew Valley Expanded +6278,Scarlett's House,Friendsanity: Scarlett 6 <3,FRIENDSANITY,Stardew Valley Expanded +6279,Scarlett's House,Friendsanity: Scarlett 7 <3,FRIENDSANITY,Stardew Valley Expanded +6280,Scarlett's House,Friendsanity: Scarlett 8 <3,FRIENDSANITY,Stardew Valley Expanded +6281,Scarlett's House,Friendsanity: Scarlett 9 <3,FRIENDSANITY,Stardew Valley Expanded +6282,Scarlett's House,Friendsanity: Scarlett 10 <3,FRIENDSANITY,Stardew Valley Expanded +6283,Susan's House,Friendsanity: Susan 1 <3,FRIENDSANITY,Stardew Valley Expanded +6284,Susan's House,Friendsanity: Susan 2 <3,FRIENDSANITY,Stardew Valley Expanded +6285,Susan's House,Friendsanity: Susan 3 <3,FRIENDSANITY,Stardew Valley Expanded +6286,Susan's House,Friendsanity: Susan 4 <3,FRIENDSANITY,Stardew Valley Expanded +6287,Susan's House,Friendsanity: Susan 5 <3,FRIENDSANITY,Stardew Valley Expanded +6288,Susan's House,Friendsanity: Susan 6 <3,FRIENDSANITY,Stardew Valley Expanded +6289,Susan's House,Friendsanity: Susan 7 <3,FRIENDSANITY,Stardew Valley Expanded +6290,Susan's House,Friendsanity: Susan 8 <3,FRIENDSANITY,Stardew Valley Expanded +6291,Susan's House,Friendsanity: Susan 9 <3,FRIENDSANITY,Stardew Valley Expanded +6292,Susan's House,Friendsanity: Susan 10 <3,FRIENDSANITY,Stardew Valley Expanded +6293,JojaMart,Friendsanity: Morris 1 <3,FRIENDSANITY,Stardew Valley Expanded +6294,JojaMart,Friendsanity: Morris 2 <3,FRIENDSANITY,Stardew Valley Expanded +6295,JojaMart,Friendsanity: Morris 3 <3,FRIENDSANITY,Stardew Valley Expanded +6296,JojaMart,Friendsanity: Morris 4 <3,FRIENDSANITY,Stardew Valley Expanded +6297,JojaMart,Friendsanity: Morris 5 <3,FRIENDSANITY,Stardew Valley Expanded +6298,JojaMart,Friendsanity: Morris 6 <3,FRIENDSANITY,Stardew Valley Expanded +6299,JojaMart,Friendsanity: Morris 7 <3,FRIENDSANITY,Stardew Valley Expanded +6300,JojaMart,Friendsanity: Morris 8 <3,FRIENDSANITY,Stardew Valley Expanded +6301,JojaMart,Friendsanity: Morris 9 <3,FRIENDSANITY,Stardew Valley Expanded +6302,JojaMart,Friendsanity: Morris 10 <3,FRIENDSANITY,Stardew Valley Expanded +6303,Witch's Swamp,Friendsanity: Zic 1 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6304,Witch's Swamp,Friendsanity: Zic 2 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6305,Witch's Swamp,Friendsanity: Zic 3 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6306,Witch's Swamp,Friendsanity: Zic 4 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6307,Witch's Swamp,Friendsanity: Zic 5 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6308,Witch's Swamp,Friendsanity: Zic 6 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6309,Witch's Swamp,Friendsanity: Zic 7 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6310,Witch's Swamp,Friendsanity: Zic 8 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6311,Witch's Swamp,Friendsanity: Zic 9 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6312,Witch's Swamp,Friendsanity: Zic 10 <3,FRIENDSANITY,Distant Lands - Witch Swamp Overhaul +6313,Witch's Attic,Friendsanity: Alecto 1 <3,FRIENDSANITY,Alecto the Witch +6314,Witch's Attic,Friendsanity: Alecto 2 <3,FRIENDSANITY,Alecto the Witch +6315,Witch's Attic,Friendsanity: Alecto 3 <3,FRIENDSANITY,Alecto the Witch +6316,Witch's Attic,Friendsanity: Alecto 4 <3,FRIENDSANITY,Alecto the Witch +6317,Witch's Attic,Friendsanity: Alecto 5 <3,FRIENDSANITY,Alecto the Witch +6318,Witch's Attic,Friendsanity: Alecto 6 <3,FRIENDSANITY,Alecto the Witch +6319,Witch's Attic,Friendsanity: Alecto 7 <3,FRIENDSANITY,Alecto the Witch +6320,Witch's Attic,Friendsanity: Alecto 8 <3,FRIENDSANITY,Alecto the Witch +6321,Witch's Attic,Friendsanity: Alecto 9 <3,FRIENDSANITY,Alecto the Witch +6322,Witch's Attic,Friendsanity: Alecto 10 <3,FRIENDSANITY,Alecto the Witch +6323,Mouse House,Friendsanity: Lacey 1 <3,FRIENDSANITY,Hat Mouse Lacey +6324,Mouse House,Friendsanity: Lacey 2 <3,FRIENDSANITY,Hat Mouse Lacey +6325,Mouse House,Friendsanity: Lacey 3 <3,FRIENDSANITY,Hat Mouse Lacey +6326,Mouse House,Friendsanity: Lacey 4 <3,FRIENDSANITY,Hat Mouse Lacey +6327,Mouse House,Friendsanity: Lacey 5 <3,FRIENDSANITY,Hat Mouse Lacey +6328,Mouse House,Friendsanity: Lacey 6 <3,FRIENDSANITY,Hat Mouse Lacey +6329,Mouse House,Friendsanity: Lacey 7 <3,FRIENDSANITY,Hat Mouse Lacey +6330,Mouse House,Friendsanity: Lacey 8 <3,FRIENDSANITY,Hat Mouse Lacey +6331,Mouse House,Friendsanity: Lacey 9 <3,FRIENDSANITY,Hat Mouse Lacey +6332,Mouse House,Friendsanity: Lacey 10 <3,FRIENDSANITY,Hat Mouse Lacey +6333,Mouse House,Friendsanity: Lacey 11 <3,FRIENDSANITY,Hat Mouse Lacey +6334,Mouse House,Friendsanity: Lacey 12 <3,FRIENDSANITY,Hat Mouse Lacey +6335,Mouse House,Friendsanity: Lacey 13 <3,FRIENDSANITY,Hat Mouse Lacey +6336,Mouse House,Friendsanity: Lacey 14 <3,FRIENDSANITY,Hat Mouse Lacey +6337,Boarding House - First Floor,Friendsanity: Joel 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6338,Boarding House - First Floor,Friendsanity: Joel 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6339,Boarding House - First Floor,Friendsanity: Joel 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6340,Boarding House - First Floor,Friendsanity: Joel 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6341,Boarding House - First Floor,Friendsanity: Joel 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6342,Boarding House - First Floor,Friendsanity: Joel 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6343,Boarding House - First Floor,Friendsanity: Joel 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6344,Boarding House - First Floor,Friendsanity: Joel 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6345,Boarding House - First Floor,Friendsanity: Joel 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6346,Boarding House - First Floor,Friendsanity: Joel 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6347,Boarding House - First Floor,Friendsanity: Sheila 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6348,Boarding House - First Floor,Friendsanity: Sheila 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6349,Boarding House - First Floor,Friendsanity: Sheila 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6350,Boarding House - First Floor,Friendsanity: Sheila 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6351,Boarding House - First Floor,Friendsanity: Sheila 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6352,Boarding House - First Floor,Friendsanity: Sheila 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6353,Boarding House - First Floor,Friendsanity: Sheila 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6354,Boarding House - First Floor,Friendsanity: Sheila 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6355,Boarding House - First Floor,Friendsanity: Sheila 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6356,Boarding House - First Floor,Friendsanity: Sheila 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6357,Boarding House - First Floor,Friendsanity: Sheila 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6358,Boarding House - First Floor,Friendsanity: Sheila 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6359,Boarding House - First Floor,Friendsanity: Sheila 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6360,Boarding House - First Floor,Friendsanity: Sheila 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6361,The Lost Valley,Friendsanity: Gregory 1 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6362,The Lost Valley,Friendsanity: Gregory 2 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6363,The Lost Valley,Friendsanity: Gregory 3 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6364,The Lost Valley,Friendsanity: Gregory 4 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6365,The Lost Valley,Friendsanity: Gregory 5 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6366,The Lost Valley,Friendsanity: Gregory 6 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6367,The Lost Valley,Friendsanity: Gregory 7 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6368,The Lost Valley,Friendsanity: Gregory 8 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6369,The Lost Valley,Friendsanity: Gregory 9 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6370,The Lost Valley,Friendsanity: Gregory 10 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6371,The Lost Valley,Friendsanity: Gregory 11 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6372,The Lost Valley,Friendsanity: Gregory 12 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6373,The Lost Valley,Friendsanity: Gregory 13 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +6374,The Lost Valley,Friendsanity: Gregory 14 <3,FRIENDSANITY,Boarding House and Bus Stop Extension +7001,Pierre's General Store,Premium Pack,BACKPACK,Bigger Backpack +7002,Carpenter Shop,Tractor Garage Blueprint,BUILDING_BLUEPRINT,Tractor Mod +7003,The Deep Woods Depth 100,Pet the Deep Woods Unicorn,MANDATORY,DeepWoods +7004,The Deep Woods Depth 50,Breaking Up Deep Woods Gingerbread House,MANDATORY,DeepWoods +7005,The Deep Woods Depth 50,Drinking From Deep Woods Fountain,MANDATORY,DeepWoods +7006,The Deep Woods Depth 100,Deep Woods Treasure Chest,MANDATORY,DeepWoods +7007,The Deep Woods Depth 100,Deep Woods Trash Bin,MANDATORY,DeepWoods +7008,The Deep Woods Depth 50,Chop Down a Deep Woods Iridium Tree,MANDATORY,DeepWoods +7009,The Deep Woods Depth 10,The Deep Woods: Depth 10,ELEVATOR,DeepWoods +7010,The Deep Woods Depth 20,The Deep Woods: Depth 20,ELEVATOR,DeepWoods +7011,The Deep Woods Depth 30,The Deep Woods: Depth 30,ELEVATOR,DeepWoods +7012,The Deep Woods Depth 40,The Deep Woods: Depth 40,ELEVATOR,DeepWoods +7013,The Deep Woods Depth 50,The Deep Woods: Depth 50,ELEVATOR,DeepWoods +7014,The Deep Woods Depth 60,The Deep Woods: Depth 60,ELEVATOR,DeepWoods +7015,The Deep Woods Depth 70,The Deep Woods: Depth 70,ELEVATOR,DeepWoods +7016,The Deep Woods Depth 80,The Deep Woods: Depth 80,ELEVATOR,DeepWoods +7017,The Deep Woods Depth 90,The Deep Woods: Depth 90,ELEVATOR,DeepWoods +7018,The Deep Woods Depth 100,The Deep Woods: Depth 100,ELEVATOR,DeepWoods +7019,The Deep Woods Depth 50,Purify an Infested Lichtung,MANDATORY,DeepWoods +7020,Skull Cavern Floor 25,Skull Cavern: Floor 25,ELEVATOR,Skull Cavern Elevator +7021,Skull Cavern Floor 50,Skull Cavern: Floor 50,ELEVATOR,Skull Cavern Elevator +7022,Skull Cavern Floor 75,Skull Cavern: Floor 75,ELEVATOR,Skull Cavern Elevator +7023,Skull Cavern Floor 100,Skull Cavern: Floor 100,ELEVATOR,Skull Cavern Elevator +7024,Skull Cavern Floor 125,Skull Cavern: Floor 125,ELEVATOR,Skull Cavern Elevator +7025,Skull Cavern Floor 150,Skull Cavern: Floor 150,ELEVATOR,Skull Cavern Elevator +7026,Skull Cavern Floor 175,Skull Cavern: Floor 175,ELEVATOR,Skull Cavern Elevator +7027,Skull Cavern Floor 200,Skull Cavern: Floor 200,ELEVATOR,Skull Cavern Elevator +7028,The Deep Woods Depth 100,The Sword in the Stone,MANDATORY,DeepWoods +7051,Abandoned Mines - 1A,Abandoned Treasure - Floor 1A,MANDATORY,Boarding House and Bus Stop Extension +7052,Abandoned Mines - 1B,Abandoned Treasure - Floor 1B,MANDATORY,Boarding House and Bus Stop Extension +7053,Abandoned Mines - 2A,Abandoned Treasure - Floor 2A,MANDATORY,Boarding House and Bus Stop Extension +7054,Abandoned Mines - 2B,Abandoned Treasure - Floor 2B,MANDATORY,Boarding House and Bus Stop Extension +7055,Abandoned Mines - 3,Abandoned Treasure - Floor 3,MANDATORY,Boarding House and Bus Stop Extension +7056,Abandoned Mines - 4,Abandoned Treasure - Floor 4,MANDATORY,Boarding House and Bus Stop Extension +7057,Abandoned Mines - 5,Abandoned Treasure - Floor 5,MANDATORY,Boarding House and Bus Stop Extension +7401,Farm,Cook Magic Elixir,COOKSANITY,Magic +7402,Farm,Craft Travel Core,CRAFTSANITY,Magic +7403,Farm,Craft Haste Elixir,CRAFTSANITY,Stardew Valley Expanded +7404,Farm,Craft Hero Elixir,CRAFTSANITY,Stardew Valley Expanded +7405,Farm,Craft Armor Elixir,CRAFTSANITY,Stardew Valley Expanded +7406,Witch's Swamp,Craft Ginger Tincture,"CRAFTSANITY,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul +7407,Farm,Craft Glass Path,CRAFTSANITY,Archaeology +7408,Farm,Craft Glass Bazier,CRAFTSANITY,Archaeology +7409,Farm,Craft Glass Fence,CRAFTSANITY,Archaeology +7410,Farm,Craft Bone Path,CRAFTSANITY,Archaeology +7411,Farm,Craft Water Shifter,CRAFTSANITY,Archaeology +7412,Farm,Craft Wooden Display,CRAFTSANITY,Archaeology +7413,Farm,Craft Hardwood Display,CRAFTSANITY,Archaeology +7414,Farm,Craft Dwarf Gadget: Infinite Volcano Simulation,"CRAFTSANITY,GINGER_ISLAND",Archaeology +7415,Farm,Craft Grinder,CRAFTSANITY,Archaeology +7416,Farm,Craft Preservation Chamber,CRAFTSANITY,Archaeology +7417,Farm,Craft Hardwood Preservation Chamber,CRAFTSANITY,Archaeology +7418,Farm,Craft Ancient Battery Production Station,CRAFTSANITY,Archaeology +7419,Farm,Craft Neanderthal Skeleton,CRAFTSANITY,Boarding House and Bus Stop Extension +7420,Farm,Craft Pterodactyl Skeleton L,CRAFTSANITY,Boarding House and Bus Stop Extension +7421,Farm,Craft Pterodactyl Skeleton M,CRAFTSANITY,Boarding House and Bus Stop Extension +7422,Farm,Craft Pterodactyl Skeleton R,CRAFTSANITY,Boarding House and Bus Stop Extension +7423,Farm,Craft T-Rex Skeleton L,CRAFTSANITY,Boarding House and Bus Stop Extension +7424,Farm,Craft T-Rex Skeleton M,CRAFTSANITY,Boarding House and Bus Stop Extension +7425,Farm,Craft T-Rex Skeleton R,CRAFTSANITY,Boarding House and Bus Stop Extension +7451,Adventurer's Guild,Magic Elixir Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic +7452,Adventurer's Guild,Travel Core Recipe,CRAFTSANITY,Magic +7453,Alesia Shop,Haste Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded +7454,Isaac Shop,Hero Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded +7455,Alesia Shop,Armor Elixir Recipe,CRAFTSANITY,Stardew Valley Expanded +7501,Mountain,Missing Envelope,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC) +7502,Forest,Lost Emerald Ring,"STORY_QUEST",Ayeisha - The Postal Worker (Custom NPC) +7503,Forest,Mr.Ginger's request,"STORY_QUEST",Mister Ginger (cat npc) +7504,Forest,Juna's Drink Request,"STORY_QUEST",Juna - Roommate NPC +7505,Forest,Juna's BFF Request,"STORY_QUEST",Juna - Roommate NPC +7506,Forest,Juna's Monster Mash,SPECIAL_ORDER_BOARD,Juna - Roommate NPC +7507,Adventurer's Guild,Marlon's Boat,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded +7508,Railroad,The Railroad Boulder,"STORY_QUEST",Stardew Valley Expanded +7509,Grandpa's Shed Interior,Grandpa's Shed,"STORY_QUEST",Stardew Valley Expanded +7510,Aurora Vineyard,Aurora Vineyard,"STORY_QUEST",Stardew Valley Expanded +7511,Lance's House Main,Monster Crops,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded +7512,Sewer,Void Soul Retrieval,"STORY_QUEST,GINGER_ISLAND",Stardew Valley Expanded +7513,Fairhaven Farm,Andy's Cellar,SPECIAL_ORDER_BOARD,Stardew Valley Expanded +7514,Adventurer's Guild,A Mysterious Venture,SPECIAL_ORDER_BOARD,Stardew Valley Expanded +7515,Jenkins' Residence,An Elegant Reception,SPECIAL_ORDER_BOARD,Stardew Valley Expanded +7516,Sophia's House,Fairy Garden,"SPECIAL_ORDER_BOARD,GINGER_ISLAND",Stardew Valley Expanded +7517,Susan's House,Homemade Fertilizer,SPECIAL_ORDER_BOARD,Stardew Valley Expanded +7519,Witch's Swamp,Corrupted Crops Task,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul +7520,Witch's Swamp,A New Pot,STORY_QUEST,Distant Lands - Witch Swamp Overhaul +7521,Witch's Swamp,Fancy Blanket Task,STORY_QUEST,Distant Lands - Witch Swamp Overhaul +7522,Witch's Swamp,Witch's order,GINGER_ISLAND,Distant Lands - Witch Swamp Overhaul +7523,Boarding House - First Floor,Pumpkin Soup,STORY_QUEST,Boarding House and Bus Stop Extension +7524,Museum,Geode Order,SPECIAL_ORDER_BOARD,Professor Jasper Thomas +7525,Museum,Dwarven Scrolls,SPECIAL_ORDER_BOARD,Professor Jasper Thomas +7526,Mouse House,Hats for the Hat Mouse,STORY_QUEST,Hat Mouse Lacey +7551,Kitchen,Cook Baked Berry Oatmeal,COOKSANITY,Stardew Valley Expanded +7552,Kitchen,Cook Flower Cookie,COOKSANITY,Stardew Valley Expanded +7553,Kitchen,Cook Big Bark Burger,COOKSANITY,Stardew Valley Expanded +7554,Kitchen,Cook Frog Legs,COOKSANITY,Stardew Valley Expanded +7555,Kitchen,Cook Glazed Butterfish,COOKSANITY,Stardew Valley Expanded +7556,Kitchen,Cook Mixed Berry Pie,COOKSANITY,Stardew Valley Expanded +7557,Kitchen,Cook Mushroom Berry Rice,COOKSANITY,Stardew Valley Expanded +7558,Kitchen,Cook Seaweed Salad,COOKSANITY,Stardew Valley Expanded +7559,Kitchen,Cook Void Delight,COOKSANITY,Stardew Valley Expanded +7560,Kitchen,Cook Void Salmon Sushi,COOKSANITY,Stardew Valley Expanded +7561,Kitchen,Cook Mushroom Kebab,COOKSANITY,Distant Lands - Witch Swamp Overhaul +7562,Kitchen,Cook Crayfish Soup,COOKSANITY,Distant Lands - Witch Swamp Overhaul +7563,Kitchen,Cook Pemmican,COOKSANITY,Distant Lands - Witch Swamp Overhaul +7564,Kitchen,Cook Void Mint Tea,COOKSANITY,Distant Lands - Witch Swamp Overhaul +7565,Kitchen,Cook Special Pumpkin Soup,COOKSANITY,Boarding House and Bus Stop Extension +7601,Bear Shop,Baked Berry Oatmeal Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7602,Bear Shop,Flower Cookie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7603,Saloon,Big Bark Burger Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded +7604,Adventurer's Guild,Frog Legs Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7605,Saloon,Glazed Butterfish Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded +7606,Saloon,Mixed Berry Pie Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7607,Adventurer's Guild,Mushroom Berry Rice Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded +7608,Adventurer's Guild,Seaweed Salad Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7609,Sewer,Void Delight Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Stardew Valley Expanded +7610,Sewer,Void Salmon Sushi Recipe,"CHEFSANITY,CHEFSANITY_PURCHASE",Stardew Valley Expanded +7611,Witch's Swamp,Mushroom Kebab Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +7613,Witch's Swamp,Pemmican Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +7614,Witch's Swamp,Void Mint Tea Recipe,"CHEFSANITY,CHEFSANITY_FRIENDSHIP",Distant Lands - Witch Swamp Overhaul +7616,Mines Dwarf Shop,Neanderthal Skeleton Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7617,Mines Dwarf Shop,Pterodactyl Skeleton L Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7618,Mines Dwarf Shop,Pterodactyl Skeleton M Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7619,Mines Dwarf Shop,Pterodactyl Skeleton R Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7620,Mines Dwarf Shop,T-Rex Skeleton L Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7621,Mines Dwarf Shop,T-Rex Skeleton M Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7622,Mines Dwarf Shop,T-Rex Skeleton R Recipe,CRAFTSANITY,Boarding House and Bus Stop Extension +7651,Alesia Shop,Tempered Galaxy Dagger,MANDATORY,Stardew Valley Expanded +7652,Isaac Shop,Tempered Galaxy Sword,MANDATORY,Stardew Valley Expanded +7653,Isaac Shop,Tempered Galaxy Hammer,MANDATORY,Stardew Valley Expanded +7701,Island South,Fishsanity: Baby Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7702,Crimson Badlands,Fishsanity: Bonefish,FISHSANITY,Stardew Valley Expanded +7703,Forest,Fishsanity: Bull Trout,FISHSANITY,Stardew Valley Expanded +7704,Forest West,Fishsanity: Butterfish,FISHSANITY,Stardew Valley Expanded +7705,Island South,Fishsanity: Clownfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7706,Highlands Outside,Fishsanity: Daggerfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7707,Mountain,Fishsanity: Frog,FISHSANITY,Stardew Valley Expanded +7708,Highlands Outside,Fishsanity: Gemfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7709,Sprite Spring,Fishsanity: Goldenfish,FISHSANITY,Stardew Valley Expanded +7710,Secret Woods,Fishsanity: Grass Carp,FISHSANITY,Stardew Valley Expanded +7711,Forest West,Fishsanity: King Salmon,FISHSANITY,Stardew Valley Expanded +7712,Island West,Fishsanity: Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7713,Sprite Spring,Fishsanity: Meteor Carp,FISHSANITY,Stardew Valley Expanded +7714,Town,Fishsanity: Minnow,FISHSANITY,Stardew Valley Expanded +7715,Forest West,Fishsanity: Puppyfish,FISHSANITY,Stardew Valley Expanded +7716,Sewer,Fishsanity: Radioactive Bass,FISHSANITY,Stardew Valley Expanded +7717,Island West,Fishsanity: Seahorse,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7718,Island West,Fishsanity: Sea Sponge,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7719,Island South,Fishsanity: Shiny Lunaloo,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7720,Mutant Bug Lair,Fishsanity: Snatcher Worm,FISHSANITY,Stardew Valley Expanded +7721,Beach,Fishsanity: Starfish,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7722,Fable Reef,Fishsanity: Torpedo Trout,"FISHSANITY,GINGER_ISLAND",Stardew Valley Expanded +7723,Witch's Swamp,Fishsanity: Void Eel,FISHSANITY,Stardew Valley Expanded +7724,Mutant Bug Lair,Fishsanity: Water Grub,FISHSANITY,Stardew Valley Expanded +7725,Crimson Badlands,Fishsanity: Undeadfish,FISHSANITY,Stardew Valley Expanded +7726,Shearwater Bridge,Fishsanity: Kittyfish,FISHSANITY,Stardew Valley Expanded +7727,Blue Moon Vineyard,Fishsanity: Dulse Seaweed,FISHSANITY,Stardew Valley Expanded +7728,Witch's Swamp,Fishsanity: Void Minnow,FISHSANITY,Distant Lands - Witch Swamp Overhaul +7729,Witch's Swamp,Fishsanity: Swamp Leech,FISHSANITY,Distant Lands - Witch Swamp Overhaul +7730,Witch's Swamp,Fishsanity: Giant Horsehoe Crab,FISHSANITY,Distant Lands - Witch Swamp Overhaul +7731,Witch's Swamp,Fishsanity: Purple Algae,FISHSANITY,Distant Lands - Witch Swamp Overhaul +7901,Farm,Harvest Monster Fruit,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded +7902,Farm,Harvest Salal Berry,CROPSANITY,Stardew Valley Expanded +7903,Farm,Harvest Slime Berry,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded +7904,Farm,Harvest Ancient Fiber,CROPSANITY,Stardew Valley Expanded +7905,Farm,Harvest Monster Mushroom,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded +7906,Farm,Harvest Void Root,"CROPSANITY,GINGER_ISLAND",Stardew Valley Expanded +7907,Farm,Harvest Void Mint Leaves,CROPSANITY,Distant Lands - Witch Swamp Overhaul +7908,Farm,Harvest Vile Ancient Fruit,CROPSANITY,Distant Lands - Witch Swamp Overhaul +8001,Shipping,Shipsanity: Magic Elixir,SHIPSANITY,Magic +8002,Shipping,Shipsanity: Travel Core,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Magic +8003,Shipping,Shipsanity: Aegis Elixir,SHIPSANITY,Stardew Valley Expanded +8004,Shipping,Shipsanity: Aged Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded +8005,Shipping,Shipsanity: Ancient Ferns Seed,SHIPSANITY,Stardew Valley Expanded +8006,Shipping,Shipsanity: Ancient Fiber,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8007,Shipping,Shipsanity: Armor Elixir,SHIPSANITY,Stardew Valley Expanded +8008,Shipping,Shipsanity: Baby Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8009,Shipping,Shipsanity: Baked Berry Oatmeal,SHIPSANITY,Stardew Valley Expanded +8010,Shipping,Shipsanity: Barbarian Elixir,SHIPSANITY,Stardew Valley Expanded +8011,Shipping,Shipsanity: Bearberrys,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8012,Shipping,Shipsanity: Big Bark Burger,SHIPSANITY,Stardew Valley Expanded +8013,Shipping,Shipsanity: Big Conch,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8014,Shipping,Shipsanity: Blue Moon Wine,SHIPSANITY,Stardew Valley Expanded +8015,Shipping,Shipsanity: Bonefish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8016,Shipping,Shipsanity: Bull Trout,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8017,Shipping,Shipsanity: Butterfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8018,Shipping,Shipsanity: Clownfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8019,Shipping,Shipsanity: Daggerfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8020,Shipping,Shipsanity: Dewdrop Berry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8021,Shipping,Shipsanity: Dried Sand Dollar,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8022,Shipping,Shipsanity: Dulse Seaweed,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8023,Shipping,Shipsanity: Ferngill Primrose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8024,Shipping,Shipsanity: Flower Cookie,SHIPSANITY,Stardew Valley Expanded +8025,Shipping,Shipsanity: Frog,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8026,Shipping,Shipsanity: Frog Legs,SHIPSANITY,Stardew Valley Expanded +8027,Shipping,Shipsanity: Fungus Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8029,Shipping,Shipsanity: Gemfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8030,Shipping,Shipsanity: Glazed Butterfish,"SHIPSANITY",Stardew Valley Expanded +8031,Shipping,Shipsanity: Golden Ocean Flower,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8032,Shipping,Shipsanity: Goldenfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8033,Shipping,Shipsanity: Goldenrod,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8034,Shipping,Shipsanity: Grampleton Orange Chicken,SHIPSANITY,Stardew Valley Expanded +8035,Shipping,Shipsanity: Grass Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8036,Shipping,Shipsanity: Gravity Elixir,SHIPSANITY,Stardew Valley Expanded +8037,Shipping,Shipsanity: Green Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8038,Shipping,Shipsanity: Haste Elixir,SHIPSANITY,Stardew Valley Expanded +8039,Shipping,Shipsanity: Hero Elixir,SHIPSANITY,Stardew Valley Expanded +8040,Shipping,Shipsanity: King Salmon,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8050,Shipping,Shipsanity: Kittyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8051,Shipping,Shipsanity: Lightning Elixir,SHIPSANITY,Stardew Valley Expanded +8052,Shipping,Shipsanity: Lucky Four Leaf Clover,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8053,Shipping,Shipsanity: Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8054,Shipping,Shipsanity: Meteor Carp,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8055,Shipping,Shipsanity: Minnow,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8056,Shipping,Shipsanity: Mixed Berry Pie,SHIPSANITY,Stardew Valley Expanded +8057,Shipping,Shipsanity: Monster Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8058,Shipping,Shipsanity: Monster Mushroom,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8059,Shipping,Shipsanity: Mushroom Berry Rice,SHIPSANITY,Stardew Valley Expanded +8060,Shipping,Shipsanity: Mushroom Colony,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8061,Shipping,Shipsanity: Ornate Treasure Chest,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8062,Shipping,Shipsanity: Poison Mushroom,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8063,Shipping,Shipsanity: Puppyfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8064,Shipping,Shipsanity: Radioactive Bass,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8065,Shipping,Shipsanity: Red Baneberry,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8066,Shipping,Shipsanity: Rusty Blade,SHIPSANITY,Stardew Valley Expanded +8067,Shipping,Shipsanity: Salal Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8068,Shipping,Shipsanity: Sea Sponge,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8069,Shipping,Shipsanity: Seahorse,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8070,Shipping,Shipsanity: Seaweed Salad,SHIPSANITY,Stardew Valley Expanded +8071,Shipping,Shipsanity: Shiny Lunaloo,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8072,Shipping,Shipsanity: Shrub Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8073,Shipping,Shipsanity: Slime Berry,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8074,Shipping,Shipsanity: Slime Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8075,Shipping,Shipsanity: Smelly Rafflesia,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8076,Shipping,Shipsanity: Sports Drink,SHIPSANITY,Stardew Valley Expanded +8077,Shipping,Shipsanity: Stalk Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8078,Shipping,Shipsanity: Stamina Capsule,SHIPSANITY,Stardew Valley Expanded +8079,Shipping,Shipsanity: Starfish,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8080,Shipping,Shipsanity: Swirl Stone,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8081,Shipping,Shipsanity: Thistle,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8082,Shipping,Shipsanity: Torpedo Trout,"SHIPSANITY,SHIPSANITY_FISH,GINGER_ISLAND",Stardew Valley Expanded +8083,Shipping,Shipsanity: Undeadfish,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8084,Shipping,Shipsanity: Void Delight,SHIPSANITY,Stardew Valley Expanded +8085,Shipping,Shipsanity: Void Eel,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8086,Shipping,Shipsanity: Void Pebble,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8087,Shipping,Shipsanity: Void Root,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT,GINGER_ISLAND",Stardew Valley Expanded +8088,Shipping,Shipsanity: Void Salmon Sushi,SHIPSANITY,Stardew Valley Expanded +8089,Shipping,Shipsanity: Void Seed,"SHIPSANITY,GINGER_ISLAND",Stardew Valley Expanded +8090,Shipping,Shipsanity: Void Shard,SHIPSANITY,Stardew Valley Expanded +8091,Shipping,Shipsanity: Void Soul,SHIPSANITY,Stardew Valley Expanded +8092,Shipping,Shipsanity: Water Grub,"SHIPSANITY,SHIPSANITY_FISH",Stardew Valley Expanded +8093,Shipping,Shipsanity: Winter Star Rose,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Stardew Valley Expanded +8094,Shipping,Shipsanity: Wooden Display: Amphibian Fossil,SHIPSANITY,Archaeology +8095,Shipping,Shipsanity: Hardwood Display: Amphibian Fossil,SHIPSANITY,Archaeology +8096,Shipping,Shipsanity: Wooden Display: Anchor,SHIPSANITY,Archaeology +8097,Shipping,Shipsanity: Hardwood Display: Anchor,SHIPSANITY,Archaeology +8098,Shipping,Shipsanity: Wooden Display: Ancient Doll,SHIPSANITY,Archaeology +8099,Shipping,Shipsanity: Hardwood Display: Ancient Doll,SHIPSANITY,Archaeology +8100,Shipping,Shipsanity: Wooden Display: Ancient Drum,SHIPSANITY,Archaeology +8101,Shipping,Shipsanity: Hardwood Display: Ancient Drum,SHIPSANITY,Archaeology +8102,Shipping,Shipsanity: Wooden Display: Ancient Seed,SHIPSANITY,Archaeology +8103,Shipping,Shipsanity: Hardwood Display: Ancient Seed,SHIPSANITY,Archaeology +8104,Shipping,Shipsanity: Wooden Display: Ancient Sword,SHIPSANITY,Archaeology +8105,Shipping,Shipsanity: Hardwood Display: Ancient Sword,SHIPSANITY,Archaeology +8106,Shipping,Shipsanity: Wooden Display: Arrowhead,SHIPSANITY,Archaeology +8107,Shipping,Shipsanity: Hardwood Display: Arrowhead,SHIPSANITY,Archaeology +8108,Shipping,Shipsanity: Wooden Display: Bone Flute,SHIPSANITY,Archaeology +8109,Shipping,Shipsanity: Hardwood Display: Bone Flute,SHIPSANITY,Archaeology +8110,Shipping,Shipsanity: Wooden Display: Chewing Stick,SHIPSANITY,Archaeology +8111,Shipping,Shipsanity: Hardwood Display: Chewing Stick,SHIPSANITY,Archaeology +8112,Shipping,Shipsanity: Wooden Display: Chicken Statue,SHIPSANITY,Archaeology +8113,Shipping,Shipsanity: Hardwood Display: Chicken Statue,SHIPSANITY,Archaeology +8114,Shipping,Shipsanity: Wooden Display: Chipped Amphora,SHIPSANITY,Archaeology +8115,Shipping,Shipsanity: Hardwood Display: Chipped Amphora,SHIPSANITY,Archaeology +8116,Shipping,Shipsanity: Wooden Display: Dinosaur Egg,SHIPSANITY,Archaeology +8117,Shipping,Shipsanity: Hardwood Display: Dinosaur Egg,SHIPSANITY,Archaeology +8118,Shipping,Shipsanity: Wooden Display: Dried Starfish,SHIPSANITY,Archaeology +8119,Shipping,Shipsanity: Hardwood Display: Dried Starfish,SHIPSANITY,Archaeology +8120,Shipping,Shipsanity: Wooden Display: Dwarf Gadget,SHIPSANITY,Archaeology +8121,Shipping,Shipsanity: Hardwood Display: Dwarf Gadget,SHIPSANITY,Archaeology +8122,Shipping,Shipsanity: Wooden Display: Dwarf Scroll I,SHIPSANITY,Archaeology +8123,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll I,SHIPSANITY,Archaeology +8124,Shipping,Shipsanity: Wooden Display: Dwarf Scroll II,SHIPSANITY,Archaeology +8125,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll II,SHIPSANITY,Archaeology +8126,Shipping,Shipsanity: Wooden Display: Dwarf Scroll III,SHIPSANITY,Archaeology +8127,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll III,SHIPSANITY,Archaeology +8128,Shipping,Shipsanity: Wooden Display: Dwarf Scroll IV,SHIPSANITY,Archaeology +8129,Shipping,Shipsanity: Hardwood Display: Dwarf Scroll IV,SHIPSANITY,Archaeology +8130,Shipping,Shipsanity: Wooden Display: Dwarvish Helm,SHIPSANITY,Archaeology +8131,Shipping,Shipsanity: Hardwood Display: Dwarvish Helm,SHIPSANITY,Archaeology +8132,Shipping,Shipsanity: Wooden Display: Elvish Jewelry,SHIPSANITY,Archaeology +8133,Shipping,Shipsanity: Hardwood Display: Elvish Jewelry,SHIPSANITY,Archaeology +8134,Shipping,Shipsanity: Wooden Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology +8135,Shipping,Shipsanity: Hardwood Display: Fossilized Leg,"SHIPSANITY,GINGER_ISLAND",Archaeology +8136,Shipping,Shipsanity: Wooden Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology +8137,Shipping,Shipsanity: Hardwood Display: Fossilized Ribs,"SHIPSANITY,GINGER_ISLAND",Archaeology +8138,Shipping,Shipsanity: Wooden Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology +8139,Shipping,Shipsanity: Hardwood Display: Fossilized Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology +8140,Shipping,Shipsanity: Wooden Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology +8141,Shipping,Shipsanity: Hardwood Display: Fossilized Spine,"SHIPSANITY,GINGER_ISLAND",Archaeology +8142,Shipping,Shipsanity: Wooden Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology +8143,Shipping,Shipsanity: Hardwood Display: Fossilized Tail,"SHIPSANITY,GINGER_ISLAND",Archaeology +8144,Shipping,Shipsanity: Wooden Display: Glass Shards,SHIPSANITY,Archaeology +8145,Shipping,Shipsanity: Hardwood Display: Glass Shards,SHIPSANITY,Archaeology +8146,Shipping,Shipsanity: Wooden Display: Golden Mask,SHIPSANITY,Archaeology +8147,Shipping,Shipsanity: Hardwood Display: Golden Mask,SHIPSANITY,Archaeology +8148,Shipping,Shipsanity: Wooden Display: Golden Relic,SHIPSANITY,Archaeology +8149,Shipping,Shipsanity: Hardwood Display: Golden Relic,SHIPSANITY,Archaeology +8150,Shipping,Shipsanity: Wooden Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology +8151,Shipping,Shipsanity: Hardwood Display: Mummified Bat,"SHIPSANITY,GINGER_ISLAND",Archaeology +8152,Shipping,Shipsanity: Wooden Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology +8153,Shipping,Shipsanity: Hardwood Display: Mummified Frog,"SHIPSANITY,GINGER_ISLAND",Archaeology +8154,Shipping,Shipsanity: Wooden Display: Nautilus Fossil,SHIPSANITY,Archaeology +8155,Shipping,Shipsanity: Hardwood Display: Nautilus Fossil,SHIPSANITY,Archaeology +8156,Shipping,Shipsanity: Wooden Display: Ornamental Fan,SHIPSANITY,Archaeology +8157,Shipping,Shipsanity: Hardwood Display: Ornamental Fan,SHIPSANITY,Archaeology +8158,Shipping,Shipsanity: Wooden Display: Palm Fossil,SHIPSANITY,Archaeology +8159,Shipping,Shipsanity: Hardwood Display: Palm Fossil,SHIPSANITY,Archaeology +8160,Shipping,Shipsanity: Wooden Display: Prehistoric Handaxe,SHIPSANITY,Archaeology +8161,Shipping,Shipsanity: Hardwood Display: Prehistoric Handaxe,SHIPSANITY,Archaeology +8162,Shipping,Shipsanity: Wooden Display: Prehistoric Rib,SHIPSANITY,Archaeology +8163,Shipping,Shipsanity: Hardwood Display: Prehistoric Rib,SHIPSANITY,Archaeology +8164,Shipping,Shipsanity: Wooden Display: Prehistoric Scapula,SHIPSANITY,Archaeology +8165,Shipping,Shipsanity: Hardwood Display: Prehistoric Scapula,SHIPSANITY,Archaeology +8166,Shipping,Shipsanity: Wooden Display: Prehistoric Skull,SHIPSANITY,Archaeology +8167,Shipping,Shipsanity: Hardwood Display: Prehistoric Skull,SHIPSANITY,Archaeology +8168,Shipping,Shipsanity: Wooden Display: Prehistoric Tibia,SHIPSANITY,Archaeology +8169,Shipping,Shipsanity: Hardwood Display: Prehistoric Tibia,SHIPSANITY,Archaeology +8170,Shipping,Shipsanity: Wooden Display: Prehistoric Tool,SHIPSANITY,Archaeology +8171,Shipping,Shipsanity: Hardwood Display: Prehistoric Tool,SHIPSANITY,Archaeology +8172,Shipping,Shipsanity: Wooden Display: Prehistoric Vertebra,SHIPSANITY,Archaeology +8173,Shipping,Shipsanity: Hardwood Display: Prehistoric Vertebra,SHIPSANITY,Archaeology +8174,Shipping,Shipsanity: Wooden Display: Rare Disc,SHIPSANITY,Archaeology +8175,Shipping,Shipsanity: Hardwood Display: Rare Disc,SHIPSANITY,Archaeology +8176,Shipping,Shipsanity: Wooden Display: Rusty Cog,SHIPSANITY,Archaeology +8177,Shipping,Shipsanity: Hardwood Display: Rusty Cog,SHIPSANITY,Archaeology +8178,Shipping,Shipsanity: Wooden Display: Rusty Spoon,SHIPSANITY,Archaeology +8179,Shipping,Shipsanity: Hardwood Display: Rusty Spoon,SHIPSANITY,Archaeology +8180,Shipping,Shipsanity: Wooden Display: Rusty Spur,SHIPSANITY,Archaeology +8181,Shipping,Shipsanity: Hardwood Display: Rusty Spur,SHIPSANITY,Archaeology +8182,Shipping,Shipsanity: Wooden Display: Skeletal Hand,SHIPSANITY,Archaeology +8183,Shipping,Shipsanity: Hardwood Display: Skeletal Hand,SHIPSANITY,Archaeology +8184,Shipping,Shipsanity: Wooden Display: Skeletal Tail,SHIPSANITY,Archaeology +8185,Shipping,Shipsanity: Hardwood Display: Skeletal Tail,SHIPSANITY,Archaeology +8186,Shipping,Shipsanity: Wooden Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology +8187,Shipping,Shipsanity: Hardwood Display: Snake Skull,"SHIPSANITY,GINGER_ISLAND",Archaeology +8188,Shipping,Shipsanity: Wooden Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology +8189,Shipping,Shipsanity: Hardwood Display: Snake Vertebrae,"SHIPSANITY,GINGER_ISLAND",Archaeology +8190,Shipping,Shipsanity: Wooden Display: Strange Doll (Green),SHIPSANITY,Archaeology +8191,Shipping,Shipsanity: Hardwood Display: Strange Doll (Green),SHIPSANITY,Archaeology +8192,Shipping,Shipsanity: Wooden Display: Strange Doll,SHIPSANITY,Archaeology +8193,Shipping,Shipsanity: Hardwood Display: Strange Doll,SHIPSANITY,Archaeology +8194,Shipping,Shipsanity: Wooden Display: Trilobite Fossil,SHIPSANITY,Archaeology +8195,Shipping,Shipsanity: Hardwood Display: Trilobite Fossil,SHIPSANITY,Archaeology +8196,Shipping,Shipsanity: Bone Path,SHIPSANITY,Archaeology +8197,Shipping,Shipsanity: Glass Fence,SHIPSANITY,Archaeology +8198,Shipping,Shipsanity: Glass Path,SHIPSANITY,Archaeology +8199,Shipping,Shipsanity: Hardwood Display,SHIPSANITY,Archaeology +8200,Shipping,Shipsanity: Wooden Display,SHIPSANITY,Archaeology +8201,Shipping,Shipsanity: Dwarf Gadget: Infinite Volcano Simulation,"SHIPSANITY,GINGER_ISLAND",Archaeology +8202,Shipping,Shipsanity: Water Shifter,SHIPSANITY,Archaeology +8203,Shipping,Shipsanity: Brown Amanita,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul +8204,Shipping,Shipsanity: Swamp Herb,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul +8205,Shipping,Shipsanity: Void Mint Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8206,Shipping,Shipsanity: Vile Ancient Fruit Seeds,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8207,Shipping,Shipsanity: Void Mint Leaves,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul +8208,Shipping,Shipsanity: Vile Ancient Fruit,"SHIPSANITY,SHIPSANITY_CROP,SHIPSANITY_FULL_SHIPMENT",Distant Lands - Witch Swamp Overhaul +8209,Shipping,Shipsanity: Void Minnow,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul +8210,Shipping,Shipsanity: Swamp Leech,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul +8211,Shipping,Shipsanity: Purple Algae,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8212,Shipping,Shipsanity: Giant Horsehoe Crab,"SHIPSANITY,SHIPSANITY_FISH",Distant Lands - Witch Swamp Overhaul +8213,Shipping,Shipsanity: Mushroom Kebab,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8214,Shipping,Shipsanity: Crayfish Soup,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8215,Shipping,Shipsanity: Pemmican,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8216,Shipping,Shipsanity: Void Mint Tea,SHIPSANITY,Distant Lands - Witch Swamp Overhaul +8217,Shipping,Shipsanity: Ginger Tincture,"SHIPSANITY,GINGER_ISLAND",Distant Lands - Witch Swamp Overhaul +8218,Shipping,Shipsanity: Neanderthal Limb Bones,SHIPSANITY,Boarding House and Bus Stop Extension +8219,Shipping,Shipsanity: Dinosaur Claw,SHIPSANITY,Boarding House and Bus Stop Extension +8220,Shipping,Shipsanity: Special Pumpkin Soup,SHIPSANITY,Boarding House and Bus Stop Extension +8221,Shipping,Shipsanity: Pterodactyl L Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension +8222,Shipping,Shipsanity: Dinosaur Skull,SHIPSANITY,Boarding House and Bus Stop Extension +8223,Shipping,Shipsanity: Dinosaur Tooth,SHIPSANITY,Boarding House and Bus Stop Extension +8224,Shipping,Shipsanity: Pterodactyl Egg,"SHIPSANITY,SHIPSANITY_FULL_SHIPMENT",Boarding House and Bus Stop Extension +8225,Shipping,Shipsanity: Pterodactyl Ribs,SHIPSANITY,Boarding House and Bus Stop Extension +8226,Shipping,Shipsanity: Dinosaur Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension +8227,Shipping,Shipsanity: Neanderthal Ribs,SHIPSANITY,Boarding House and Bus Stop Extension +8228,Shipping,Shipsanity: Dinosaur Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension +8229,Shipping,Shipsanity: Dinosaur Ribs,SHIPSANITY,Boarding House and Bus Stop Extension +8230,Shipping,Shipsanity: Pterodactyl Phalange,SHIPSANITY,Boarding House and Bus Stop Extension +8231,Shipping,Shipsanity: Pterodactyl Vertebra,SHIPSANITY,Boarding House and Bus Stop Extension +8232,Shipping,Shipsanity: Neanderthal Pelvis,SHIPSANITY,Boarding House and Bus Stop Extension +8233,Shipping,Shipsanity: Pterodactyl Skull,SHIPSANITY,Boarding House and Bus Stop Extension +8234,Shipping,Shipsanity: Dinosaur Femur,SHIPSANITY,Boarding House and Bus Stop Extension +8235,Shipping,Shipsanity: Pterodactyl Claw,SHIPSANITY,Boarding House and Bus Stop Extension +8236,Shipping,Shipsanity: Neanderthal Skull,SHIPSANITY,Boarding House and Bus Stop Extension +8237,Shipping,Shipsanity: Pterodactyl R Wing Bone,SHIPSANITY,Boarding House and Bus Stop Extension diff --git a/worlds/stardew_valley/data/monster_data.py b/worlds/stardew_valley/data/monster_data.py index 6030571f89fe..b423fce4a3db 100644 --- a/worlds/stardew_valley/data/monster_data.py +++ b/worlds/stardew_valley/data/monster_data.py @@ -1,8 +1,173 @@ -class Monster: - duggy = "Duggy" - blue_slime = "Blue Slime" - pepper_rex = "Pepper Rex" - stone_golem = "Stone Golem" +from dataclasses import dataclass +from typing import List, Tuple, Dict, Set, Callable +from ..mods.mod_data import ModNames +from ..mods.mod_monster_locations import modded_monsters_locations +from ..strings.monster_names import Monster, MonsterCategory +from ..strings.performance_names import Performance +from ..strings.region_names import Region -frozen_monsters = (Monster.blue_slime,) + +@dataclass(frozen=True) +class StardewMonster: + name: str + category: str + locations: Tuple[str] + difficulty: str + + def __repr__(self): + return f"{self.name} [{self.category}] (Locations: {self.locations} |" \ + f" Difficulty: {self.difficulty}) |" + + +slime_hutch = (Region.slime_hutch,) +mines_floor_20 = (Region.mines_floor_20,) +mines_floor_60 = (Region.mines_floor_60,) +mines_floor_100 = (Region.mines_floor_100,) +dangerous_mines_20 = (Region.dangerous_mines_20,) +dangerous_mines_60 = (Region.dangerous_mines_60,) +dangerous_mines_100 = (Region.dangerous_mines_100,) +quarry_mine = (Region.quarry_mine,) +mutant_bug_lair = (Region.mutant_bug_lair,) +skull_cavern = (Region.skull_cavern_25,) +skull_cavern_high = (Region.skull_cavern_75,) +skull_cavern_dangerous = (Region.dangerous_skull_cavern,) +tiger_slime_grove = (Region.island_west,) +volcano = (Region.volcano_floor_5,) +volcano_high = (Region.volcano_floor_10,) + +all_monsters: List[StardewMonster] = [] +monster_modifications_by_mod: Dict[str, Dict[str, Callable[[str, StardewMonster], StardewMonster]]] = {} + + +def create_monster(name: str, category: str, locations: Tuple[str, ...], difficulty: str) -> StardewMonster: + monster = StardewMonster(name, category, locations, difficulty) + all_monsters.append(monster) + return monster + + +def update_monster_locations(mod_name: str, monster: StardewMonster): + new_locations = modded_monsters_locations[mod_name][monster.name] + total_locations = tuple(sorted(set(monster.locations + new_locations))) + return StardewMonster(monster.name, monster.category, total_locations, monster.difficulty) + + +def register_monster_modification(mod_name: str, monster: StardewMonster, modification_function): + if mod_name not in monster_modifications_by_mod: + monster_modifications_by_mod[mod_name] = {} + monster_modifications_by_mod[mod_name][monster.name] = modification_function + + +green_slime = create_monster(Monster.green_slime, MonsterCategory.slime, mines_floor_20, Performance.basic) +blue_slime = create_monster(Monster.blue_slime, MonsterCategory.slime, mines_floor_60, Performance.decent) +red_slime = create_monster(Monster.red_slime, MonsterCategory.slime, mines_floor_100, Performance.good) +purple_slime = create_monster(Monster.purple_slime, MonsterCategory.slime, skull_cavern, Performance.great) +yellow_slime = create_monster(Monster.yellow_slime, MonsterCategory.slime, skull_cavern_high, Performance.galaxy) +black_slime = create_monster(Monster.black_slime, MonsterCategory.slime, slime_hutch, Performance.decent) +copper_slime = create_monster(Monster.copper_slime, MonsterCategory.slime, quarry_mine, Performance.decent) +iron_slime = create_monster(Monster.iron_slime, MonsterCategory.slime, quarry_mine, Performance.good) +tiger_slime = create_monster(Monster.tiger_slime, MonsterCategory.slime, tiger_slime_grove, Performance.galaxy) + +shadow_shaman = create_monster(Monster.shadow_shaman, MonsterCategory.void_spirits, mines_floor_100, Performance.good) +shadow_shaman_dangerous = create_monster(Monster.shadow_shaman_dangerous, MonsterCategory.void_spirits, dangerous_mines_100, Performance.galaxy) +shadow_brute = create_monster(Monster.shadow_brute, MonsterCategory.void_spirits, mines_floor_100, Performance.good) +shadow_brute_dangerous = create_monster(Monster.shadow_brute_dangerous, MonsterCategory.void_spirits, dangerous_mines_100, Performance.galaxy) +shadow_sniper = create_monster(Monster.shadow_sniper, MonsterCategory.void_spirits, dangerous_mines_100, Performance.galaxy) + +bat = create_monster(Monster.bat, MonsterCategory.bats, mines_floor_20, Performance.basic) +bat_dangerous = create_monster(Monster.bat_dangerous, MonsterCategory.bats, dangerous_mines_20, Performance.galaxy) +frost_bat = create_monster(Monster.frost_bat, MonsterCategory.bats, mines_floor_60, Performance.decent) +frost_bat_dangerous = create_monster(Monster.frost_bat_dangerous, MonsterCategory.bats, dangerous_mines_60, Performance.galaxy) +lava_bat = create_monster(Monster.lava_bat, MonsterCategory.bats, mines_floor_100, Performance.good) +iridium_bat = create_monster(Monster.iridium_bat, MonsterCategory.bats, skull_cavern_high, Performance.great) + +skeleton = create_monster(Monster.skeleton, MonsterCategory.skeletons, mines_floor_100, Performance.good) +skeleton_dangerous = create_monster(Monster.skeleton_dangerous, MonsterCategory.skeletons, dangerous_mines_100, Performance.galaxy) +skeleton_mage = create_monster(Monster.skeleton_mage, MonsterCategory.skeletons, dangerous_mines_100, Performance.galaxy) + +bug = create_monster(Monster.bug, MonsterCategory.cave_insects, mines_floor_20, Performance.basic) +bug_dangerous = create_monster(Monster.bug_dangerous, MonsterCategory.cave_insects, dangerous_mines_20, Performance.galaxy) +cave_fly = create_monster(Monster.cave_fly, MonsterCategory.cave_insects, mines_floor_20, Performance.basic) +cave_fly_dangerous = create_monster(Monster.cave_fly_dangerous, MonsterCategory.cave_insects, dangerous_mines_60, Performance.galaxy) +grub = create_monster(Monster.grub, MonsterCategory.cave_insects, mines_floor_20, Performance.basic) +grub_dangerous = create_monster(Monster.grub_dangerous, MonsterCategory.cave_insects, dangerous_mines_60, Performance.galaxy) +mutant_fly = create_monster(Monster.mutant_fly, MonsterCategory.cave_insects, mutant_bug_lair, Performance.good) +mutant_grub = create_monster(Monster.mutant_grub, MonsterCategory.cave_insects, mutant_bug_lair, Performance.good) +armored_bug = create_monster(Monster.armored_bug, MonsterCategory.cave_insects, skull_cavern, Performance.basic) # Requires 'Bug Killer' enchantment +armored_bug_dangerous = create_monster(Monster.armored_bug_dangerous, MonsterCategory.cave_insects, skull_cavern, + Performance.good) # Requires 'Bug Killer' enchantment + +duggy = create_monster(Monster.duggy, MonsterCategory.duggies, mines_floor_20, Performance.basic) +duggy_dangerous = create_monster(Monster.duggy_dangerous, MonsterCategory.duggies, dangerous_mines_20, Performance.great) +magma_duggy = create_monster(Monster.magma_duggy, MonsterCategory.duggies, volcano, Performance.galaxy) + +dust_sprite = create_monster(Monster.dust_sprite, MonsterCategory.dust_sprites, mines_floor_60, Performance.basic) +dust_sprite_dangerous = create_monster(Monster.dust_sprite_dangerous, MonsterCategory.dust_sprites, dangerous_mines_60, Performance.great) + +rock_crab = create_monster(Monster.rock_crab, MonsterCategory.rock_crabs, mines_floor_20, Performance.basic) +rock_crab_dangerous = create_monster(Monster.rock_crab_dangerous, MonsterCategory.rock_crabs, dangerous_mines_20, Performance.great) +lava_crab = create_monster(Monster.lava_crab, MonsterCategory.rock_crabs, mines_floor_100, Performance.good) +lava_crab_dangerous = create_monster(Monster.lava_crab_dangerous, MonsterCategory.rock_crabs, dangerous_mines_100, Performance.galaxy) +iridium_crab = create_monster(Monster.iridium_crab, MonsterCategory.rock_crabs, skull_cavern, Performance.great) + +mummy = create_monster(Monster.mummy, MonsterCategory.mummies, skull_cavern, Performance.great) # Requires bombs or "Crusader" enchantment +mummy_dangerous = create_monster(Monster.mummy_dangerous, MonsterCategory.mummies, skull_cavern_dangerous, + Performance.maximum) # Requires bombs or "Crusader" enchantment + +pepper_rex = create_monster(Monster.pepper_rex, MonsterCategory.pepper_rex, skull_cavern, Performance.great) + +serpent = create_monster(Monster.serpent, MonsterCategory.serpents, skull_cavern, Performance.galaxy) +royal_serpent = create_monster(Monster.royal_serpent, MonsterCategory.serpents, skull_cavern_dangerous, Performance.maximum) + +magma_sprite = create_monster(Monster.magma_sprite, MonsterCategory.magma_sprites, volcano, Performance.galaxy) +magma_sparker = create_monster(Monster.magma_sparker, MonsterCategory.magma_sprites, volcano_high, Performance.galaxy) + +register_monster_modification(ModNames.sve, shadow_brute_dangerous, update_monster_locations) +register_monster_modification(ModNames.sve, shadow_sniper, update_monster_locations) +register_monster_modification(ModNames.sve, shadow_shaman_dangerous, update_monster_locations) +register_monster_modification(ModNames.sve, mummy_dangerous, update_monster_locations) +register_monster_modification(ModNames.sve, royal_serpent, update_monster_locations) +register_monster_modification(ModNames.sve, skeleton_dangerous, update_monster_locations) +register_monster_modification(ModNames.sve, skeleton_mage, update_monster_locations) +register_monster_modification(ModNames.sve, dust_sprite_dangerous, update_monster_locations) + +register_monster_modification(ModNames.deepwoods, shadow_brute, update_monster_locations) +register_monster_modification(ModNames.deepwoods, cave_fly, update_monster_locations) +register_monster_modification(ModNames.deepwoods, green_slime, update_monster_locations) + +register_monster_modification(ModNames.boarding_house, pepper_rex, update_monster_locations) +register_monster_modification(ModNames.boarding_house, shadow_brute, update_monster_locations) +register_monster_modification(ModNames.boarding_house, iridium_bat, update_monster_locations) +register_monster_modification(ModNames.boarding_house, frost_bat, update_monster_locations) +register_monster_modification(ModNames.boarding_house, cave_fly, update_monster_locations) +register_monster_modification(ModNames.boarding_house, bat, update_monster_locations) +register_monster_modification(ModNames.boarding_house, grub, update_monster_locations) +register_monster_modification(ModNames.boarding_house, bug, update_monster_locations) + + +def all_monsters_by_name_given_mods(mods: Set[str]) -> Dict[str, StardewMonster]: + monsters_by_name = {} + for monster in all_monsters: + current_monster = monster + for mod in monster_modifications_by_mod: + if mod not in mods or monster.name not in monster_modifications_by_mod[mod]: + continue + modification_function = monster_modifications_by_mod[mod][monster.name] + current_monster = modification_function(mod, current_monster) + monsters_by_name[monster.name] = current_monster + return monsters_by_name + + +def all_monsters_by_category_given_mods(mods: Set[str]) -> Dict[str, Tuple[StardewMonster, ...]]: + monsters_by_category = {} + for monster in all_monsters: + current_monster = monster + for mod in monster_modifications_by_mod: + if mod not in mods or monster.name not in monster_modifications_by_mod[mod]: + continue + modification_function = monster_modifications_by_mod[mod][monster.name] + current_monster = modification_function(mod, current_monster) + if current_monster.category not in monsters_by_category: + monsters_by_category[monster.category] = () + monsters_by_category[current_monster.category] = monsters_by_category[current_monster.category] + (current_monster,) + return monsters_by_category diff --git a/worlds/stardew_valley/data/museum_data.py b/worlds/stardew_valley/data/museum_data.py index b786f5b2d00c..544bb92e6e55 100644 --- a/worlds/stardew_valley/data/museum_data.py +++ b/worlds/stardew_valley/data/museum_data.py @@ -3,23 +3,24 @@ from dataclasses import dataclass from typing import List, Tuple, Union, Optional -from . import common_data as common -from .game_item import GameItem -from .monster_data import Monster +from ..strings.monster_names import Monster +from ..strings.fish_names import WaterChest +from ..strings.forageable_names import Forageable +from ..strings.metal_names import Mineral, Artifact, Fossil from ..strings.region_names import Region from ..strings.geode_names import Geode @dataclass(frozen=True) -class MuseumItem(GameItem): +class MuseumItem: + item_name: str locations: Tuple[str, ...] geodes: Tuple[str, ...] monsters: Tuple[str, ...] difficulty: float @staticmethod - def of(name: str, - item_id: int, + def of(item_name: str, difficulty: float, locations: Union[str, Tuple[str, ...]], geodes: Union[str, Tuple[str, ...]], @@ -33,10 +34,10 @@ def of(name: str, if isinstance(monsters, str): monsters = (monsters,) - return MuseumItem(name, item_id, locations, geodes, monsters, difficulty) + return MuseumItem(item_name, locations, geodes, monsters, difficulty) def __repr__(self): - return f"{self.name} [{self.item_id}] (Locations: {self.locations} |" \ + return f"{self.item_name} (Locations: {self.locations} |" \ f" Geodes: {self.geodes} |" \ f" Monsters: {self.monsters}) " @@ -50,20 +51,18 @@ def __repr__(self): def create_artifact(name: str, - item_id: int, difficulty: float, locations: Union[str, Tuple[str, ...]] = (), geodes: Union[str, Tuple[str, ...]] = (), monsters: Union[str, Tuple[str, ...]] = ()) -> MuseumItem: - artifact_item = MuseumItem.of(name, item_id, difficulty, locations, geodes, monsters) + artifact_item = MuseumItem.of(name, difficulty, locations, geodes, monsters) all_museum_artifacts.append(artifact_item) all_museum_items.append(artifact_item) return artifact_item def create_mineral(name: str, - item_id: int, - locations: Union[str, Tuple[str, ...]], + locations: Union[str, Tuple[str, ...]] = (), geodes: Union[str, Tuple[str, ...]] = (), monsters: Union[str, Tuple[str, ...]] = (), difficulty: Optional[float] = None) -> MuseumItem: @@ -78,212 +77,207 @@ def create_mineral(name: str, if "Omni Geode" in geodes: difficulty += 31.0 / 2750.0 * 100 - mineral_item = MuseumItem.of(name, item_id, difficulty, locations, geodes, monsters) + mineral_item = MuseumItem.of(name, difficulty, locations, geodes, monsters) all_museum_minerals.append(mineral_item) all_museum_items.append(mineral_item) return mineral_item class Artifact: - dwarf_scroll_i = create_artifact("Dwarf Scroll I", 96, 5.6, Region.mines_floor_20, + dwarf_scroll_i = create_artifact("Dwarf Scroll I", 5.6, Region.mines_floor_20, monsters=unlikely) - dwarf_scroll_ii = create_artifact("Dwarf Scroll II", 97, 3, Region.mines_floor_20, + dwarf_scroll_ii = create_artifact("Dwarf Scroll II", 3, Region.mines_floor_20, monsters=unlikely) - dwarf_scroll_iii = create_artifact("Dwarf Scroll III", 98, 7.5, Region.mines_floor_60, + dwarf_scroll_iii = create_artifact("Dwarf Scroll III", 7.5, Region.mines_floor_60, monsters=Monster.blue_slime) - dwarf_scroll_iv = create_artifact("Dwarf Scroll IV", 99, 4, Region.mines_floor_100) - chipped_amphora = create_artifact("Chipped Amphora", 100, 6.7, Region.town, + dwarf_scroll_iv = create_artifact("Dwarf Scroll IV", 4, Region.mines_floor_100) + chipped_amphora = create_artifact("Chipped Amphora", 6.7, Region.town, geodes=Geode.artifact_trove) - arrowhead = create_artifact("Arrowhead", 101, 8.5, (Region.mountain, Region.forest, Region.bus_stop), + arrowhead = create_artifact("Arrowhead", 8.5, (Region.mountain, Region.forest, Region.bus_stop), geodes=Geode.artifact_trove) - ancient_doll = create_artifact("Ancient Doll", 103, 13.1, (Region.mountain, Region.forest, Region.bus_stop), - geodes=(Geode.artifact_trove, common.fishing_chest)) - elvish_jewelry = create_artifact("Elvish Jewelry", 104, 5.3, Region.forest, - geodes=(Geode.artifact_trove, common.fishing_chest)) - chewing_stick = create_artifact("Chewing Stick", 105, 10.3, (Region.mountain, Region.forest, Region.town), - geodes=(Geode.artifact_trove, common.fishing_chest)) - ornamental_fan = create_artifact("Ornamental Fan", 106, 7.4, (Region.beach, Region.forest, Region.town), - geodes=(Geode.artifact_trove, common.fishing_chest)) - dinosaur_egg = create_artifact("Dinosaur Egg", 107, 11.4, (Region.mountain, Region.skull_cavern), - geodes=common.fishing_chest, + ancient_doll = create_artifact("Ancient Doll", 13.1, (Region.mountain, Region.forest, Region.bus_stop), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + elvish_jewelry = create_artifact("Elvish Jewelry", 5.3, Region.forest, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + chewing_stick = create_artifact("Chewing Stick", 10.3, (Region.mountain, Region.forest, Region.town), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + ornamental_fan = create_artifact("Ornamental Fan", 7.4, (Region.beach, Region.forest, Region.town), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + dinosaur_egg = create_artifact("Dinosaur Egg", 11.4, (Region.mountain, Region.skull_cavern), + geodes=WaterChest.fishing_chest, monsters=Monster.pepper_rex) - rare_disc = create_artifact("Rare Disc", 108, 5.6, Region.stardew_valley, - geodes=(Geode.artifact_trove, common.fishing_chest), + rare_disc = create_artifact("Rare Disc", 5.6, Region.stardew_valley, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest), monsters=unlikely) - ancient_sword = create_artifact("Ancient Sword", 109, 5.8, (Region.forest, Region.mountain), - geodes=(Geode.artifact_trove, common.fishing_chest)) - rusty_spoon = create_artifact("Rusty Spoon", 110, 9.6, Region.town, - geodes=(Geode.artifact_trove, common.fishing_chest)) - rusty_spur = create_artifact("Rusty Spur", 111, 15.6, Region.farm, - geodes=(Geode.artifact_trove, common.fishing_chest)) - rusty_cog = create_artifact("Rusty Cog", 112, 9.6, Region.mountain, - geodes=(Geode.artifact_trove, common.fishing_chest)) - chicken_statue = create_artifact("Chicken Statue", 113, 13.5, Region.farm, - geodes=(Geode.artifact_trove, common.fishing_chest)) - ancient_seed = create_artifact("Ancient Seed", 114, 8.4, (Region.forest, Region.mountain), - geodes=(Geode.artifact_trove, common.fishing_chest), + ancient_sword = create_artifact("Ancient Sword", 5.8, (Region.forest, Region.mountain), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + rusty_spoon = create_artifact("Rusty Spoon", 9.6, Region.town, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + rusty_spur = create_artifact("Rusty Spur", 15.6, Region.farm, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + rusty_cog = create_artifact("Rusty Cog", 9.6, Region.mountain, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + chicken_statue = create_artifact("Chicken Statue", 13.5, Region.farm, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + ancient_seed = create_artifact("Ancient Seed", 8.4, (Region.forest, Region.mountain), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest), monsters=unlikely) - prehistoric_tool = create_artifact("Prehistoric Tool", 115, 11.1, (Region.mountain, Region.forest, Region.bus_stop), - geodes=(Geode.artifact_trove, common.fishing_chest)) - dried_starfish = create_artifact("Dried Starfish", 116, 12.5, Region.beach, - geodes=(Geode.artifact_trove, common.fishing_chest)) - anchor = create_artifact("Anchor", 117, 8.5, Region.beach, geodes=(Geode.artifact_trove, common.fishing_chest)) - glass_shards = create_artifact("Glass Shards", 118, 11.5, Region.beach, - geodes=(Geode.artifact_trove, common.fishing_chest)) - bone_flute = create_artifact("Bone Flute", 119, 6.3, (Region.mountain, Region.forest, Region.town), - geodes=(Geode.artifact_trove, common.fishing_chest)) - prehistoric_handaxe = create_artifact("Prehistoric Handaxe", 120, 13.7, + prehistoric_tool = create_artifact("Prehistoric Tool", 11.1, (Region.mountain, Region.forest, Region.bus_stop), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + dried_starfish = create_artifact("Dried Starfish", 12.5, Region.beach, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + anchor = create_artifact("Anchor", 8.5, Region.beach, geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + glass_shards = create_artifact("Glass Shards", 11.5, Region.beach, + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + bone_flute = create_artifact("Bone Flute", 6.3, (Region.mountain, Region.forest, Region.town), + geodes=(Geode.artifact_trove, WaterChest.fishing_chest)) + prehistoric_handaxe = create_artifact(Artifact.prehistoric_handaxe, 13.7, (Region.mountain, Region.forest, Region.bus_stop), geodes=Geode.artifact_trove) - dwarvish_helm = create_artifact("Dwarvish Helm", 121, 8.7, Region.mines_floor_20, + dwarvish_helm = create_artifact("Dwarvish Helm", 8.7, Region.mines_floor_20, geodes=(Geode.geode, Geode.omni, Geode.artifact_trove)) - dwarf_gadget = create_artifact("Dwarf Gadget", 122, 9.7, Region.mines_floor_60, + dwarf_gadget = create_artifact("Dwarf Gadget", 9.7, Region.mines_floor_60, geodes=(Geode.magma, Geode.omni, Geode.artifact_trove)) - ancient_drum = create_artifact("Ancient Drum", 123, 9.5, (Region.bus_stop, Region.forest, Region.town), + ancient_drum = create_artifact("Ancient Drum", 9.5, (Region.bus_stop, Region.forest, Region.town), geodes=(Geode.frozen, Geode.omni, Geode.artifact_trove)) - golden_mask = create_artifact("Golden Mask", 124, 6.7, Region.desert, + golden_mask = create_artifact("Golden Mask", 6.7, Region.desert, geodes=Geode.artifact_trove) - golden_relic = create_artifact("Golden Relic", 125, 9.7, Region.desert, + golden_relic = create_artifact("Golden Relic", 9.7, Region.desert, geodes=Geode.artifact_trove) - strange_doll_green = create_artifact("Strange Doll (Green)", 126, 10, Region.town, - geodes=common.secret_note) - strange_doll = create_artifact("Strange Doll", 127, 10, Region.desert, - geodes=common.secret_note) - prehistoric_scapula = create_artifact("Prehistoric Scapula", 579, 6.2, + strange_doll_green = create_artifact("Strange Doll (Green)", 10, Region.town, + geodes=Forageable.secret_note) + strange_doll = create_artifact("Strange Doll", 10, Region.desert, + geodes=Forageable.secret_note) + prehistoric_scapula = create_artifact("Prehistoric Scapula", 6.2, (Region.dig_site, Region.forest, Region.town)) - prehistoric_tibia = create_artifact("Prehistoric Tibia", 580, 16.6, + prehistoric_tibia = create_artifact("Prehistoric Tibia", 16.6, (Region.dig_site, Region.forest, Region.railroad)) - prehistoric_skull = create_artifact("Prehistoric Skull", 581, 3.9, (Region.dig_site, Region.mountain)) - skeletal_hand = create_artifact("Skeletal Hand", 582, 7.9, (Region.dig_site, Region.backwoods, Region.beach)) - prehistoric_rib = create_artifact("Prehistoric Rib", 583, 15, (Region.dig_site, Region.farm, Region.town), + prehistoric_skull = create_artifact("Prehistoric Skull", 3.9, (Region.dig_site, Region.mountain)) + skeletal_hand = create_artifact(Fossil.skeletal_hand, 7.9, (Region.dig_site, Region.backwoods, Region.beach)) + prehistoric_rib = create_artifact("Prehistoric Rib", 15, (Region.dig_site, Region.farm, Region.town), monsters=Monster.pepper_rex) - prehistoric_vertebra = create_artifact("Prehistoric Vertebra", 584, 12.7, (Region.dig_site, Region.bus_stop), + prehistoric_vertebra = create_artifact("Prehistoric Vertebra", 12.7, (Region.dig_site, Region.bus_stop), monsters=Monster.pepper_rex) - skeletal_tail = create_artifact("Skeletal Tail", 585, 5.1, (Region.dig_site, Region.mines_floor_20), - geodes=common.fishing_chest) - nautilus_fossil = create_artifact("Nautilus Fossil", 586, 6.9, (Region.dig_site, Region.beach), - geodes=common.fishing_chest) - amphibian_fossil = create_artifact("Amphibian Fossil", 587, 6.3, (Region.dig_site, Region.forest, Region.mountain), - geodes=common.fishing_chest) - palm_fossil = create_artifact("Palm Fossil", 588, 10.2, + skeletal_tail = create_artifact("Skeletal Tail", 5.1, (Region.dig_site, Region.mines_floor_20), + geodes=WaterChest.fishing_chest) + nautilus_fossil = create_artifact("Nautilus Fossil", 6.9, (Region.dig_site, Region.beach), + geodes=WaterChest.fishing_chest) + amphibian_fossil = create_artifact("Amphibian Fossil", 6.3, (Region.dig_site, Region.forest, Region.mountain), + geodes=WaterChest.fishing_chest) + palm_fossil = create_artifact("Palm Fossil", 10.2, (Region.dig_site, Region.desert, Region.forest, Region.beach)) - trilobite = create_artifact("Trilobite", 589, 7.4, (Region.dig_site, Region.desert, Region.forest, Region.beach)) + trilobite = create_artifact("Trilobite", 7.4, (Region.dig_site, Region.desert, Region.forest, Region.beach)) class Mineral: - quartz = create_mineral("Quartz", 80, Region.mines_floor_20, - monsters=Monster.stone_golem) - fire_quartz = create_mineral("Fire Quartz", 82, Region.mines_floor_100, - geodes=(Geode.magma, Geode.omni, common.fishing_chest), + quartz = create_mineral(Mineral.quartz, Region.mines_floor_20) + fire_quartz = create_mineral("Fire Quartz", Region.mines_floor_100, + geodes=(Geode.magma, Geode.omni, WaterChest.fishing_chest), difficulty=1.0 / 12.0) - frozen_tear = create_mineral("Frozen Tear", 84, Region.mines_floor_60, - geodes=(Geode.frozen, Geode.omni, common.fishing_chest), + frozen_tear = create_mineral("Frozen Tear", Region.mines_floor_60, + geodes=(Geode.frozen, Geode.omni, WaterChest.fishing_chest), monsters=unlikely, difficulty=1.0 / 12.0) - earth_crystal = create_mineral("Earth Crystal", 86, Region.mines_floor_20, - geodes=(Geode.geode, Geode.omni, common.fishing_chest), + earth_crystal = create_mineral("Earth Crystal", Region.mines_floor_20, + geodes=(Geode.geode, Geode.omni, WaterChest.fishing_chest), monsters=Monster.duggy, difficulty=1.0 / 12.0) - emerald = create_mineral("Emerald", 60, Region.mines_floor_100, - geodes=common.fishing_chest) - aquamarine = create_mineral("Aquamarine", 62, Region.mines_floor_60, - geodes=common.fishing_chest) - ruby = create_mineral("Ruby", 64, Region.mines_floor_100, - geodes=common.fishing_chest) - amethyst = create_mineral("Amethyst", 66, Region.mines_floor_20, - geodes=common.fishing_chest) - topaz = create_mineral("Topaz", 68, Region.mines_floor_20, - geodes=common.fishing_chest) - jade = create_mineral("Jade", 70, Region.mines_floor_60, - geodes=common.fishing_chest) - diamond = create_mineral("Diamond", 72, Region.mines_floor_60, - geodes=common.fishing_chest) - prismatic_shard = create_mineral("Prismatic Shard", 74, Region.skull_cavern_100, + emerald = create_mineral("Emerald", Region.mines_floor_100, + geodes=WaterChest.fishing_chest) + aquamarine = create_mineral("Aquamarine", Region.mines_floor_60, + geodes=WaterChest.fishing_chest) + ruby = create_mineral("Ruby", Region.mines_floor_100, + geodes=WaterChest.fishing_chest) + amethyst = create_mineral("Amethyst", Region.mines_floor_20, + geodes=WaterChest.fishing_chest) + topaz = create_mineral("Topaz", Region.mines_floor_20, + geodes=WaterChest.fishing_chest) + jade = create_mineral("Jade", Region.mines_floor_60, + geodes=WaterChest.fishing_chest) + diamond = create_mineral("Diamond", Region.mines_floor_60, + geodes=WaterChest.fishing_chest) + prismatic_shard = create_mineral("Prismatic Shard", Region.skull_cavern_100, geodes=unlikely, monsters=unlikely) - alamite = create_mineral("Alamite", 538, Region.town, + alamite = create_mineral("Alamite", geodes=(Geode.geode, Geode.omni)) - bixite = create_mineral("Bixite", 539, Region.town, + bixite = create_mineral("Bixite", geodes=(Geode.magma, Geode.omni), monsters=unlikely) - baryte = create_mineral("Baryte", 540, Region.town, + baryte = create_mineral("Baryte", geodes=(Geode.magma, Geode.omni)) - aerinite = create_mineral("Aerinite", 541, Region.town, + aerinite = create_mineral("Aerinite", geodes=(Geode.frozen, Geode.omni)) - calcite = create_mineral("Calcite", 542, Region.town, + calcite = create_mineral("Calcite", geodes=(Geode.geode, Geode.omni)) - dolomite = create_mineral("Dolomite", 543, Region.town, + dolomite = create_mineral("Dolomite", geodes=(Geode.magma, Geode.omni)) - esperite = create_mineral("Esperite", 544, Region.town, + esperite = create_mineral("Esperite", geodes=(Geode.frozen, Geode.omni)) - fluorapatite = create_mineral("Fluorapatite", 545, Region.town, + fluorapatite = create_mineral("Fluorapatite", geodes=(Geode.frozen, Geode.omni)) - geminite = create_mineral("Geminite", 546, Region.town, + geminite = create_mineral("Geminite", geodes=(Geode.frozen, Geode.omni)) - helvite = create_mineral("Helvite", 547, Region.town, + helvite = create_mineral("Helvite", geodes=(Geode.magma, Geode.omni)) - jamborite = create_mineral("Jamborite", 548, Region.town, + jamborite = create_mineral("Jamborite", geodes=(Geode.geode, Geode.omni)) - jagoite = create_mineral("Jagoite", 549, Region.town, + jagoite = create_mineral("Jagoite", geodes=(Geode.geode, Geode.omni)) - kyanite = create_mineral("Kyanite", 550, Region.town, + kyanite = create_mineral("Kyanite", geodes=(Geode.frozen, Geode.omni)) - lunarite = create_mineral("Lunarite", 551, Region.town, + lunarite = create_mineral("Lunarite", geodes=(Geode.frozen, Geode.omni)) - malachite = create_mineral("Malachite", 552, Region.town, + malachite = create_mineral("Malachite", geodes=(Geode.geode, Geode.omni)) - neptunite = create_mineral("Neptunite", 553, Region.town, + neptunite = create_mineral("Neptunite", geodes=(Geode.magma, Geode.omni)) - lemon_stone = create_mineral("Lemon Stone", 554, Region.town, + lemon_stone = create_mineral("Lemon Stone", geodes=(Geode.magma, Geode.omni)) - nekoite = create_mineral("Nekoite", 555, Region.town, + nekoite = create_mineral("Nekoite", geodes=(Geode.geode, Geode.omni)) - orpiment = create_mineral("Orpiment", 556, Region.town, + orpiment = create_mineral("Orpiment", geodes=(Geode.geode, Geode.omni)) - petrified_slime = create_mineral("Petrified Slime", 557, Region.town, - geodes=(Geode.geode, Geode.omni)) - thunder_egg = create_mineral("Thunder Egg", 558, Region.town, + petrified_slime = create_mineral(Mineral.petrified_slime, Region.slime_hutch) + thunder_egg = create_mineral("Thunder Egg", geodes=(Geode.geode, Geode.omni)) - pyrite = create_mineral("Pyrite", 559, Region.town, + pyrite = create_mineral("Pyrite", geodes=(Geode.frozen, Geode.omni)) - ocean_stone = create_mineral("Ocean Stone", 560, Region.town, + ocean_stone = create_mineral("Ocean Stone", geodes=(Geode.frozen, Geode.omni)) - ghost_crystal = create_mineral("Ghost Crystal", 561, Region.town, + ghost_crystal = create_mineral("Ghost Crystal", geodes=(Geode.frozen, Geode.omni)) - tigerseye = create_mineral("Tigerseye", 562, Region.town, + tigerseye = create_mineral("Tigerseye", geodes=(Geode.magma, Geode.omni)) - jasper = create_mineral("Jasper", 563, Region.town, + jasper = create_mineral("Jasper", geodes=(Geode.magma, Geode.omni)) - opal = create_mineral("Opal", 564, Region.town, + opal = create_mineral("Opal", geodes=(Geode.frozen, Geode.omni)) - fire_opal = create_mineral("Fire Opal", 565, Region.town, + fire_opal = create_mineral("Fire Opal", geodes=(Geode.magma, Geode.omni)) - celestine = create_mineral("Celestine", 566, Region.town, + celestine = create_mineral("Celestine", geodes=(Geode.geode, Geode.omni)) - marble = create_mineral("Marble", 567, Region.town, + marble = create_mineral("Marble", geodes=(Geode.frozen, Geode.omni)) - sandstone = create_mineral("Sandstone", 568, Region.town, + sandstone = create_mineral("Sandstone", geodes=(Geode.geode, Geode.omni)) - granite = create_mineral("Granite", 569, Region.town, + granite = create_mineral("Granite", geodes=(Geode.geode, Geode.omni)) - basalt = create_mineral("Basalt", 570, Region.town, + basalt = create_mineral("Basalt", geodes=(Geode.magma, Geode.omni)) - limestone = create_mineral("Limestone", 571, Region.town, + limestone = create_mineral("Limestone", geodes=(Geode.geode, Geode.omni)) - soapstone = create_mineral("Soapstone", 572, Region.town, + soapstone = create_mineral("Soapstone", geodes=(Geode.frozen, Geode.omni)) - hematite = create_mineral("Hematite", 573, Region.town, + hematite = create_mineral("Hematite", geodes=(Geode.frozen, Geode.omni)) - mudstone = create_mineral("Mudstone", 574, Region.town, + mudstone = create_mineral("Mudstone", geodes=(Geode.geode, Geode.omni)) - obsidian = create_mineral("Obsidian", 575, Region.town, + obsidian = create_mineral("Obsidian", geodes=(Geode.magma, Geode.omni)) - slate = create_mineral("Slate", 576, Region.town, - geodes=(Geode.geode, Geode.omni)) - fairy_stone = create_mineral("Fairy Stone", 577, Region.town, - geodes=(Geode.frozen, Geode.omni)) - star_shards = create_mineral("Star Shards", 578, Region.town, - geodes=(Geode.magma, Geode.omni)) + slate = create_mineral("Slate", geodes=(Geode.geode, Geode.omni)) + fairy_stone = create_mineral("Fairy Stone", geodes=(Geode.frozen, Geode.omni)) + star_shards = create_mineral("Star Shards", geodes=(Geode.magma, Geode.omni)) dwarf_scrolls = (Artifact.dwarf_scroll_i, Artifact.dwarf_scroll_ii, Artifact.dwarf_scroll_iii, Artifact.dwarf_scroll_iv) @@ -291,4 +285,4 @@ class Mineral: skeleton_middle = (Artifact.prehistoric_rib, Artifact.prehistoric_vertebra) skeleton_back = (Artifact.prehistoric_tibia, Artifact.skeletal_tail) -all_museum_items_by_name = {item.name: item for item in all_museum_items} +all_museum_items_by_name = {item.item_name: item for item in all_museum_items} diff --git a/worlds/stardew_valley/data/recipe_data.py b/worlds/stardew_valley/data/recipe_data.py index dc1b490bf93c..62dcd8709c64 100644 --- a/worlds/stardew_valley/data/recipe_data.py +++ b/worlds/stardew_valley/data/recipe_data.py @@ -1,78 +1,35 @@ -from typing import Dict, List - +from typing import Dict, List, Optional +from ..mods.mod_data import ModNames +from .recipe_source import RecipeSource, FriendshipSource, SkillSource, QueenOfSauceSource, ShopSource, StarterSource, ShopTradeSource, ShopFriendshipSource from ..strings.animal_product_names import AnimalProduct from ..strings.artisan_good_names import ArtisanGood -from ..strings.crop_names import Fruit, Vegetable -from ..strings.fish_names import Fish, WaterItem +from ..strings.craftable_names import ModEdible, Edible +from ..strings.crop_names import Fruit, Vegetable, SVEFruit, DistantLandsCrop +from ..strings.fish_names import Fish, SVEFish, WaterItem, DistantLandsFish from ..strings.flower_names import Flower -from ..strings.forageable_names import Forageable +from ..strings.forageable_names import Forageable, SVEForage, DistantLandsForageable from ..strings.ingredient_names import Ingredient -from ..strings.food_names import Meal, Beverage -from ..strings.region_names import Region +from ..strings.food_names import Meal, SVEMeal, Beverage, DistantLandsMeal, BoardingHouseMeal +from ..strings.material_names import Material +from ..strings.metal_names import Fossil +from ..strings.monster_drop_names import Loot +from ..strings.region_names import Region, SVERegion from ..strings.season_names import Season from ..strings.skill_names import Skill -from ..strings.villager_names import NPC - - -class RecipeSource: - pass - - -class StarterSource(RecipeSource): - pass - - -class QueenOfSauceSource(RecipeSource): - year: int - season: str - day: int - - def __init__(self, year: int, season: str, day: int): - self.year = year - self.season = season - self.day = day - - -class FriendshipSource(RecipeSource): - friend: str - hearts: int - - def __init__(self, friend: str, hearts: int): - self.friend = friend - self.hearts = hearts - - -class SkillSource(RecipeSource): - skill: str - level: int - - def __init__(self, skill: str, level: int): - self.skill = skill - self.level = level - - -class ShopSource(RecipeSource): - region: str - price: int - - def __init__(self, region: str, price: int): - self.region = region - self.price = price - - -class ShopTradeSource(ShopSource): - currency: str +from ..strings.villager_names import NPC, ModNPC class CookingRecipe: meal: str ingredients: Dict[str, int] source: RecipeSource + mod_name: Optional[str] = None - def __init__(self, meal: str, ingredients: Dict[str, int], source: RecipeSource): + def __init__(self, meal: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None): self.meal = meal self.ingredients = ingredients self.source = source + self.mod_name = mod_name def __repr__(self): return f"{self.meal} (Source: {self.source} |" \ @@ -82,9 +39,14 @@ def __repr__(self): all_cooking_recipes: List[CookingRecipe] = [] -def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int]) -> CookingRecipe: +def friendship_recipe(name: str, friend: str, hearts: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe: source = FriendshipSource(friend, hearts) - return create_recipe(name, ingredients, source) + return create_recipe(name, ingredients, source, mod_name) + + +def friendship_and_shop_recipe(name: str, friend: str, hearts: int, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe: + source = ShopFriendshipSource(friend, hearts, region, price) + return create_recipe(name, ingredients, source, mod_name) def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int]) -> CookingRecipe: @@ -92,8 +54,13 @@ def skill_recipe(name: str, skill: str, level: int, ingredients: Dict[str, int]) return create_recipe(name, ingredients, source) -def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int]) -> CookingRecipe: +def shop_recipe(name: str, region: str, price: int, ingredients: Dict[str, int], mod_name: Optional[str] = None) -> CookingRecipe: source = ShopSource(region, price) + return create_recipe(name, ingredients, source, mod_name) + + +def shop_trade_recipe(name: str, region: str, currency: str, price: int, ingredients: Dict[str, int]) -> CookingRecipe: + source = ShopTradeSource(region, currency, price) return create_recipe(name, ingredients, source) @@ -107,34 +74,44 @@ def starter_recipe(name: str, ingredients: Dict[str, int]) -> CookingRecipe: return create_recipe(name, ingredients, source) -def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource) -> CookingRecipe: - recipe = CookingRecipe(name, ingredients, source) +def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource, mod_name: Optional[str] = None) -> CookingRecipe: + recipe = CookingRecipe(name, ingredients, source, mod_name) all_cooking_recipes.append(recipe) return recipe algae_soup = friendship_recipe(Meal.algae_soup, NPC.clint, 3, {WaterItem.green_algae: 4}) artichoke_dip = queen_of_sauce_recipe(Meal.artichoke_dip, 1, Season.fall, 28, {Vegetable.artichoke: 1, AnimalProduct.cow_milk: 1}) +autumn_bounty = friendship_recipe(Meal.autumn_bounty, NPC.demetrius, 7, {Vegetable.yam: 1, Vegetable.pumpkin: 1}) baked_fish = queen_of_sauce_recipe(Meal.baked_fish, 1, Season.summer, 7, {Fish.sunfish: 1, Fish.bream: 1, Ingredient.wheat_flour: 1}) +banana_pudding = shop_trade_recipe(Meal.banana_pudding, Region.island_trader, Fossil.bone_fragment, 30, {Fruit.banana: 1, AnimalProduct.cow_milk: 1, Ingredient.sugar: 1}) bean_hotpot = friendship_recipe(Meal.bean_hotpot, NPC.clint, 7, {Vegetable.green_bean: 2}) blackberry_cobbler_ingredients = {Forageable.blackberry: 2, Ingredient.sugar: 1, Ingredient.wheat_flour: 1} blackberry_cobbler_qos = queen_of_sauce_recipe(Meal.blackberry_cobbler, 2, Season.fall, 14, blackberry_cobbler_ingredients) -blueberry_tart = friendship_recipe(Meal.blueberry_tart, NPC.pierre, 3, {Fruit.blueberry: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.any_egg: 1}) +blueberry_tart_ingredients = {Fruit.blueberry: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.any_egg: 1} +blueberry_tart = friendship_recipe(Meal.blueberry_tart, NPC.pierre, 3, blueberry_tart_ingredients) bread = queen_of_sauce_recipe(Meal.bread, 1, Season.summer, 28, {Ingredient.wheat_flour: 1}) +bruschetta = queen_of_sauce_recipe(Meal.bruschetta, 2, Season.winter, 21, {Meal.bread: 1, Ingredient.oil: 1, Vegetable.tomato: 1}) +carp_surprise = queen_of_sauce_recipe(Meal.carp_surprise, 2, Season.summer, 7, {Fish.carp: 4}) cheese_cauliflower = friendship_recipe(Meal.cheese_cauliflower, NPC.pam, 3, {Vegetable.cauliflower: 1, ArtisanGood.cheese: 1}) chocolate_cake_ingredients = {Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.chicken_egg: 1} chocolate_cake_qos = queen_of_sauce_recipe(Meal.chocolate_cake, 1, Season.winter, 14, chocolate_cake_ingredients) -chowder = friendship_recipe(Meal.chowder, NPC.willy, 3, {WaterItem.clam: 1, AnimalProduct.cow_milk: 1}) -complete_breakfast = queen_of_sauce_recipe(Meal.complete_breakfast, 2, Season.spring, 21, {Meal.fried_egg: 1, AnimalProduct.milk: 1, Meal.hashbrowns: 1, Meal.pancakes: 1}) +chowder = friendship_recipe(Meal.chowder, NPC.willy, 3, {Fish.clam: 1, AnimalProduct.cow_milk: 1}) +coleslaw = queen_of_sauce_recipe(Meal.coleslaw, 14, Season.spring, 14, {Vegetable.red_cabbage: 1, Ingredient.vinegar: 1, ArtisanGood.mayonnaise: 1}) +complete_breakfast_ingredients = {Meal.fried_egg: 1, AnimalProduct.milk: 1, Meal.hashbrowns: 1, Meal.pancakes: 1} +complete_breakfast = queen_of_sauce_recipe(Meal.complete_breakfast, 2, Season.spring, 21, complete_breakfast_ingredients) +cookie = friendship_recipe(Meal.cookie, NPC.evelyn, 4, {Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.chicken_egg: 1}) crab_cakes_ingredients = {Fish.crab: 1, Ingredient.wheat_flour: 1, AnimalProduct.chicken_egg: 1, Ingredient.oil: 1} crab_cakes_qos = queen_of_sauce_recipe(Meal.crab_cakes, 2, Season.fall, 21, crab_cakes_ingredients) cranberry_candy = queen_of_sauce_recipe(Meal.cranberry_candy, 1, Season.winter, 28, {Fruit.cranberries: 1, Fruit.apple: 1, Ingredient.sugar: 1}) +cranberry_sauce = friendship_recipe(Meal.cranberry_sauce, NPC.gus, 7, {Fruit.cranberries: 1, Ingredient.sugar: 1}) crispy_bass = friendship_recipe(Meal.crispy_bass, NPC.kent, 3, {Fish.largemouth_bass: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}) dish_o_the_sea = skill_recipe(Meal.dish_o_the_sea, Skill.fishing, 3, {Fish.sardine: 2, Meal.hashbrowns: 1}) eggplant_parmesan = friendship_recipe(Meal.eggplant_parmesan, NPC.lewis, 7, {Vegetable.eggplant: 1, Vegetable.tomato: 1}) escargot = friendship_recipe(Meal.escargot, NPC.willy, 5, {Fish.snail: 1, Vegetable.garlic: 1}) farmer_lunch = skill_recipe(Meal.farmer_lunch, Skill.farming, 3, {Meal.omelet: 2, Vegetable.parsnip: 1}) fiddlehead_risotto = queen_of_sauce_recipe(Meal.fiddlehead_risotto, 2, Season.fall, 28, {Ingredient.oil: 1, Forageable.fiddlehead_fern: 1, Vegetable.garlic: 1}) +fish_stew = friendship_recipe(Meal.fish_stew, NPC.willy, 7, {Fish.crayfish: 1, Fish.mussel: 1, Fish.periwinkle: 1, Vegetable.tomato: 1}) fish_taco = friendship_recipe(Meal.fish_taco, NPC.linus, 7, {Fish.tuna: 1, Meal.tortilla: 1, Vegetable.red_cabbage: 1, ArtisanGood.mayonnaise: 1}) fried_calamari = friendship_recipe(Meal.fried_calamari, NPC.jodi, 3, {Fish.squid: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}) fried_eel = friendship_recipe(Meal.fried_eel, NPC.george, 3, {Fish.eel: 1, Ingredient.oil: 1}) @@ -145,7 +122,12 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource) glazed_yams = queen_of_sauce_recipe(Meal.glazed_yams, 1, Season.fall, 21, {Vegetable.yam: 1, Ingredient.sugar: 1}) hashbrowns = queen_of_sauce_recipe(Meal.hashbrowns, 2, Season.spring, 14, {Vegetable.potato: 1, Ingredient.oil: 1}) ice_cream = friendship_recipe(Meal.ice_cream, NPC.jodi, 7, {AnimalProduct.cow_milk: 1, Ingredient.sugar: 1}) +lobster_bisque_ingredients = {Fish.lobster: 1, AnimalProduct.cow_milk: 1} +lobster_bisque_friend = friendship_recipe(Meal.lobster_bisque, NPC.willy, 9, lobster_bisque_ingredients) +lobster_bisque_qos = queen_of_sauce_recipe(Meal.lobster_bisque, 2, Season.winter, 14, lobster_bisque_ingredients) +lucky_lunch = queen_of_sauce_recipe(Meal.lucky_lunch, 2, Season.spring, 28, {Fish.sea_cucumber: 1, Meal.tortilla: 1, Flower.blue_jazz: 1}) maki_roll = queen_of_sauce_recipe(Meal.maki_roll, 1, Season.summer, 21, {Fish.any: 1, WaterItem.seaweed: 1, Ingredient.rice: 1}) +mango_sticky_rice = friendship_recipe(Meal.mango_sticky_rice, NPC.leo, 7, {Fruit.mango: 1, Forageable.coconut: 1, Ingredient.rice: 1}) maple_bar = queen_of_sauce_recipe(Meal.maple_bar, 2, Season.summer, 14, {ArtisanGood.maple_syrup: 1, Ingredient.sugar: 1, Ingredient.wheat_flour: 1}) miners_treat = skill_recipe(Meal.miners_treat, Skill.mining, 3, {Forageable.cave_carrot: 2, Ingredient.sugar: 1, AnimalProduct.cow_milk: 1}) omelet = queen_of_sauce_recipe(Meal.omelet, 1, Season.spring, 28, {AnimalProduct.chicken_egg: 1, AnimalProduct.cow_milk: 1}) @@ -159,9 +141,12 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource) pizza_qos = queen_of_sauce_recipe(Meal.pizza, 2, Season.spring, 7, pizza_ingredients) pizza_saloon = shop_recipe(Meal.pizza, Region.saloon, 150, pizza_ingredients) plum_pudding = queen_of_sauce_recipe(Meal.plum_pudding, 1, Season.winter, 7, {Forageable.wild_plum: 2, Ingredient.wheat_flour: 1, Ingredient.sugar: 1}) +poi = friendship_recipe(Meal.poi, NPC.leo, 3, {Vegetable.taro_root: 4}) poppyseed_muffin = queen_of_sauce_recipe(Meal.poppyseed_muffin, 2, Season.winter, 7, {Flower.poppy: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1}) pumpkin_pie_ingredients = {Vegetable.pumpkin: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1, AnimalProduct.cow_milk: 1} pumpkin_pie_qos = queen_of_sauce_recipe(Meal.pumpkin_pie, 1, Season.winter, 21, pumpkin_pie_ingredients) +pumpkin_soup = friendship_recipe(Meal.pumpkin_soup, NPC.robin, 7, {Vegetable.pumpkin: 1, AnimalProduct.cow_milk: 1}) +radish_salad = queen_of_sauce_recipe(Meal.radish_salad, 1, Season.spring, 21, {Ingredient.oil: 1, Ingredient.vinegar: 1, Vegetable.radish: 1}) red_plate = friendship_recipe(Meal.red_plate, NPC.emily, 7, {Vegetable.red_cabbage: 1, Vegetable.radish: 1}) rhubarb_pie = friendship_recipe(Meal.rhubarb_pie, NPC.marnie, 7, {Fruit.rhubarb: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1}) rice_pudding = friendship_recipe(Meal.rice_pudding, NPC.evelyn, 7, {AnimalProduct.milk: 1, Ingredient.sugar: 1, Ingredient.rice: 1}) @@ -170,21 +155,59 @@ def create_recipe(name: str, ingredients: Dict[str, int], source: RecipeSource) salad = friendship_recipe(Meal.salad, NPC.emily, 3, {Forageable.leek: 1, Forageable.dandelion: 1, Ingredient.vinegar: 1}) salmon_dinner = friendship_recipe(Meal.salmon_dinner, NPC.gus, 3, {Fish.salmon: 1, Vegetable.amaranth: 1, Vegetable.kale: 1}) sashimi = friendship_recipe(Meal.sashimi, NPC.linus, 3, {Fish.any: 1}) +seafoam_pudding = skill_recipe(Meal.seafoam_pudding, Skill.fishing, 9, {Fish.flounder: 1, Fish.midnight_carp: 1, AnimalProduct.squid_ink: 1}) +shrimp_cocktail = queen_of_sauce_recipe(Meal.shrimp_cocktail, 2, Season.winter, 28, {Vegetable.tomato: 1, Fish.shrimp: 1, Forageable.wild_horseradish: 1}) spaghetti = friendship_recipe(Meal.spaghetti, NPC.lewis, 3, {Vegetable.tomato: 1, Ingredient.wheat_flour: 1}) +spicy_eel = friendship_recipe(Meal.spicy_eel, NPC.george, 7, {Fish.eel: 1, Fruit.hot_pepper: 1}) +squid_ink_ravioli = skill_recipe(Meal.squid_ink_ravioli, Skill.combat, 9, {AnimalProduct.squid_ink: 1, Ingredient.wheat_flour: 1, Vegetable.tomato: 1}) stir_fry_ingredients = {Forageable.cave_carrot: 1, Forageable.common_mushroom: 1, Vegetable.kale: 1, Ingredient.sugar: 1} stir_fry_qos = queen_of_sauce_recipe(Meal.stir_fry, 1, Season.spring, 7, stir_fry_ingredients) +strange_bun = friendship_recipe(Meal.strange_bun, NPC.shane, 7, {Ingredient.wheat_flour: 1, Fish.periwinkle: 1, ArtisanGood.void_mayonnaise: 1}) stuffing = friendship_recipe(Meal.stuffing, NPC.pam, 7, {Meal.bread: 1, Fruit.cranberries: 1, Forageable.hazelnut: 1}) +super_meal = friendship_recipe(Meal.super_meal, NPC.kent, 7, {Vegetable.bok_choy: 1, Fruit.cranberries: 1, Vegetable.artichoke: 1}) survival_burger = skill_recipe(Meal.survival_burger, Skill.foraging, 2, {Meal.bread: 1, Forageable.cave_carrot: 1, Vegetable.eggplant: 1}) +tom_kha_soup = friendship_recipe(Meal.tom_kha_soup, NPC.sandy, 7, {Forageable.coconut: 1, Fish.shrimp: 1, Forageable.common_mushroom: 1}) tortilla_ingredients = {Vegetable.corn: 1} tortilla_qos = queen_of_sauce_recipe(Meal.tortilla, 1, Season.fall, 7, tortilla_ingredients) tortilla_saloon = shop_recipe(Meal.tortilla, Region.saloon, 100, tortilla_ingredients) triple_shot_espresso = shop_recipe(Beverage.triple_shot_espresso, Region.saloon, 5000, {Beverage.coffee: 3}) tropical_curry = shop_recipe(Meal.tropical_curry, Region.island_resort, 2000, {Forageable.coconut: 1, Fruit.pineapple: 1, Fruit.hot_pepper: 1}) +trout_soup = queen_of_sauce_recipe(Meal.trout_soup, 1, Season.fall, 14, {Fish.rainbow_trout: 1, WaterItem.green_algae: 1}) vegetable_medley = friendship_recipe(Meal.vegetable_medley, NPC.caroline, 7, {Vegetable.tomato: 1, Vegetable.beet: 1}) - - - - - - +magic_elixir = shop_recipe(ModEdible.magic_elixir, Region.adventurer_guild, 3000, {Edible.life_elixir: 1, Forageable.purple_mushroom: 1}, ModNames.magic) + +baked_berry_oatmeal = shop_recipe(SVEMeal.baked_berry_oatmeal, SVERegion.bear_shop, 0, {Forageable.salmonberry: 15, Forageable.blackberry: 15, + Ingredient.sugar: 1, Ingredient.wheat_flour: 2}, ModNames.sve) +big_bark_burger = friendship_and_shop_recipe(SVEMeal.big_bark_burger, NPC.gus, 5, Region.saloon, 5500, + {SVEFish.puppyfish: 1, Meal.bread: 1, Ingredient.oil: 1}, ModNames.sve) +flower_cookie = shop_recipe(SVEMeal.flower_cookie, SVERegion.bear_shop, 0, {SVEForage.ferngill_primrose: 1, SVEForage.goldenrod: 1, + SVEForage.winter_star_rose: 1, Ingredient.wheat_flour: 1, Ingredient.sugar: 1, + AnimalProduct.large_egg: 1}, ModNames.sve) +frog_legs = shop_recipe(SVEMeal.frog_legs, Region.adventurer_guild, 2000, {SVEFish.frog: 1, Ingredient.oil: 1, Ingredient.wheat_flour: 1}, ModNames.sve) +glazed_butterfish = friendship_and_shop_recipe(SVEMeal.glazed_butterfish, NPC.gus, 10, Region.saloon, 4000, + {SVEFish.butterfish: 1, Ingredient.wheat_flour: 1, Ingredient.oil: 1}, ModNames.sve) +mixed_berry_pie = shop_recipe(SVEMeal.mixed_berry_pie, Region.saloon, 3500, {Fruit.strawberry: 6, SVEFruit.salal_berry: 6, Forageable.blackberry: 6, + SVEForage.bearberrys: 6, Ingredient.sugar: 1, Ingredient.wheat_flour: 1}, + ModNames.sve) +mushroom_berry_rice = friendship_and_shop_recipe(SVEMeal.mushroom_berry_rice, ModNPC.marlon, 6, Region.adventurer_guild, 1500, {SVEForage.poison_mushroom: 3, SVEForage.red_baneberry: 10, + Ingredient.rice: 1, Ingredient.sugar: 2}, ModNames.sve) +seaweed_salad = shop_recipe(SVEMeal.seaweed_salad, Region.fish_shop, 1250, {SVEFish.dulse_seaweed: 2, WaterItem.seaweed: 2, Ingredient.oil: 1}, ModNames.sve) +void_delight = friendship_and_shop_recipe(SVEMeal.void_delight, NPC.krobus, 10, Region.sewer, 5000, + {SVEFish.void_eel: 1, Loot.void_essence: 50, Loot.solar_essence: 20}, ModNames.sve) +void_salmon_sushi = friendship_and_shop_recipe(SVEMeal.void_salmon_sushi, NPC.krobus, 10, Region.sewer, 5000, + {Fish.void_salmon: 1, ArtisanGood.void_mayonnaise: 1, WaterItem.seaweed: 3}, ModNames.sve) + +mushroom_kebab = friendship_recipe(DistantLandsMeal.mushroom_kebab, ModNPC.goblin, 2, {Forageable.chanterelle: 1, Forageable.common_mushroom: 1, + Forageable.red_mushroom: 1, Material.wood: 1}, ModNames.distant_lands) +void_mint_tea = friendship_recipe(DistantLandsMeal.void_mint_tea, ModNPC.goblin, 4, {DistantLandsCrop.void_mint: 1}, ModNames.distant_lands) +crayfish_soup = friendship_recipe(DistantLandsMeal.crayfish_soup, ModNPC.goblin, 6, {Forageable.cave_carrot: 1, Fish.crayfish: 1, + DistantLandsFish.purple_algae: 1, WaterItem.white_algae: 1}, ModNames.distant_lands) +pemmican = friendship_recipe(DistantLandsMeal.pemmican, ModNPC.goblin, 8, {Loot.bug_meat: 1, Fish.any: 1, Forageable.salmonberry: 3, + Material.stone: 2}, ModNames.distant_lands) + +special_pumpkin_soup = friendship_recipe(BoardingHouseMeal.special_pumpkin_soup, ModNPC.joel, 6, {Vegetable.pumpkin: 2, AnimalProduct.large_goat_milk: 1, + Vegetable.garlic: 1}, ModNames.boarding_house) + + +all_cooking_recipes_by_name = {recipe.meal: recipe for recipe in all_cooking_recipes} \ No newline at end of file diff --git a/worlds/stardew_valley/data/recipe_source.py b/worlds/stardew_valley/data/recipe_source.py new file mode 100644 index 000000000000..8dd622e926e7 --- /dev/null +++ b/worlds/stardew_valley/data/recipe_source.py @@ -0,0 +1,149 @@ +from typing import Union, List, Tuple + + +class RecipeSource: + + def __repr__(self): + return f"RecipeSource" + + +class StarterSource(RecipeSource): + + def __repr__(self): + return f"StarterSource" + + +class ArchipelagoSource(RecipeSource): + ap_item: Tuple[str] + + def __init__(self, ap_item: Union[str, List[str]]): + if isinstance(ap_item, str): + ap_item = [ap_item] + self.ap_item = tuple(ap_item) + + def __repr__(self): + return f"ArchipelagoSource {self.ap_item}" + + +class LogicSource(RecipeSource): + logic_rule: str + + def __init__(self, logic_rule: str): + self.logic_rule = logic_rule + + def __repr__(self): + return f"LogicSource {self.logic_rule}" + + +class QueenOfSauceSource(RecipeSource): + year: int + season: str + day: int + + def __init__(self, year: int, season: str, day: int): + self.year = year + self.season = season + self.day = day + + def __repr__(self): + return f"QueenOfSauceSource at year {self.year} {self.season} {self.day}" + + +class QuestSource(RecipeSource): + quest: str + + def __init__(self, quest: str): + self.quest = quest + + def __repr__(self): + return f"QuestSource at quest {self.quest}" + + +class FriendshipSource(RecipeSource): + friend: str + hearts: int + + def __init__(self, friend: str, hearts: int): + self.friend = friend + self.hearts = hearts + + def __repr__(self): + return f"FriendshipSource at {self.friend} {self.hearts} <3" + + +class CutsceneSource(FriendshipSource): + region: str + + def __init__(self, region: str, friend: str, hearts: int): + super().__init__(friend, hearts) + self.region = region + + def __repr__(self): + return f"CutsceneSource at {self.region}" + + +class SkillSource(RecipeSource): + skill: str + level: int + + def __init__(self, skill: str, level: int): + self.skill = skill + self.level = level + + def __repr__(self): + return f"SkillSource at level {self.level} {self.skill}" + + +class ShopSource(RecipeSource): + region: str + price: int + + def __init__(self, region: str, price: int): + self.region = region + self.price = price + + def __repr__(self): + return f"ShopSource at {self.region} costing {self.price}g" + + +class ShopFriendshipSource(RecipeSource): + friend: str + hearts: int + region: str + price: int + + def __init__(self, friend: str, hearts: int, region: str, price: int): + self.friend = friend + self.hearts = hearts + self.region = region + self.price = price + + def __repr__(self): + return f"ShopFriendshipSource at {self.region} costing {self.price}g when {self.friend} has {self.hearts} hearts" + + +class FestivalShopSource(ShopSource): + + def __init__(self, region: str, price: int): + super().__init__(region, price) + + +class ShopTradeSource(ShopSource): + currency: str + + def __init__(self, region: str, currency: str, price: int): + super().__init__(region, price) + self.currency = currency + + def __repr__(self): + return f"ShopTradeSource at {self.region} costing {self.price} {self.currency}" + + +class SpecialOrderSource(RecipeSource): + special_order: str + + def __init__(self, special_order: str): + self.special_order = special_order + + def __repr__(self): + return f"SpecialOrderSource from {self.special_order}" diff --git a/worlds/stardew_valley/data/shipsanity_unimplemented_items.csv b/worlds/stardew_valley/data/shipsanity_unimplemented_items.csv new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/worlds/stardew_valley/data/villagers_data.py b/worlds/stardew_valley/data/villagers_data.py index e858d46f34a3..ae6a346d56d7 100644 --- a/worlds/stardew_valley/data/villagers_data.py +++ b/worlds/stardew_valley/data/villagers_data.py @@ -1,7 +1,10 @@ from dataclasses import dataclass -from typing import List, Tuple, Optional, Dict -from ..strings.region_names import Region +from typing import List, Tuple, Optional, Dict, Callable, Set + from ..mods.mod_data import ModNames +from ..strings.food_names import Beverage +from ..strings.generic_names import Generic +from ..strings.region_names import Region, SVERegion, AlectoRegion, BoardingHouseRegion, LaceyRegion from ..strings.season_names import Season from ..strings.villager_names import NPC, ModNPC @@ -14,7 +17,7 @@ class Villager: birthday: str gifts: Tuple[str] available: bool - mod_name: Optional[str] + mod_name: str def __repr__(self): return f"{self.name} [Bachelor: {self.bachelor}] [Available from start: {self.available}]" \ @@ -41,6 +44,23 @@ def __repr__(self): secret_woods = (Region.secret_woods,) wizard_tower = (Region.wizard_tower,) +# Stardew Valley Expanded Locations +adventurer = (Region.adventurer_guild,) +highlands = (SVERegion.highlands_outside,) +bluemoon = (SVERegion.blue_moon_vineyard,) +aurora = (SVERegion.aurora_vineyard,) +museum = (Region.museum,) +jojamart = (Region.jojamart,) +railroad = (Region.railroad,) +junimo = (SVERegion.junimo_woods,) + +# Stray Locations +witch_swamp = (Region.witch_swamp,) +witch_attic = (AlectoRegion.witch_attic,) +hat_house = (LaceyRegion.hat_house,) +the_lost_valley = (BoardingHouseRegion.the_lost_valley,) +boarding_house = (BoardingHouseRegion.boarding_house_first,) + golden_pumpkin = ("Golden Pumpkin",) # magic_rock_candy = ("Magic Rock Candy",) pearl = ("Pearl",) @@ -183,7 +203,7 @@ def __repr__(self): pale_ale = ("Pale Ale",) parsnip = ("Parsnip",) # parsnip_soup = ("Parsnip Soup",) -pina_colada = ("Piña Colada",) +pina_colada = (Beverage.pina_colada,) pam_loves = beer + cactus_fruit + glazed_yams + mead + pale_ale + parsnip + pina_colada # | parsnip_soup # fried_calamari = ("Fried Calamari",) pierre_loves = () # fried_calamari @@ -209,7 +229,7 @@ def __repr__(self): void_essence = ("Void Essence",) wizard_loves = purple_mushroom + solar_essence + super_cucumber + void_essence -#Custom NPC Items and Loves +# Custom NPC Items and Loves blueberry = ("Blueberry",) chanterelle = ("Chanterelle",) @@ -271,8 +291,72 @@ def __repr__(self): juna_loves = ancient_doll + elvish_jewelry + dinosaur_egg + strange_doll + joja_cola + hashbrowns + pancakes + \ pink_cake + jelly + ghost_crystal + prehistoric_scapula + cherry +glazed_butterfish = ("Glazed Butterfish",) +aged_blue_moon_wine = ("Aged Blue Moon Wine",) +blue_moon_wine = ("Blue Moon Wine",) +daggerfish = ("Daggerfish",) +gemfish = ("Gemfish",) +green_mushroom = ("Green Mushroom",) +monster_mushroom = ("Monster Mushroom",) +swirl_stone = ("Swirl Stone",) +torpedo_trout = ("Torpedo Trout",) +void_shard = ("Void Shard",) +ornate_treasure_chest = ("Ornate Treasure Chest",) +frog_legs = ("Frog Legs",) +void_delight = ("Void Delight",) +void_pebble = ("Void Pebble",) +void_salmon_sushi = ("Void Salmon Sushi",) +puppyfish = ("Puppyfish",) +butterfish = ("Butterfish",) +king_salmon = ("King Salmon",) +frog = ("Frog",) +kittyfish = ("Kittyfish",) +big_bark_burger = ("Big Bark Burger",) +starfruit = ("Starfruit",) +bruschetta = ("Brushetta",) +apricot = ("Apricot",) +ocean_stone = ("Ocean Stone",) +fairy_stone = ("Fairy Stone",) +lunarite = ("Lunarite",) +bean_hotpot = ("Bean Hotpot",) +petrified_slime = ("Petrified Slime",) +ornamental_fan = ("Ornamental Fan",) +ancient_sword = ("Ancient Sword",) +star_shards = ("Star Shards",) +life_elixir = ("Life Elixir",) +juice = ("Juice",) +lobster_bisque = ("Lobster Bisque",) +chowder = ("Chowder",) +goat_milk = ("Goat Milk",) +maple_syrup = ("Maple Syrup",) +cookie = ("Cookie",) +blueberry_tart = ("Blueberry Tart",) + +claire_loves = green_tea + sunflower + energy_tonic + bruschetta + apricot + ocean_stone + glazed_butterfish +lance_loves = aged_blue_moon_wine + daggerfish + gemfish + golden_pumpkin + \ + green_mushroom + monster_mushroom + swirl_stone + torpedo_trout + tropical_curry + void_shard + \ + ornate_treasure_chest +olivia_loves = wine + chocolate_cake + pink_cake + golden_mask + golden_relic + \ + blue_moon_wine + aged_blue_moon_wine +sophia_loves = fairy_rose + fairy_stone + puppyfish +victor_loves = spaghetti + battery_pack + duck_feather + lunarite + \ + aged_blue_moon_wine + blue_moon_wine + butterfish +andy_loves = pearl + beer + mead + pale_ale + farmers_lunch + glazed_butterfish + butterfish + \ + king_salmon + blackberry_cobbler +gunther_loves = bean_hotpot + petrified_slime + salmon_dinner + elvish_jewelry + ornamental_fan + \ + dinosaur_egg + rare_disc + ancient_sword + dwarvish_helm + dwarf_gadget + golden_mask + golden_relic + \ + star_shards +marlon_loves = roots_platter + life_elixir + aged_blue_moon_wine + void_delight +martin_loves = juice + ice_cream + big_bark_burger +morgan_loves = iridium_bar + void_egg + void_mayonnaise + frog + kittyfish +morris_loves = lobster_bisque + chowder + truffle_oil + star_shards + aged_blue_moon_wine +scarlett_loves = goat_cheese + duck_feather + goat_milk + cherry + maple_syrup + honey + \ + chocolate_cake + pink_cake + jade + glazed_yams # actually large milk but meh +susan_loves = pancakes + chocolate_cake + pink_cake + ice_cream + cookie + pumpkin_pie + rhubarb_pie + \ + blueberry_tart + blackberry_cobbler + cranberry_candy + red_plate all_villagers: List[Villager] = [] +villager_modifications_by_mod: Dict[str, Dict[str, Callable[[str, Villager], Villager]]] = {} def villager(name: str, bachelor: bool, locations: Tuple[str, ...], birthday: str, gifts: Tuple[str, ...], @@ -282,6 +366,18 @@ def villager(name: str, bachelor: bool, locations: Tuple[str, ...], birthday: st return npc +def make_bachelor(mod_name: str, npc: Villager): + if npc.mod_name: + mod_name = npc.mod_name + return Villager(npc.name, True, npc.locations, npc.birthday, npc.gifts, npc.available, mod_name) + + +def register_villager_modification(mod_name: str, npc: Villager, modification_function): + if mod_name not in villager_modifications_by_mod: + villager_modifications_by_mod[mod_name] = {} + villager_modifications_by_mod[mod_name][npc.name] = modification_function + + josh = villager(NPC.alex, True, town + alex_house, Season.summer, universal_loves + complete_breakfast + salmon_dinner, True) elliott = villager(NPC.elliott, True, town + beach + elliott_house, Season.fall, universal_loves + elliott_loves, True) harvey = villager(NPC.harvey, True, town + hospital, Season.winter, universal_loves + harvey_loves, True) @@ -326,13 +422,42 @@ def villager(name: str, bachelor: bool, locations: Tuple[str, ...], birthday: st juna = villager(ModNPC.juna, False, forest, Season.summer, universal_loves + juna_loves, True, ModNames.juna) kitty = villager(ModNPC.mr_ginger, False, forest, Season.summer, universal_loves + mister_ginger_loves, True, ModNames.ginger) shiko = villager(ModNPC.shiko, True, town, Season.winter, universal_loves + shiko_loves, True, ModNames.shiko) -wellwick = villager(ModNPC.wellwick, True, forest, Season.winter, universal_loves + wellwick_loves, True, ModNames.shiko) +wellwick = villager(ModNPC.wellwick, True, forest, Season.winter, universal_loves + wellwick_loves, True, ModNames.wellwick) yoba = villager(ModNPC.yoba, False, secret_woods, Season.spring, universal_loves + yoba_loves, False, ModNames.yoba) riley = villager(ModNPC.riley, True, town, Season.spring, universal_loves, True, ModNames.riley) +zic = villager(ModNPC.goblin, False, witch_swamp, Season.fall, void_mayonnaise, False, ModNames.distant_lands) +alecto = villager(ModNPC.alecto, False, witch_attic, Generic.any, universal_loves, False, ModNames.alecto) +lacey = villager(ModNPC.lacey, True, forest, Season.spring, universal_loves, True, ModNames.lacey) + +# Boarding House Villagers +gregory = villager(ModNPC.gregory, True, the_lost_valley, Season.fall, universal_loves, False, ModNames.boarding_house) +sheila = villager(ModNPC.sheila, True, boarding_house, Season.spring, universal_loves, True, ModNames.boarding_house) +joel = villager(ModNPC.joel, False, boarding_house, Season.winter, universal_loves, True, ModNames.boarding_house) + +# SVE Villagers +claire = villager(ModNPC.claire, True, town + jojamart, Season.fall, universal_loves + claire_loves, True, ModNames.sve) +lance = villager(ModNPC.lance, True, adventurer + highlands + island, Season.spring, lance_loves, False, ModNames.sve) +mommy = villager(ModNPC.olivia, True, town, Season.spring, universal_loves_no_rabbit_foot + olivia_loves, True, ModNames.sve) +sophia = villager(ModNPC.sophia, True, bluemoon, Season.winter, universal_loves_no_rabbit_foot + sophia_loves, True, ModNames.sve) +victor = villager(ModNPC.victor, True, town, Season.summer, universal_loves + victor_loves, True, ModNames.sve) +andy = villager(ModNPC.andy, False, forest, Season.spring, universal_loves + andy_loves, True, ModNames.sve) +apples = villager(ModNPC.apples, False, aurora + junimo, Generic.any, starfruit, False, ModNames.sve) +gunther = villager(ModNPC.gunther, False, museum, Season.winter, universal_loves + gunther_loves, True, ModNames.jasper_sve) +martin = villager(ModNPC.martin, False, town + jojamart, Season.summer, universal_loves + martin_loves, True, ModNames.sve) +marlon = villager(ModNPC.marlon, False, adventurer, Season.winter, universal_loves + marlon_loves, False, ModNames.jasper_sve) +morgan = villager(ModNPC.morgan, False, forest, Season.fall, universal_loves_no_rabbit_foot + morgan_loves, False, ModNames.sve) +scarlett = villager(ModNPC.scarlett, False, bluemoon, Season.summer, universal_loves + scarlett_loves, False, ModNames.sve) +susan = villager(ModNPC.susan, False, railroad, Season.fall, universal_loves + susan_loves, False, ModNames.sve) +morris = villager(ModNPC.morris, False, jojamart, Season.spring, universal_loves + morris_loves, True, ModNames.sve) + +# Modified villagers; not included in all villagers + +register_villager_modification(ModNames.sve, wizard, make_bachelor) all_villagers_by_name: Dict[str, Villager] = {villager.name: villager for villager in all_villagers} all_villagers_by_mod: Dict[str, List[Villager]] = {} all_villagers_by_mod_by_name: Dict[str, Dict[str, Villager]] = {} + for npc in all_villagers: mod = npc.mod_name name = npc.name @@ -344,3 +469,27 @@ def villager(name: str, bachelor: bool, locations: Tuple[str, ...], birthday: st all_villagers_by_mod_by_name[mod] = {} all_villagers_by_mod_by_name[mod][name] = npc + +def villager_included_for_any_mod(npc: Villager, mods: Set[str]): + if not npc.mod_name: + return True + for mod in npc.mod_name.split(","): + if mod in mods: + return True + return False + + +def get_villagers_for_mods(mods: Set[str]) -> List[Villager]: + villagers_for_current_mods = [] + for npc in all_villagers: + if not villager_included_for_any_mod(npc, mods): + continue + modified_npc = npc + for active_mod in mods: + if (active_mod not in villager_modifications_by_mod or + npc.name not in villager_modifications_by_mod[active_mod]): + continue + modification = villager_modifications_by_mod[active_mod][npc.name] + modified_npc = modification(active_mod, modified_npc) + villagers_for_current_mods.append(modified_npc) + return villagers_for_current_mods diff --git a/worlds/stardew_valley/docs/en_Stardew Valley.md b/worlds/stardew_valley/docs/en_Stardew Valley.md index 04ba9c15c3c1..06c41a2f0563 100644 --- a/worlds/stardew_valley/docs/en_Stardew Valley.md +++ b/worlds/stardew_valley/docs/en_Stardew Valley.md @@ -18,35 +18,49 @@ The player can choose from a number of goals, using their YAML settings. - Succeed [Grandpa's Evaluation](https://stardewvalleywiki.com/Grandpa) with 4 lit candles - Reach the bottom of the [Pelican Town Mineshaft](https://stardewvalleywiki.com/The_Mines) - Complete the [Cryptic Note](https://stardewvalleywiki.com/Secret_Notes#Secret_Note_.2310) quest, by meeting Mr Qi on floor 100 of the Skull Cavern -- Get the achievement [Master Angler](https://stardewvalleywiki.com/Fish), which requires catching every fish in the game -- Get the achievement [A Complete Collection](https://stardewvalleywiki.com/Museum), which requires donating all the artifacts and minerals to the museum -- Get the achievement [Full House](https://stardewvalleywiki.com/Children), which requires getting married and having two kids. +- Become a [Master Angler](https://stardewvalleywiki.com/Fish), which requires catching every fish in your slot +- Restore [A Complete Collection](https://stardewvalleywiki.com/Museum), which requires donating all the artifacts and minerals to the museum +- Get the achievement [Full House](https://stardewvalleywiki.com/Children), which requires getting married and having two kids - Get recognized as the [Greatest Walnut Hunter](https://stardewvalleywiki.com/Golden_Walnut) by Mr Qi, which requires finding all 130 golden walnuts on ginger island +- Become the [Protector of the Valley](https://stardewvalleywiki.com/Adventurer%27s_Guild#Monster_Eradication_Goals) by completing all the monster slayer goals at the Adventure Guild +- Complete a [Full Shipment](https://stardewvalleywiki.com/Shipping#Collection) by shipping every item in your slot +- Become a [Gourmet Chef](https://stardewvalleywiki.com/Cooking) by cooking every recipe in your slot +- Become a [Craft Master](https://stardewvalleywiki.com/Crafting) by crafting every item +- Earn the title of [Legend](https://stardewvalleywiki.com/Gold) by earning 10 000 000g +- Solve the [Mystery of the Stardrops](https://stardewvalleywiki.com/Stardrop) by finding every stardrop +- Finish 100% of your randomizer slot with Allsanity: Complete every check in your slot - Achieve [Perfection](https://stardewvalleywiki.com/Perfection) in your save file +The following goals [Community Center, Master Angler, Protector of the Valley, Full Shipment and Gourmet Chef] will adapt to other settings in your slots, and are therefore customizable in duration and difficulty. For example, if you set "Fishsanity" to "Exclude Legendaries", and pick the Master Angler goal, you will not need to catch the legendaries to complete the goal. + ## What are location checks in Stardew Valley? Location checks in Stardew Valley always include: - [Community Center Bundles](https://stardewvalleywiki.com/Bundles) - [Mineshaft Chest Rewards](https://stardewvalleywiki.com/The_Mines#Remixed_Rewards) -- [Story Quests](https://stardewvalleywiki.com/Quests#List_of_Story_Quests) - [Traveling Merchant Items](https://stardewvalleywiki.com/Traveling_Cart) - Isolated objectives such as the [beach bridge](https://stardewvalleywiki.com/The_Beach#Tide_Pools), [Old Master Cannoli](https://stardewvalleywiki.com/Secret_Woods#Old_Master_Cannoli), [Grim Reaper Statue](https://stardewvalleywiki.com/Golden_Scythe), etc There also are a number of location checks that are optional, and individual players choose to include them or not in their shuffling: -- Tools and Fishing Rod Upgrades -- Carpenter Buildings -- Backpack Upgrades -- Mine Elevator Levels -- Skill Levels +- [Tools and Fishing Rod Upgrades](https://stardewvalleywiki.com/Tools) +- [Carpenter Buildings](https://stardewvalleywiki.com/Carpenter%27s_Shop#Farm_Buildings) +- [Backpack Upgrades](https://stardewvalleywiki.com/Tools#Other_Tools) +- [Mine Elevator Levels](https://stardewvalleywiki.com/The_Mines#Staircases) +- [Skill Levels](https://stardewvalleywiki.com/Skills) - Arcade Machines -- Help Wanted Quests -- Participating in Festivals -- Special Orders from the town board, or from Mr Qi -- Cropsanity: Growing and Harvesting individual crop types -- Fishsanity: Catching individual fish -- Museumsanity: Donating individual items, or reaching milestones for museum donations -- Friendsanity: Reaching specific friendship levels with NPCs +- [Story Quests](https://stardewvalleywiki.com/Quests#List_of_Story_Quests) +- [Help Wanted Quests](https://stardewvalleywiki.com/Quests#Help_Wanted_Quests) +- Participating in [Festivals](https://stardewvalleywiki.com/Festivals) +- [Special Orders](https://stardewvalleywiki.com/Quests#List_of_Special_Orders) from the town board, or from [Mr Qi](https://stardewvalleywiki.com/Quests#List_of_Mr._Qi.27s_Special_Orders) +- [Cropsanity](https://stardewvalleywiki.com/Crops): Growing and Harvesting individual crop types +- [Fishsanity](https://stardewvalleywiki.com/Fish): Catching individual fish +- [Museumsanity](https://stardewvalleywiki.com/Museum): Donating individual items, or reaching milestones for museum donations +- [Friendsanity](https://stardewvalleywiki.com/Friendship): Reaching specific friendship levels with NPCs +- [Monstersanity](https://stardewvalleywiki.com/Adventurer%27s_Guild#Monster_Eradication_Goals): Completing monster slayer goals +- [Cooksanity](https://stardewvalleywiki.com/Cooking): Cooking individual recipes +- [Chefsanity](https://stardewvalleywiki.com/Cooking#Recipes): Learning cooking recipes +- [Craftsanity](https://stardewvalleywiki.com/Crafting): Crafting individual items +- [Shipsanity](https://stardewvalleywiki.com/Shipping): Shipping individual items ## Which items can be in another player's world? @@ -55,20 +69,22 @@ For the locations which do not include a normal reward, Resource Packs and traps A player can enable some settings that will add some items to the pool that are relevant to progression - Seasons Randomizer: - - All 4 seasons will be items, and one of them will be selected randomly and be added to the player's start inventory - - At the end of each month, the player can choose the next season, instead of following the vanilla season order. On Seasons Randomizer, they can only choose from the seasons they have received. + * All 4 seasons will be items, and one of them will be selected randomly and be added to the player's start inventory. + * At the end of each month, the player can choose the next season, instead of following the vanilla season order. On Seasons Randomizer, they can only choose from the seasons they have received. - Cropsanity: - - Every single seed in the game starts off locked and cannot be purchased from any merchant. Their unlocks are received as multiworld items. Growing each seed and harvesting the resulting crop sends a location check - - The way merchants sell seeds is considerably changed. Pierre sells fewer seeds at a high price, while Joja sells unlimited seeds but in huge discount packs, not individually. + * Every single seed in the game starts off locked and cannot be purchased from any merchant. Their unlocks are received as multiworld items. Growing each seed and harvesting the resulting crop sends a location check + * The way merchants sell seeds is considerably changed. Pierre sells fewer seeds at a high price, while Joja sells unlimited seeds but in huge discount packs, not individually. - Museumsanity: - - The items that are normally obtained from museum donation milestones are added to the item pool. Some items, like the magic rock candy, are duplicated for convenience. - - The Traveling Merchant now sells artifacts and minerals, with a bias towards undonated ones, to mitigate randomness. She will sell these items as the player receives "Traveling Merchant Metal Detector" items. + * The items that are normally obtained from museum donation milestones are added to the item pool. Some items, like the magic rock candy, are duplicated for convenience. + * The Traveling Merchant now sells artifacts and minerals, with a bias towards undonated ones, to mitigate randomness. She will sell these items as the player receives "Traveling Merchant Metal Detector" items. - TV Channels - Babies + * Only if Friendsanity is enabled There are a few extra vanilla items, which are added to the pool for convenience, but do not have a matching location. These include - [Wizard Buildings](https://stardewvalleywiki.com/Wizard%27s_Tower#Buildings) - [Return Scepter](https://stardewvalleywiki.com/Return_Scepter) +- [Qi Walnut Room QoL items](https://stardewvalleywiki.com/Qi%27s_Walnut_Room#Stock) And lastly, some Archipelago-exclusive items exist in the pool, which are designed around game balance and QoL. These include: - Arcade Machine buffs (Only if the arcade machines are randomized) @@ -89,38 +105,43 @@ In some cases, like receiving Carpenter and Wizard buildings, the player will st ## Mods -Starting in version 4.x.x, some Stardew Valley mods unrelated to Archipelago are officially "supported". +Some Stardew Valley mods unrelated to Archipelago are officially "supported". This means that, for these specific mods, if you decide to include them in your yaml settings, the multiworld will be generated with the assumption that you will install and play with these mods. The multiworld will contain related items and locations for these mods, the specifics will vary from mod to mod -[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/4.x.x/Documentation/Supported%20Mods.md) +[Supported Mods Documentation](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md) List of supported mods: - General - - [DeepWoods](https://www.nexusmods.com/stardewvalley/mods/2571) - - [Tractor Mod](https://www.nexusmods.com/stardewvalley/mods/1401) - - [Bigger Backpack](https://www.nexusmods.com/stardewvalley/mods/1845) - - [Skull Cavern Elevator](https://www.nexusmods.com/stardewvalley/mods/963) + * [Stardew Valley Expanded](https://www.nexusmods.com/stardewvalley/mods/3753) + * [DeepWoods](https://www.nexusmods.com/stardewvalley/mods/2571) + * [Skull Cavern Elevator](https://www.nexusmods.com/stardewvalley/mods/963) + * [Bigger Backpack](https://www.nexusmods.com/stardewvalley/mods/1845) + * [Tractor Mod](https://www.nexusmods.com/stardewvalley/mods/1401) + * [Distant Lands - Witch Swamp Overhaul](https://www.nexusmods.com/stardewvalley/mods/18109) - Skills - - [Luck Skill](https://www.nexusmods.com/stardewvalley/mods/521) - - [Magic](https://www.nexusmods.com/stardewvalley/mods/2007) - - [Socializing Skill](https://www.nexusmods.com/stardewvalley/mods/14142) - - [Archaeology](https://www.nexusmods.com/stardewvalley/mods/15793) - - [Cooking Skill](https://www.nexusmods.com/stardewvalley/mods/522) - - [Binning Skill](https://www.nexusmods.com/stardewvalley/mods/14073) + * [Magic](https://www.nexusmods.com/stardewvalley/mods/2007) + * [Luck Skill](https://www.nexusmods.com/stardewvalley/mods/521) + * [Socializing Skill](https://www.nexusmods.com/stardewvalley/mods/14142) + * [Archaeology](https://www.nexusmods.com/stardewvalley/mods/15793) + * [Cooking Skill](https://www.nexusmods.com/stardewvalley/mods/522) + * [Binning Skill](https://www.nexusmods.com/stardewvalley/mods/14073) - NPCs - - [Ayeisha - The Postal Worker (Custom NPC)](https://www.nexusmods.com/stardewvalley/mods/6427) - - [Mister Ginger (cat npc)](https://www.nexusmods.com/stardewvalley/mods/5295) - - [Juna - Roommate NPC](https://www.nexusmods.com/stardewvalley/mods/8606) - - [Professor Jasper Thomas](https://www.nexusmods.com/stardewvalley/mods/5599) - - [Alec Revisited](https://www.nexusmods.com/stardewvalley/mods/10697) - - [Custom NPC - Yoba](https://www.nexusmods.com/stardewvalley/mods/14871) - - [Custom NPC Eugene](https://www.nexusmods.com/stardewvalley/mods/9222) - - ['Prophet' Wellwick](https://www.nexusmods.com/stardewvalley/mods/6462) - - [Shiko - New Custom NPC](https://www.nexusmods.com/stardewvalley/mods/3732) - - [Delores - Custom NPC](https://www.nexusmods.com/stardewvalley/mods/5510) - - [Custom NPC - Riley](https://www.nexusmods.com/stardewvalley/mods/5811) + * [Ayeisha - The Postal Worker (Custom NPC)](https://www.nexusmods.com/stardewvalley/mods/6427) + * [Mister Ginger (cat npc)](https://www.nexusmods.com/stardewvalley/mods/5295) + * [Juna - Roommate NPC](https://www.nexusmods.com/stardewvalley/mods/8606) + * [Professor Jasper Thomas](https://www.nexusmods.com/stardewvalley/mods/5599) + * [Alec Revisited](https://www.nexusmods.com/stardewvalley/mods/10697) + * [Custom NPC - Yoba](https://www.nexusmods.com/stardewvalley/mods/14871) + * [Custom NPC Eugene](https://www.nexusmods.com/stardewvalley/mods/9222) + * ['Prophet' Wellwick](https://www.nexusmods.com/stardewvalley/mods/6462) + * [Shiko - New Custom NPC](https://www.nexusmods.com/stardewvalley/mods/3732) + * [Delores - Custom NPC](https://www.nexusmods.com/stardewvalley/mods/5510) + * [Custom NPC - Riley](https://www.nexusmods.com/stardewvalley/mods/5811) + * [Alecto the Witch](https://www.nexusmods.com/stardewvalley/mods/10671) + +Some of these mods might need a patch mod to tie the randomizer with the mod. These can be found [here](https://github.com/Witchybun/SDV-Randomizer-Content-Patcher/releases) ## Multiplayer diff --git a/worlds/stardew_valley/docs/setup_en.md b/worlds/stardew_valley/docs/setup_en.md index d8f0e16b1017..02d6979b7aee 100644 --- a/worlds/stardew_valley/docs/setup_en.md +++ b/worlds/stardew_valley/docs/setup_en.md @@ -4,17 +4,17 @@ - Stardew Valley on PC (Recommended: [Steam version](https://store.steampowered.com/app/413150/Stardew_Valley/)) - SMAPI ([Mod loader for Stardew Valley](https://smapi.io/)) -- [StardewArchipelago Mod Release 4.x.x](https://github.com/agilbert1412/StardewArchipelago/releases) - - It is important to use a mod release of version 4.x.x to play seeds that have been generated here. Later releases can only be used with later releases of the world generator, that are not hosted on archipelago.gg yet. +- [StardewArchipelago Mod Release 5.x.x](https://github.com/agilbert1412/StardewArchipelago/releases) + - It is important to use a mod release of version 5.x.x to play seeds that have been generated here. Later releases can only be used with later releases of the world generator, that are not hosted on archipelago.gg yet. ## Optional Software - Archipelago from the [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases) - - (Only for the TextClient) + * (Only for the TextClient) - Other Stardew Valley Mods [Nexus Mods](https://www.nexusmods.com/stardewvalley) - - There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/4.x.x/Documentation/Supported%20Mods.md) that you can add to your yaml to include them with the Archipelago randomization + * There are [supported mods](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md) that you can add to your yaml to include them with the Archipelago randomization - - It is **not** recommended to further mod Stardew Valley with unsupported mods, although it is possible to do so. Mod interactions can be unpredictable, and no support will be offered for related bugs. - - The more unsupported mods you have, and the bigger they are, the more likely things are to break. + * It is **not** recommended to further mod Stardew Valley with unsupported mods, although it is possible to do so. Mod interactions can be unpredictable, and no support will be offered for related bugs. + * The more unsupported mods you have, and the bigger they are, the more likely things are to break. ## Configuring your YAML file @@ -80,7 +80,7 @@ For a better chat experience, you can also use the official Archipelago Text Cli ### Playing with supported mods -See the [Supported mods documentation](https://github.com/agilbert1412/StardewArchipelago/blob/4.x.x/Documentation/Supported%20Mods.md) +See the [Supported mods documentation](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md) ### Multiplayer diff --git a/worlds/stardew_valley/early_items.py b/worlds/stardew_valley/early_items.py new file mode 100644 index 000000000000..78170f29fee7 --- /dev/null +++ b/worlds/stardew_valley/early_items.py @@ -0,0 +1,65 @@ +from random import Random + +from .options import BuildingProgression, StardewValleyOptions, BackpackProgression, ExcludeGingerIsland, SeasonRandomization, SpecialOrderLocations, \ + Monstersanity, ToolProgression, SkillProgression, Cooksanity, Chefsanity + +early_candidate_rate = 4 +always_early_candidates = ["Greenhouse", "Desert Obelisk", "Rusty Key"] +seasons = ["Spring", "Summer", "Fall", "Winter"] + + +def setup_early_items(multiworld, options: StardewValleyOptions, player: int, random: Random): + early_forced = [] + early_candidates = [] + early_candidates.extend(always_early_candidates) + + add_seasonal_candidates(early_candidates, options) + + if options.building_progression & BuildingProgression.option_progressive: + early_forced.append("Shipping Bin") + early_candidates.append("Progressive Coop") + early_candidates.append("Progressive Barn") + + if options.backpack_progression == BackpackProgression.option_early_progressive: + early_forced.append("Progressive Backpack") + + if options.tool_progression & ToolProgression.option_progressive: + early_forced.append("Progressive Fishing Rod") + early_forced.append("Progressive Pickaxe") + + if options.skill_progression == SkillProgression.option_progressive: + early_forced.append("Fishing Level") + + if options.quest_locations >= 0: + early_candidates.append("Magnifying Glass") + + if options.special_order_locations != SpecialOrderLocations.option_disabled: + early_candidates.append("Special Order Board") + + if options.cooksanity != Cooksanity.option_none | options.chefsanity & Chefsanity.option_queen_of_sauce: + early_candidates.append("The Queen of Sauce") + + if options.monstersanity == Monstersanity.option_none: + early_candidates.append("Progressive Weapon") + else: + early_candidates.append("Progressive Sword") + + if options.exclude_ginger_island == ExcludeGingerIsland.option_false: + early_candidates.append("Island Obelisk") + + early_forced.extend(random.sample(early_candidates, len(early_candidates) // early_candidate_rate)) + + for item_name in early_forced: + if item_name in multiworld.early_items[player]: + continue + multiworld.early_items[player][item_name] = 1 + + +def add_seasonal_candidates(early_candidates, options): + if options.season_randomization == SeasonRandomization.option_progressive: + early_candidates.extend(["Progressive Season"] * 3) + return + if options.season_randomization == SeasonRandomization.option_disabled: + return + + early_candidates.extend(seasons) diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py index 1f0735f4aebc..d0cb09bd9953 100644 --- a/worlds/stardew_valley/items.py +++ b/worlds/stardew_valley/items.py @@ -8,11 +8,19 @@ from BaseClasses import Item, ItemClassification from . import data -from .data.villagers_data import all_villagers +from .data.villagers_data import get_villagers_for_mods from .mods.mod_data import ModNames -from .options import StardewValleyOptions, TrapItems, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Cropsanity, Friendsanity, Museumsanity, \ - Fishsanity, BuildingProgression, SkillProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations +from .options import StardewValleyOptions, TrapItems, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Cropsanity, \ + Friendsanity, Museumsanity, \ + Fishsanity, BuildingProgression, SkillProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations, Monstersanity, Goal, \ + Chefsanity, Craftsanity, BundleRandomization, EntranceRandomization, Shipsanity +from .strings.ap_names.ap_weapon_names import APWeapon from .strings.ap_names.buff_names import Buff +from .strings.ap_names.community_upgrade_names import CommunityUpgrade +from .strings.ap_names.event_names import Event +from .strings.ap_names.mods.mod_items import SVEQuestItem +from .strings.villager_names import NPC, ModNPC +from .strings.wallet_item_names import Wallet ITEM_CODE_OFFSET = 717000 @@ -25,21 +33,20 @@ class Group(enum.Enum): FRIENDSHIP_PACK = enum.auto() COMMUNITY_REWARD = enum.auto() TRASH = enum.auto() - MINES_FLOOR_10 = enum.auto() - MINES_FLOOR_20 = enum.auto() - MINES_FLOOR_50 = enum.auto() - MINES_FLOOR_60 = enum.auto() - MINES_FLOOR_80 = enum.auto() - MINES_FLOOR_90 = enum.auto() - MINES_FLOOR_110 = enum.auto() FOOTWEAR = enum.auto() HATS = enum.auto() RING = enum.auto() WEAPON = enum.auto() + WEAPON_GENERIC = enum.auto() + WEAPON_SWORD = enum.auto() + WEAPON_CLUB = enum.auto() + WEAPON_DAGGER = enum.auto() + WEAPON_SLINGSHOT = enum.auto() PROGRESSIVE_TOOLS = enum.auto() SKILL_LEVEL_UP = enum.auto() + BUILDING = enum.auto() + WIZARD_BUILDING = enum.auto() ARCADE_MACHINE_BUFFS = enum.auto() - GALAXY_WEAPONS = enum.auto() BASE_RESOURCE = enum.auto() WARP_TOTEM = enum.auto() GEODE = enum.auto() @@ -65,7 +72,17 @@ class Group(enum.Enum): GINGER_ISLAND = enum.auto() WALNUT_PURCHASE = enum.auto() TV_CHANNEL = enum.auto() + QI_CRAFTING_RECIPE = enum.auto() + CHEFSANITY = enum.auto() + CHEFSANITY_STARTER = enum.auto() + CHEFSANITY_QOS = enum.auto() + CHEFSANITY_PURCHASE = enum.auto() + CHEFSANITY_FRIENDSHIP = enum.auto() + CHEFSANITY_SKILL = enum.auto() + CRAFTSANITY = enum.auto() + # Mods MAGIC_SPELL = enum.auto() + MOD_WARP = enum.auto() @dataclass(frozen=True) @@ -90,7 +107,12 @@ def has_any_group(self, *group: Group) -> bool: class StardewItemFactory(Protocol): - def __call__(self, name: Union[str, ItemData]) -> Item: + def __call__(self, name: Union[str, ItemData], override_classification: ItemClassification = None) -> Item: + raise NotImplementedError + + +class StardewItemDeleter(Protocol): + def __call__(self, item: Item): raise NotImplementedError @@ -113,8 +135,11 @@ def load_item_csv(): events = [ - ItemData(None, "Victory", ItemClassification.progression), - ItemData(None, "Month End", ItemClassification.progression), + ItemData(None, Event.victory, ItemClassification.progression), + ItemData(None, Event.can_construct_buildings, ItemClassification.progression), + ItemData(None, Event.start_dark_talisman_quest, ItemClassification.progression), + ItemData(None, Event.can_ship_items, ItemClassification.progression), + ItemData(None, Event.can_shop_at_pierre, ItemClassification.progression), ] all_items: List[ItemData] = load_item_csv() + events @@ -138,16 +163,19 @@ def initialize_item_table(): initialize_groups() -def create_items(item_factory: StardewItemFactory, locations_count: int, items_to_exclude: List[Item], +def get_too_many_items_error_message(locations_count: int, items_count: int) -> str: + return f"There should be at least as many locations [{locations_count}] as there are mandatory items [{items_count}]" + + +def create_items(item_factory: StardewItemFactory, item_deleter: StardewItemDeleter, locations_count: int, items_to_exclude: List[Item], options: StardewValleyOptions, random: Random) -> List[Item]: items = [] unique_items = create_unique_items(item_factory, options, random) - for item in items_to_exclude: - if item in unique_items: - unique_items.remove(item) + remove_items(item_deleter, items_to_exclude, unique_items) + + remove_items_if_no_room_for_them(item_deleter, unique_items, locations_count, random) - assert len(unique_items) <= locations_count, f"There should be at least as many locations [{locations_count}] as there are mandatory items [{len(unique_items)}]" items += unique_items logger.debug(f"Created {len(unique_items)} unique items") @@ -162,38 +190,71 @@ def create_items(item_factory: StardewItemFactory, locations_count: int, items_t return items +def remove_items(item_deleter: StardewItemDeleter, items_to_remove, items): + for item in items_to_remove: + if item in items: + items.remove(item) + item_deleter(item) + + +def remove_items_if_no_room_for_them(item_deleter: StardewItemDeleter, unique_items: List[Item], locations_count: int, random: Random): + if len(unique_items) <= locations_count: + return + + number_of_items_to_remove = len(unique_items) - locations_count + removable_items = [item for item in unique_items if item.classification == ItemClassification.filler or item.classification == ItemClassification.trap] + if len(removable_items) < number_of_items_to_remove: + logger.debug(f"Player has more items than locations, trying to remove {number_of_items_to_remove} random non-progression items") + removable_items = [item for item in unique_items if not item.classification & ItemClassification.progression] + else: + logger.debug(f"Player has more items than locations, trying to remove {number_of_items_to_remove} random filler items") + assert len(removable_items) >= number_of_items_to_remove, get_too_many_items_error_message(locations_count, len(unique_items)) + items_to_remove = random.sample(removable_items, number_of_items_to_remove) + remove_items(item_deleter, items_to_remove, unique_items) + + def create_unique_items(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random) -> List[Item]: items = [] items.extend(item_factory(item) for item in items_by_group[Group.COMMUNITY_REWARD]) + items.append(item_factory(CommunityUpgrade.movie_theater)) # It is a community reward, but we need two of them + items.append(item_factory(Wallet.metal_detector)) # Always offer at least one metal detector create_backpack_items(item_factory, options, items) - create_mine_rewards(item_factory, items, random) + create_weapons(item_factory, options, items) + items.append(item_factory("Skull Key")) create_elevators(item_factory, options, items) create_tools(item_factory, options, items) create_skills(item_factory, options, items) create_wizard_buildings(item_factory, options, items) create_carpenter_buildings(item_factory, options, items) + items.append(item_factory("Railroad Boulder Removed")) + items.append(item_factory(CommunityUpgrade.fruit_bats)) + items.append(item_factory(CommunityUpgrade.mushroom_boxes)) items.append(item_factory("Beach Bridge")) - items.append(item_factory("Dark Talisman")) - create_tv_channels(item_factory, items) - create_special_quest_rewards(item_factory, items) + create_tv_channels(item_factory, options, items) + create_special_quest_rewards(item_factory, options, items) create_stardrops(item_factory, options, items) create_museum_items(item_factory, options, items) create_arcade_machine_items(item_factory, options, items) - items.append(item_factory(random.choice(items_by_group[Group.GALAXY_WEAPONS]))) create_player_buffs(item_factory, options, items) create_traveling_merchant_items(item_factory, items) items.append(item_factory("Return Scepter")) create_seasons(item_factory, options, items) create_seeds(item_factory, options, items) - create_friendsanity_items(item_factory, options, items) + create_friendsanity_items(item_factory, options, items, random) create_festival_rewards(item_factory, options, items) - create_babies(item_factory, items, random) create_special_order_board_rewards(item_factory, options, items) create_special_order_qi_rewards(item_factory, options, items) create_walnut_purchase_rewards(item_factory, options, items) + create_crafting_recipes(item_factory, options, items) + create_cooking_recipes(item_factory, options, items) + create_shipsanity_items(item_factory, options, items) + create_goal_items(item_factory, options, items) + items.append(item_factory("Golden Egg")) create_magic_mod_spells(item_factory, options, items) + create_deepwoods_pendants(item_factory, options, items) + create_archaeology_items(item_factory, options, items) return items @@ -206,18 +267,27 @@ def create_backpack_items(item_factory: StardewItemFactory, options: StardewVall items.append(item_factory("Progressive Backpack")) -def create_mine_rewards(item_factory: StardewItemFactory, items: List[Item], random: Random): - items.append(item_factory("Rusty Sword")) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_10]))) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_20]))) - items.append(item_factory("Slingshot")) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_50]))) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_60]))) - items.append(item_factory("Master Slingshot")) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_80]))) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_90]))) - items.append(item_factory(random.choice(items_by_group[Group.MINES_FLOOR_110]))) - items.append(item_factory("Skull Key")) +def create_weapons(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + weapons = weapons_count(options) + items.extend(item_factory(item) for item in [APWeapon.slingshot] * 2) + monstersanity = options.monstersanity + if monstersanity == Monstersanity.option_none: # Without monstersanity, might not be enough checks to split the weapons + items.extend(item_factory(item) for item in [APWeapon.weapon] * weapons) + items.extend(item_factory(item) for item in [APWeapon.footwear] * 3) # 1-2 | 3-4 | 6-7-8 + return + + items.extend(item_factory(item) for item in [APWeapon.sword] * weapons) + items.extend(item_factory(item) for item in [APWeapon.club] * weapons) + items.extend(item_factory(item) for item in [APWeapon.dagger] * weapons) + items.extend(item_factory(item) for item in [APWeapon.footwear] * 4) # 1-2 | 3-4 | 6-7-8 | 11-13 + if monstersanity == Monstersanity.option_goals or monstersanity == Monstersanity.option_one_per_category or \ + monstersanity == Monstersanity.option_short_goals or monstersanity == Monstersanity.option_very_short_goals: + return + if options.exclude_ginger_island == ExcludeGingerIsland.option_true: + rings_items = [item for item in items_by_group[Group.RING] if item.classification is not ItemClassification.filler] + else: + rings_items = [item for item in items_by_group[Group.RING]] + items.extend(item_factory(item) for item in rings_items) def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): @@ -232,8 +302,14 @@ def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOpt def create_tools(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - if options.tool_progression == ToolProgression.option_progressive: - items.extend(item_factory(item) for item in items_by_group[Group.PROGRESSIVE_TOOLS] * 4) + if options.tool_progression & ToolProgression.option_progressive: + for item_data in items_by_group[Group.PROGRESSIVE_TOOLS]: + name = item_data.name + if "Trash Can" in name: + items.extend([item_factory(item) for item in [item_data] * 3]) + items.append(item_factory(item_data, ItemClassification.useful)) + else: + items.extend([item_factory(item) for item in [item_data] * 4]) items.append(item_factory("Golden Scythe")) @@ -246,11 +322,12 @@ def create_skills(item_factory: StardewItemFactory, options: StardewValleyOption def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - items.append(item_factory("Earth Obelisk")) - items.append(item_factory("Water Obelisk")) + useless_buildings_classification = ItemClassification.progression_skip_balancing if world_is_perfection(options) else ItemClassification.useful + items.append(item_factory("Earth Obelisk", useless_buildings_classification)) + items.append(item_factory("Water Obelisk", useless_buildings_classification)) items.append(item_factory("Desert Obelisk")) items.append(item_factory("Junimo Hut")) - items.append(item_factory("Gold Clock")) + items.append(item_factory("Gold Clock", useless_buildings_classification)) if options.exclude_ginger_island == ExcludeGingerIsland.option_false: items.append(item_factory("Island Obelisk")) if ModNames.deepwoods in options.mods: @@ -258,89 +335,107 @@ def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewVa def create_carpenter_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - if options.building_progression in {BuildingProgression.option_progressive, - BuildingProgression.option_progressive_early_shipping_bin}: - items.append(item_factory("Progressive Coop")) - items.append(item_factory("Progressive Coop")) - items.append(item_factory("Progressive Coop")) - items.append(item_factory("Progressive Barn")) - items.append(item_factory("Progressive Barn")) - items.append(item_factory("Progressive Barn")) - items.append(item_factory("Well")) - items.append(item_factory("Silo")) - items.append(item_factory("Mill")) - items.append(item_factory("Progressive Shed")) - items.append(item_factory("Progressive Shed")) - items.append(item_factory("Fish Pond")) - items.append(item_factory("Stable")) - items.append(item_factory("Slime Hutch")) - items.append(item_factory("Shipping Bin")) - items.append(item_factory("Progressive House")) - items.append(item_factory("Progressive House")) - items.append(item_factory("Progressive House")) - if ModNames.tractor in options.mods: - items.append(item_factory("Tractor Garage")) - - -def create_special_quest_rewards(item_factory: StardewItemFactory, items: List[Item]): - items.append(item_factory("Adventurer's Guild")) - items.append(item_factory("Club Card")) - items.append(item_factory("Magnifying Glass")) - items.append(item_factory("Bear's Knowledge")) - items.append(item_factory("Iridium Snake Milk")) + building_option = options.building_progression + if not building_option & BuildingProgression.option_progressive: + return + items.append(item_factory("Progressive Coop")) + items.append(item_factory("Progressive Coop")) + items.append(item_factory("Progressive Coop")) + items.append(item_factory("Progressive Barn")) + items.append(item_factory("Progressive Barn")) + items.append(item_factory("Progressive Barn")) + items.append(item_factory("Well")) + items.append(item_factory("Silo")) + items.append(item_factory("Mill")) + items.append(item_factory("Progressive Shed")) + items.append(item_factory("Progressive Shed", ItemClassification.useful)) + items.append(item_factory("Fish Pond")) + items.append(item_factory("Stable")) + items.append(item_factory("Slime Hutch")) + items.append(item_factory("Shipping Bin")) + items.append(item_factory("Progressive House")) + items.append(item_factory("Progressive House")) + items.append(item_factory("Progressive House")) + if ModNames.tractor in options.mods: + items.append(item_factory("Tractor Garage")) + + +def create_special_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + if options.quest_locations < 0: + return + # items.append(item_factory("Adventurer's Guild")) # Now unlocked always! + items.append(item_factory(Wallet.club_card)) + items.append(item_factory(Wallet.magnifying_glass)) + if ModNames.sve in options.mods: + items.append(item_factory(Wallet.bears_knowledge)) + else: + items.append(item_factory(Wallet.bears_knowledge, ItemClassification.useful)) # Not necessary outside of SVE + items.append(item_factory(Wallet.iridium_snake_milk)) + items.append(item_factory("Fairy Dust Recipe")) + items.append(item_factory("Dark Talisman")) + create_special_quest_rewards_sve(item_factory, options, items) + create_distant_lands_quest_rewards(item_factory, options, items) + create_boarding_house_quest_rewards(item_factory, options, items) def create_stardrops(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - items.append(item_factory("Stardrop")) # The Mines level 100 - items.append(item_factory("Stardrop")) # Old Master Cannoli + stardrops_classification = get_stardrop_classification(options) + items.append(item_factory("Stardrop", stardrops_classification)) # The Mines level 100 + items.append(item_factory("Stardrop", stardrops_classification)) # Old Master Cannoli + items.append(item_factory("Stardrop", stardrops_classification)) # Krobus Stardrop if options.fishsanity != Fishsanity.option_none: - items.append(item_factory("Stardrop")) #Master Angler Stardrop + items.append(item_factory("Stardrop", stardrops_classification)) # Master Angler Stardrop if ModNames.deepwoods in options.mods: - items.append(item_factory("Stardrop")) # Petting the Unicorn + items.append(item_factory("Stardrop", stardrops_classification)) # Petting the Unicorn + if options.friendsanity != Friendsanity.option_none: + items.append(item_factory("Stardrop", stardrops_classification)) # Spouse Stardrop def create_museum_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - items.append(item_factory("Rusty Key")) - items.append(item_factory("Dwarvish Translation Guide")) + items.append(item_factory(Wallet.rusty_key)) + items.append(item_factory(Wallet.dwarvish_translation_guide)) items.append(item_factory("Ancient Seeds Recipe")) + items.append(item_factory("Stardrop", get_stardrop_classification(options))) if options.museumsanity == Museumsanity.option_none: return items.extend(item_factory(item) for item in ["Magic Rock Candy"] * 10) items.extend(item_factory(item) for item in ["Ancient Seeds"] * 5) - items.extend(item_factory(item) for item in ["Traveling Merchant Metal Detector"] * 4) - items.append(item_factory("Stardrop")) + items.append(item_factory(Wallet.metal_detector)) -def create_friendsanity_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): +def create_friendsanity_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item], random: Random): + island_villagers = [NPC.leo, ModNPC.lance] if options.friendsanity == Friendsanity.option_none: return + create_babies(item_factory, items, random) exclude_non_bachelors = options.friendsanity == Friendsanity.option_bachelors exclude_locked_villagers = options.friendsanity == Friendsanity.option_starting_npcs or \ options.friendsanity == Friendsanity.option_bachelors include_post_marriage_hearts = options.friendsanity == Friendsanity.option_all_with_marriage exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true + mods = options.mods heart_size = options.friendsanity_heart_size - for villager in all_villagers: - if villager.mod_name not in options.mods and villager.mod_name is not None: - continue + for villager in get_villagers_for_mods(mods.value): if not villager.available and exclude_locked_villagers: continue if not villager.bachelor and exclude_non_bachelors: continue - if villager.name == "Leo" and exclude_ginger_island: + if villager.name in island_villagers and exclude_ginger_island: continue heart_cap = 8 if villager.bachelor else 10 if include_post_marriage_hearts and villager.bachelor: heart_cap = 14 + classification = ItemClassification.progression for heart in range(1, 15): if heart > heart_cap: break if heart % heart_size == 0 or heart == heart_cap: - items.append(item_factory(f"{villager.name} <3")) + items.append(item_factory(f"{villager.name} <3", classification)) if not exclude_non_bachelors: + need_pet = options.goal == Goal.option_grandpa_evaluation for heart in range(1, 6): if heart % heart_size == 0 or heart == 5: - items.append(item_factory(f"Pet <3")) + items.append(item_factory(f"Pet <3", ItemClassification.progression_skip_balancing if need_pet else ItemClassification.useful)) def create_babies(item_factory: StardewItemFactory, items: List[Item], random: Random): @@ -368,8 +463,19 @@ def create_arcade_machine_items(item_factory: StardewItemFactory, options: Stard def create_player_buffs(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - items.extend(item_factory(item) for item in [Buff.movement] * options.movement_buff_number.value) - items.extend(item_factory(item) for item in [Buff.luck] * options.luck_buff_number.value) + movement_buffs: int = options.movement_buff_number.value + luck_buffs: int = options.luck_buff_number.value + need_all_buffs = options.special_order_locations == SpecialOrderLocations.option_board_qi + need_half_buffs = options.festival_locations == FestivalLocations.option_easy + create_player_buff(item_factory, Buff.movement, movement_buffs, need_all_buffs, need_half_buffs, items) + create_player_buff(item_factory, Buff.luck, luck_buffs, True, need_half_buffs, items) + + +def create_player_buff(item_factory, buff: str, amount: int, need_all_buffs: bool, need_half_buffs: bool, items: List[Item]): + progression_buffs = amount if need_all_buffs else (amount // 2 if need_half_buffs else 0) + useful_buffs = amount - progression_buffs + items.extend(item_factory(item) for item in [buff] * progression_buffs) + items.extend(item_factory(item, ItemClassification.useful) for item in [buff] * useful_buffs) def create_traveling_merchant_items(item_factory: StardewItemFactory, items: List[Item]): @@ -393,17 +499,19 @@ def create_seeds(item_factory: StardewItemFactory, options: StardewValleyOptions if options.cropsanity == Cropsanity.option_disabled: return - include_ginger_island = options.exclude_ginger_island != ExcludeGingerIsland.option_true - seed_items = [item_factory(item) for item in items_by_group[Group.CROPSANITY] if include_ginger_island or Group.GINGER_ISLAND not in item.groups] + base_seed_items = [item for item in items_by_group[Group.CROPSANITY]] + filtered_seed_items = remove_excluded_items(base_seed_items, options) + seed_items = [item_factory(item) for item in filtered_seed_items] items.extend(seed_items) def create_festival_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + items.append(item_factory("Deluxe Scarecrow Recipe")) if options.festival_locations == FestivalLocations.option_disabled: return - items.extend([*[item_factory(item) for item in items_by_group[Group.FESTIVAL] if item.classification != ItemClassification.filler], - item_factory("Stardrop")]) + festival_rewards = [item_factory(item) for item in items_by_group[Group.FESTIVAL] if item.classification != ItemClassification.filler] + items.extend([*festival_rewards, item_factory("Stardrop", get_stardrop_classification(options))]) def create_walnut_purchase_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): @@ -417,26 +525,102 @@ def create_walnut_purchase_rewards(item_factory: StardewItemFactory, options: St *[item_factory(item) for item in items_by_group[Group.WALNUT_PURCHASE]]]) - def create_special_order_board_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): if options.special_order_locations == SpecialOrderLocations.option_disabled: return - items.extend([item_factory(item) for item in items_by_group[Group.SPECIAL_ORDER_BOARD]]) + special_order_board_items = [item for item in items_by_group[Group.SPECIAL_ORDER_BOARD]] + + items.extend([item_factory(item) for item in special_order_board_items]) + + +def special_order_board_item_classification(item: ItemData, need_all_recipes: bool) -> ItemClassification: + if item.classification is ItemClassification.useful: + return ItemClassification.useful + if item.name == "Special Order Board": + return ItemClassification.progression + if need_all_recipes and "Recipe" in item.name: + return ItemClassification.progression_skip_balancing + if item.name == "Monster Musk Recipe": + return ItemClassification.progression_skip_balancing + return ItemClassification.useful def create_special_order_qi_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): - if (options.special_order_locations != SpecialOrderLocations.option_board_qi or - options.exclude_ginger_island == ExcludeGingerIsland.option_true): + if options.exclude_ginger_island == ExcludeGingerIsland.option_true: return - qi_gem_rewards = ["100 Qi Gems", "10 Qi Gems", "40 Qi Gems", "25 Qi Gems", "25 Qi Gems", - "40 Qi Gems", "20 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems"] + qi_gem_rewards = [] + if options.bundle_randomization >= BundleRandomization.option_remixed: + qi_gem_rewards.append("15 Qi Gems") + qi_gem_rewards.append("15 Qi Gems") + + if options.special_order_locations == SpecialOrderLocations.option_board_qi: + qi_gem_rewards.extend(["100 Qi Gems", "10 Qi Gems", "40 Qi Gems", "25 Qi Gems", "25 Qi Gems", + "40 Qi Gems", "20 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems"]) + qi_gem_items = [item_factory(reward) for reward in qi_gem_rewards] items.extend(qi_gem_items) -def create_tv_channels(item_factory: StardewItemFactory, items: List[Item]): - items.extend([item_factory(item) for item in items_by_group[Group.TV_CHANNEL]]) +def create_tv_channels(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + channels = [channel for channel in items_by_group[Group.TV_CHANNEL]] + if options.entrance_randomization == EntranceRandomization.option_disabled: + channels = [channel for channel in channels if channel.name != "The Gateway Gazette"] + items.extend([item_factory(item) for item in channels]) + + +def create_crafting_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + has_craftsanity = options.craftsanity == Craftsanity.option_all + crafting_recipes = [] + crafting_recipes.extend([recipe for recipe in items_by_group[Group.QI_CRAFTING_RECIPE]]) + if has_craftsanity: + crafting_recipes.extend([recipe for recipe in items_by_group[Group.CRAFTSANITY]]) + crafting_recipes = remove_excluded_items(crafting_recipes, options) + items.extend([item_factory(item) for item in crafting_recipes]) + + +def create_cooking_recipes(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + chefsanity = options.chefsanity + if chefsanity == Chefsanity.option_none: + return + + chefsanity_recipes_by_name = {recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_STARTER]} # Dictionary to not make duplicates + + if chefsanity & Chefsanity.option_queen_of_sauce: + chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_QOS]}) + if chefsanity & Chefsanity.option_purchases: + chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_PURCHASE]}) + if chefsanity & Chefsanity.option_friendship: + chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_FRIENDSHIP]}) + if chefsanity & Chefsanity.option_skills: + chefsanity_recipes_by_name.update({recipe.name: recipe for recipe in items_by_group[Group.CHEFSANITY_SKILL]}) + + filtered_chefsanity_recipes = remove_excluded_items(list(chefsanity_recipes_by_name.values()), options) + items.extend([item_factory(item) for item in filtered_chefsanity_recipes]) + + +def create_shipsanity_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + shipsanity = options.shipsanity + if shipsanity != Shipsanity.option_everything: + return + + items.append(item_factory(Wallet.metal_detector)) + + +def create_goal_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + goal = options.goal + if goal != Goal.option_perfection and goal != Goal.option_complete_collection: + return + + items.append(item_factory(Wallet.metal_detector)) + + +def create_archaeology_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + mods = options.mods + if ModNames.archaeology not in mods: + return + + items.append(item_factory(Wallet.metal_detector)) def create_filler_festival_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions) -> List[Item]: @@ -449,10 +633,47 @@ def create_filler_festival_rewards(item_factory: StardewItemFactory, options: St def create_magic_mod_spells(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): if ModNames.magic not in options.mods: - return [] + return items.extend([item_factory(item) for item in items_by_group[Group.MAGIC_SPELL]]) +def create_deepwoods_pendants(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + if ModNames.deepwoods not in options.mods: + return + items.extend([item_factory(item) for item in ["Pendant of Elders", "Pendant of Community", "Pendant of Depths"]]) + + +def create_special_quest_rewards_sve(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + if ModNames.sve not in options.mods: + return + + items.extend([item_factory(item) for item in items_by_group[Group.MOD_WARP] if item.mod_name == ModNames.sve]) + + if options.quest_locations < 0: + return + + exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true + items.extend([item_factory(item) for item in SVEQuestItem.sve_quest_items]) + if exclude_ginger_island: + return + items.extend([item_factory(item) for item in SVEQuestItem.sve_quest_items_ginger_island]) + + +def create_distant_lands_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + if options.quest_locations < 0 or ModNames.distant_lands not in options.mods: + return + items.append(item_factory("Crayfish Soup Recipe")) + if options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return + items.append(item_factory("Ginger Tincture Recipe")) + + +def create_boarding_house_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): + if options.quest_locations < 0 or ModNames.boarding_house not in options.mods: + return + items.append(item_factory("Special Pumpkin Soup Recipe")) + + def create_unique_filler_items(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random, available_item_slots: int) -> List[Item]: items = [] @@ -464,6 +685,13 @@ def create_unique_filler_items(item_factory: StardewItemFactory, options: Starde return items +def weapons_count(options: StardewValleyOptions): + weapon_count = 5 + if ModNames.sve in options.mods: + weapon_count += 1 + return weapon_count + + def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random, items_already_added: List[Item], number_locations: int) -> List[Item]: @@ -477,27 +705,31 @@ def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options priority_filler_items = [] priority_filler_items.extend(useful_resource_packs) + if include_traps: priority_filler_items.extend(trap_items) exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true - all_filler_packs = get_all_filler_items(include_traps, exclude_ginger_island) - priority_filler_items = remove_excluded_packs(priority_filler_items, exclude_ginger_island) + all_filler_packs = remove_excluded_items(get_all_filler_items(include_traps, exclude_ginger_island), options) + priority_filler_items = remove_excluded_items(priority_filler_items, options) number_priority_items = len(priority_filler_items) required_resource_pack = number_locations - len(items_already_added) if required_resource_pack < number_priority_items: chosen_priority_items = [item_factory(resource_pack) for resource_pack in - random.sample(priority_filler_items, required_resource_pack)] + random.sample(priority_filler_items, required_resource_pack)] return chosen_priority_items items = [] - chosen_priority_items = [item_factory(resource_pack) for resource_pack in priority_filler_items] + chosen_priority_items = [item_factory(resource_pack, + ItemClassification.trap if resource_pack.classification == ItemClassification.trap else ItemClassification.useful) + for resource_pack in priority_filler_items] items.extend(chosen_priority_items) required_resource_pack -= number_priority_items all_filler_packs = [filler_pack for filler_pack in all_filler_packs if Group.MAXIMUM_ONE not in filler_pack.groups or - filler_pack.name not in [priority_item.name for priority_item in priority_filler_items]] + (filler_pack.name not in [priority_item.name for priority_item in + priority_filler_items] and filler_pack.name not in items_already_added_names)] while required_resource_pack > 0: resource_pack = random.choice(all_filler_packs) @@ -505,10 +737,11 @@ def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options while exactly_2 and required_resource_pack == 1: resource_pack = random.choice(all_filler_packs) exactly_2 = Group.EXACTLY_TWO in resource_pack.groups - items.append(item_factory(resource_pack)) + classification = ItemClassification.useful if resource_pack.classification == ItemClassification.progression else resource_pack.classification + items.append(item_factory(resource_pack, classification)) required_resource_pack -= 1 if exactly_2: - items.append(item_factory(resource_pack)) + items.append(item_factory(resource_pack, classification)) required_resource_pack -= 1 if exactly_2 or Group.MAXIMUM_ONE in resource_pack.groups: all_filler_packs.remove(resource_pack) @@ -516,11 +749,27 @@ def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options return items -def remove_excluded_packs(packs, exclude_ginger_island: bool): - included_packs = [pack for pack in packs if Group.DEPRECATED not in pack.groups] - if exclude_ginger_island: - included_packs = [pack for pack in included_packs if Group.GINGER_ISLAND not in pack.groups] - return included_packs +def filter_deprecated_items(items: List[ItemData]) -> List[ItemData]: + return [item for item in items if Group.DEPRECATED not in item.groups] + + +def filter_ginger_island_items(exclude_island: bool, items: List[ItemData]) -> List[ItemData]: + return [item for item in items if not exclude_island or Group.GINGER_ISLAND not in item.groups] + + +def filter_mod_items(mods: Set[str], items: List[ItemData]) -> List[ItemData]: + return [item for item in items if item.mod_name is None or item.mod_name in mods] + + +def remove_excluded_items(items, options: StardewValleyOptions): + return remove_excluded_items_island_mods(items, options.exclude_ginger_island == ExcludeGingerIsland.option_true, options.mods.value) + + +def remove_excluded_items_island_mods(items, exclude_ginger_island: bool, mods: Set[str]): + deprecated_filter = filter_deprecated_items(items) + ginger_island_filter = filter_ginger_island_items(exclude_ginger_island, deprecated_filter) + mod_filter = filter_mod_items(mods, ginger_island_filter) + return mod_filter def remove_limited_amount_packs(packs): @@ -528,9 +777,21 @@ def remove_limited_amount_packs(packs): def get_all_filler_items(include_traps: bool, exclude_ginger_island: bool): - all_filler_packs = [pack for pack in items_by_group[Group.RESOURCE_PACK]] - all_filler_packs.extend(items_by_group[Group.TRASH]) + all_filler_items = [pack for pack in items_by_group[Group.RESOURCE_PACK]] + all_filler_items.extend(items_by_group[Group.TRASH]) if include_traps: - all_filler_packs.extend(items_by_group[Group.TRAP]) - all_filler_packs = remove_excluded_packs(all_filler_packs, exclude_ginger_island) - return all_filler_packs + all_filler_items.extend(items_by_group[Group.TRAP]) + all_filler_items = remove_excluded_items_island_mods(all_filler_items, exclude_ginger_island, set()) + return all_filler_items + + +def get_stardrop_classification(options) -> ItemClassification: + return ItemClassification.progression_skip_balancing if world_is_perfection(options) or world_is_stardrops(options) else ItemClassification.useful + + +def world_is_perfection(options) -> bool: + return options.goal == Goal.option_perfection + + +def world_is_stardrops(options) -> bool: + return options.goal == Goal.option_mystery_of_the_stardrops diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py index 345796b0311e..3bd1cf21e3f6 100644 --- a/worlds/stardew_valley/locations.py +++ b/worlds/stardew_valley/locations.py @@ -2,16 +2,21 @@ import enum from dataclasses import dataclass from random import Random -from typing import Optional, Dict, Protocol, List, FrozenSet +from typing import Optional, Dict, Protocol, List, FrozenSet, Iterable from . import data -from .options import StardewValleyOptions -from .data.fish_data import legendary_fish, special_fish, all_fish +from .bundles.bundle_room import BundleRoom +from .data.fish_data import legendary_fish, special_fish, get_fish_for_mods from .data.museum_data import all_museum_items -from .data.villagers_data import all_villagers -from .options import ExcludeGingerIsland, Friendsanity, ArcadeMachineLocations, SpecialOrderLocations, Cropsanity, Fishsanity, Museumsanity, FestivalLocations, SkillProgression, BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression +from .data.villagers_data import get_villagers_for_mods +from .mods.mod_data import ModNames +from .options import ExcludeGingerIsland, Friendsanity, ArcadeMachineLocations, SpecialOrderLocations, Cropsanity, Fishsanity, Museumsanity, FestivalLocations, \ + SkillProgression, BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression +from .options import StardewValleyOptions, Craftsanity, Chefsanity, Cooksanity, Shipsanity, Monstersanity from .strings.goal_names import Goal +from .strings.quest_names import ModQuest from .strings.region_names import Region +from .strings.villager_names import NPC, ModNPC LOCATION_CODE_OFFSET = 717000 @@ -45,7 +50,7 @@ class LocationTags(enum.Enum): COMBAT_LEVEL = enum.auto() MINING_LEVEL = enum.auto() BUILDING_BLUEPRINT = enum.auto() - QUEST = enum.auto() + STORY_QUEST = enum.auto() ARCADE_MACHINE = enum.auto() ARCADE_MACHINE_VICTORY = enum.auto() JOTPK = enum.auto() @@ -60,8 +65,29 @@ class LocationTags(enum.Enum): FESTIVAL_HARD = enum.auto() SPECIAL_ORDER_BOARD = enum.auto() SPECIAL_ORDER_QI = enum.auto() + REQUIRES_QI_ORDERS = enum.auto() GINGER_ISLAND = enum.auto() WALNUT_PURCHASE = enum.auto() + + BABY = enum.auto() + MONSTERSANITY = enum.auto() + MONSTERSANITY_GOALS = enum.auto() + MONSTERSANITY_PROGRESSIVE_GOALS = enum.auto() + MONSTERSANITY_MONSTER = enum.auto() + SHIPSANITY = enum.auto() + SHIPSANITY_CROP = enum.auto() + SHIPSANITY_FISH = enum.auto() + SHIPSANITY_FULL_SHIPMENT = enum.auto() + COOKSANITY = enum.auto() + COOKSANITY_QOS = enum.auto() + CHEFSANITY = enum.auto() + CHEFSANITY_QOS = enum.auto() + CHEFSANITY_PURCHASE = enum.auto() + CHEFSANITY_FRIENDSHIP = enum.auto() + CHEFSANITY_SKILL = enum.auto() + CHEFSANITY_STARTER = enum.auto() + CRAFTSANITY = enum.auto() + # Mods # Skill Mods LUCK_LEVEL = enum.auto() BINNING_LEVEL = enum.auto() @@ -112,10 +138,17 @@ def load_location_csv() -> List[LocationData]: LocationData(None, Region.community_center, Goal.community_center), LocationData(None, Region.mines_floor_120, Goal.bottom_of_the_mines), LocationData(None, Region.skull_cavern_100, Goal.cryptic_note), - LocationData(None, Region.farm, Goal.master_angler), + LocationData(None, Region.beach, Goal.master_angler), LocationData(None, Region.museum, Goal.complete_museum), LocationData(None, Region.farm_house, Goal.full_house), LocationData(None, Region.island_west, Goal.greatest_walnut_hunter), + LocationData(None, Region.adventurer_guild, Goal.protector_of_the_valley), + LocationData(None, Region.shipping, Goal.full_shipment), + LocationData(None, Region.kitchen, Goal.gourmet_chef), + LocationData(None, Region.farm, Goal.craft_master), + LocationData(None, Region.shipping, Goal.legend), + LocationData(None, Region.farm, Goal.mystery_of_the_stardrops), + LocationData(None, Region.farm, Goal.allsanity), LocationData(None, Region.qi_walnut_room, Goal.perfection), ] @@ -139,13 +172,20 @@ def extend_cropsanity_locations(randomized_locations: List[LocationData], option if options.cropsanity == Cropsanity.option_disabled: return - cropsanity_locations = locations_by_tag[LocationTags.CROPSANITY] + cropsanity_locations = [item for item in locations_by_tag[LocationTags.CROPSANITY] if not item.mod_name or item.mod_name in options.mods] cropsanity_locations = filter_ginger_island(options, cropsanity_locations) randomized_locations.extend(cropsanity_locations) -def extend_help_wanted_quests(randomized_locations: List[LocationData], desired_number_of_quests: int): - for i in range(0, desired_number_of_quests): +def extend_quests_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + if options.quest_locations < 0: + return + + story_quest_locations = locations_by_tag[LocationTags.STORY_QUEST] + story_quest_locations = filter_disabled_locations(options, story_quest_locations) + randomized_locations.extend(story_quest_locations) + + for i in range(0, options.quest_locations.value): batch = i // 7 index_this_batch = i % 7 if index_this_batch < 4: @@ -161,27 +201,29 @@ def extend_help_wanted_quests(randomized_locations: List[LocationData], desired_ def extend_fishsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, random: Random): prefix = "Fishsanity: " - if options.fishsanity == Fishsanity.option_none: + fishsanity = options.fishsanity + active_fish = get_fish_for_mods(options.mods.value) + if fishsanity == Fishsanity.option_none: return - elif options.fishsanity == Fishsanity.option_legendaries: + elif fishsanity == Fishsanity.option_legendaries: randomized_locations.extend(location_table[f"{prefix}{legendary.name}"] for legendary in legendary_fish) - elif options.fishsanity == Fishsanity.option_special: + elif fishsanity == Fishsanity.option_special: randomized_locations.extend(location_table[f"{prefix}{special.name}"] for special in special_fish) - elif options.fishsanity == Fishsanity.option_randomized: - fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if random.random() < 0.4] - randomized_locations.extend(filter_ginger_island(options, fish_locations)) - elif options.fishsanity == Fishsanity.option_all: - fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish] - randomized_locations.extend(filter_ginger_island(options, fish_locations)) - elif options.fishsanity == Fishsanity.option_exclude_legendaries: - fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish not in legendary_fish] - randomized_locations.extend(filter_ginger_island(options, fish_locations)) - elif options.fishsanity == Fishsanity.option_exclude_hard_fish: - fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish.difficulty < 80] - randomized_locations.extend(filter_ginger_island(options, fish_locations)) + elif fishsanity == Fishsanity.option_randomized: + fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in active_fish if random.random() < 0.4] + randomized_locations.extend(filter_disabled_locations(options, fish_locations)) + elif fishsanity == Fishsanity.option_all: + fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in active_fish] + randomized_locations.extend(filter_disabled_locations(options, fish_locations)) + elif fishsanity == Fishsanity.option_exclude_legendaries: + fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in active_fish if fish not in legendary_fish] + randomized_locations.extend(filter_disabled_locations(options, fish_locations)) + elif fishsanity == Fishsanity.option_exclude_hard_fish: + fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in active_fish if fish.difficulty < 80] + randomized_locations.extend(filter_disabled_locations(options, fish_locations)) elif options.fishsanity == Fishsanity.option_only_easy_fish: - fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish.difficulty < 50] - randomized_locations.extend(filter_ginger_island(options, fish_locations)) + fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in active_fish if fish.difficulty < 50] + randomized_locations.extend(filter_disabled_locations(options, fish_locations)) def extend_museumsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, random: Random): @@ -191,30 +233,31 @@ def extend_museumsanity_locations(randomized_locations: List[LocationData], opti elif options.museumsanity == Museumsanity.option_milestones: randomized_locations.extend(locations_by_tag[LocationTags.MUSEUM_MILESTONES]) elif options.museumsanity == Museumsanity.option_randomized: - randomized_locations.extend(location_table[f"{prefix}{museum_item.name}"] + randomized_locations.extend(location_table[f"{prefix}{museum_item.item_name}"] for museum_item in all_museum_items if random.random() < 0.4) elif options.museumsanity == Museumsanity.option_all: - randomized_locations.extend(location_table[f"{prefix}{museum_item.name}"] for museum_item in all_museum_items) + randomized_locations.extend(location_table[f"{prefix}{museum_item.item_name}"] for museum_item in all_museum_items) def extend_friendsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + island_villagers = [NPC.leo, ModNPC.lance] if options.friendsanity == Friendsanity.option_none: return - exclude_leo = options.exclude_ginger_island == ExcludeGingerIsland.option_true + randomized_locations.append(location_table[f"Spouse Stardrop"]) + extend_baby_locations(randomized_locations) + exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true exclude_non_bachelors = options.friendsanity == Friendsanity.option_bachelors exclude_locked_villagers = options.friendsanity == Friendsanity.option_starting_npcs or \ options.friendsanity == Friendsanity.option_bachelors include_post_marriage_hearts = options.friendsanity == Friendsanity.option_all_with_marriage heart_size = options.friendsanity_heart_size - for villager in all_villagers: - if villager.mod_name not in options.mods and villager.mod_name is not None: - continue + for villager in get_villagers_for_mods(options.mods.value): if not villager.available and exclude_locked_villagers: continue if not villager.bachelor and exclude_non_bachelors: continue - if villager.name == "Leo" and exclude_leo: + if villager.name in island_villagers and exclude_ginger_island: continue heart_cap = 8 if villager.bachelor else 10 if include_post_marriage_hearts and villager.bachelor: @@ -230,6 +273,11 @@ def extend_friendsanity_locations(randomized_locations: List[LocationData], opti randomized_locations.append(location_table[f"Friendsanity: Pet {heart} <3"]) +def extend_baby_locations(randomized_locations: List[LocationData]): + baby_locations = [location for location in locations_by_tag[LocationTags.BABY]] + randomized_locations.extend(baby_locations) + + def extend_festival_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): if options.festival_locations == FestivalLocations.option_disabled: return @@ -256,7 +304,8 @@ def extend_special_order_locations(randomized_locations: List[LocationData], opt randomized_locations.extend(board_locations) if options.special_order_locations == SpecialOrderLocations.option_board_qi and include_island: include_arcade = options.arcade_machine_locations != ArcadeMachineLocations.option_disabled - qi_orders = [location for location in locations_by_tag[LocationTags.SPECIAL_ORDER_QI] if include_arcade or LocationTags.JUNIMO_KART not in location.tags] + qi_orders = [location for location in locations_by_tag[LocationTags.SPECIAL_ORDER_QI] if + include_arcade or LocationTags.JUNIMO_KART not in location.tags] randomized_locations.extend(qi_orders) @@ -271,12 +320,31 @@ def extend_walnut_purchase_locations(randomized_locations: List[LocationData], o randomized_locations.extend(locations_by_tag[LocationTags.WALNUT_PURCHASE]) -def extend_mandatory_locations(randomized_locations: List[LocationData], options): +def extend_mandatory_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): mandatory_locations = [location for location in locations_by_tag[LocationTags.MANDATORY]] filtered_mandatory_locations = filter_disabled_locations(options, mandatory_locations) randomized_locations.extend(filtered_mandatory_locations) +def extend_situational_quest_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + if options.quest_locations < 0: + return + if ModNames.distant_lands in options.mods: + if ModNames.alecto in options.mods: + randomized_locations.append(location_table[ModQuest.WitchOrder]) + else: + randomized_locations.append(location_table[ModQuest.CorruptedCropsTask]) + + +def extend_bundle_locations(randomized_locations: List[LocationData], bundle_rooms: List[BundleRoom]): + for room in bundle_rooms: + room_location = f"Complete {room.name}" + if room_location in location_table: + randomized_locations.append(location_table[room_location]) + for bundle in room.bundles: + randomized_locations.append(location_table[bundle.name]) + + def extend_backpack_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): if options.backpack_progression == BackpackProgression.option_vanilla: return @@ -293,15 +361,99 @@ def extend_elevator_locations(randomized_locations: List[LocationData], options: randomized_locations.extend(filtered_elevator_locations) +def extend_monstersanity_locations(randomized_locations: List[LocationData], options): + monstersanity = options.monstersanity + if monstersanity == Monstersanity.option_none: + return + if monstersanity == Monstersanity.option_one_per_monster or monstersanity == Monstersanity.option_split_goals: + monster_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_MONSTER]] + filtered_monster_locations = filter_disabled_locations(options, monster_locations) + randomized_locations.extend(filtered_monster_locations) + return + goal_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_GOALS]] + filtered_goal_locations = filter_disabled_locations(options, goal_locations) + randomized_locations.extend(filtered_goal_locations) + if monstersanity != Monstersanity.option_progressive_goals: + return + progressive_goal_locations = [location for location in locations_by_tag[LocationTags.MONSTERSANITY_PROGRESSIVE_GOALS]] + filtered_progressive_goal_locations = filter_disabled_locations(options, progressive_goal_locations) + randomized_locations.extend(filtered_progressive_goal_locations) + + +def extend_shipsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + shipsanity = options.shipsanity + if shipsanity == Shipsanity.option_none: + return + if shipsanity == Shipsanity.option_everything: + ship_locations = [location for location in locations_by_tag[LocationTags.SHIPSANITY]] + filtered_ship_locations = filter_disabled_locations(options, ship_locations) + randomized_locations.extend(filtered_ship_locations) + return + shipsanity_locations = set() + if shipsanity == Shipsanity.option_fish or shipsanity == Shipsanity.option_full_shipment_with_fish: + shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_FISH]}) + if shipsanity == Shipsanity.option_crops: + shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_CROP]}) + if shipsanity == Shipsanity.option_full_shipment or shipsanity == Shipsanity.option_full_shipment_with_fish: + shipsanity_locations = shipsanity_locations.union({location for location in locations_by_tag[LocationTags.SHIPSANITY_FULL_SHIPMENT]}) + + filtered_shipsanity_locations = filter_disabled_locations(options, list(shipsanity_locations)) + randomized_locations.extend(filtered_shipsanity_locations) + + +def extend_cooksanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + cooksanity = options.cooksanity + if cooksanity == Cooksanity.option_none: + return + if cooksanity == Cooksanity.option_queen_of_sauce: + cooksanity_locations = (location for location in locations_by_tag[LocationTags.COOKSANITY_QOS]) + else: + cooksanity_locations = (location for location in locations_by_tag[LocationTags.COOKSANITY]) + + filtered_cooksanity_locations = filter_disabled_locations(options, cooksanity_locations) + randomized_locations.extend(filtered_cooksanity_locations) + + +def extend_chefsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + chefsanity = options.chefsanity + if chefsanity == Chefsanity.option_none: + return + + chefsanity_locations_by_name = {} # Dictionary to not make duplicates + + if chefsanity & Chefsanity.option_queen_of_sauce: + chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_QOS]}) + if chefsanity & Chefsanity.option_purchases: + chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_PURCHASE]}) + if chefsanity & Chefsanity.option_friendship: + chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_FRIENDSHIP]}) + if chefsanity & Chefsanity.option_skills: + chefsanity_locations_by_name.update({location.name: location for location in locations_by_tag[LocationTags.CHEFSANITY_SKILL]}) + + filtered_chefsanity_locations = filter_disabled_locations(options, list(chefsanity_locations_by_name.values())) + randomized_locations.extend(filtered_chefsanity_locations) + + +def extend_craftsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions): + if options.craftsanity == Craftsanity.option_none: + return + + craftsanity_locations = [craft for craft in locations_by_tag[LocationTags.CRAFTSANITY]] + filtered_chefsanity_locations = filter_disabled_locations(options, craftsanity_locations) + randomized_locations.extend(filtered_chefsanity_locations) + + def create_locations(location_collector: StardewLocationCollector, + bundle_rooms: List[BundleRoom], options: StardewValleyOptions, random: Random): randomized_locations = [] extend_mandatory_locations(randomized_locations, options) + extend_bundle_locations(randomized_locations, bundle_rooms) extend_backpack_locations(randomized_locations, options) - if not options.tool_progression == ToolProgression.option_vanilla: + if options.tool_progression & ToolProgression.option_progressive: randomized_locations.extend(locations_by_tag[LocationTags.TOOL_UPGRADE]) extend_elevator_locations(randomized_locations, options) @@ -311,7 +463,7 @@ def create_locations(location_collector: StardewLocationCollector, if location.mod_name is None or location.mod_name in options.mods: randomized_locations.append(location_table[location.name]) - if not options.building_progression == BuildingProgression.option_vanilla: + if options.building_progression & BuildingProgression.option_progressive: for location in locations_by_tag[LocationTags.BUILDING_BLUEPRINT]: if location.mod_name is None or location.mod_name in options.mods: randomized_locations.append(location_table[location.name]) @@ -323,7 +475,6 @@ def create_locations(location_collector: StardewLocationCollector, randomized_locations.extend(locations_by_tag[LocationTags.ARCADE_MACHINE]) extend_cropsanity_locations(randomized_locations, options) - extend_help_wanted_quests(randomized_locations, options.help_wanted_locations.value) extend_fishsanity_locations(randomized_locations, options, random) extend_museumsanity_locations(randomized_locations, options, random) extend_friendsanity_locations(randomized_locations, options) @@ -332,21 +483,34 @@ def create_locations(location_collector: StardewLocationCollector, extend_special_order_locations(randomized_locations, options) extend_walnut_purchase_locations(randomized_locations, options) + extend_monstersanity_locations(randomized_locations, options) + extend_shipsanity_locations(randomized_locations, options) + extend_cooksanity_locations(randomized_locations, options) + extend_chefsanity_locations(randomized_locations, options) + extend_craftsanity_locations(randomized_locations, options) + extend_quests_locations(randomized_locations, options) + extend_situational_quest_locations(randomized_locations, options) + for location_data in randomized_locations: location_collector(location_data.name, location_data.code, location_data.region) -def filter_ginger_island(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]: +def filter_ginger_island(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]: include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false - return [location for location in locations if include_island or LocationTags.GINGER_ISLAND not in location.tags] + return (location for location in locations if include_island or LocationTags.GINGER_ISLAND not in location.tags) + + +def filter_qi_order_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]: + include_qi_orders = options.special_order_locations == SpecialOrderLocations.option_board_qi + return (location for location in locations if include_qi_orders or LocationTags.REQUIRES_QI_ORDERS not in location.tags) -def filter_modded_locations(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]: - current_mod_names = options.mods - return [location for location in locations if location.mod_name is None or location.mod_name in current_mod_names] +def filter_modded_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]: + return (location for location in locations if location.mod_name is None or location.mod_name in options.mods) -def filter_disabled_locations(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]: - locations_first_pass = filter_ginger_island(options, locations) - locations_second_pass = filter_modded_locations(options, locations_first_pass) - return locations_second_pass +def filter_disabled_locations(options: StardewValleyOptions, locations: Iterable[LocationData]) -> Iterable[LocationData]: + locations_island_filter = filter_ginger_island(options, locations) + locations_qi_filter = filter_qi_order_locations(options, locations_island_filter) + locations_mod_filter = filter_modded_locations(options, locations_qi_filter) + return locations_mod_filter diff --git a/worlds/stardew_valley/logic.py b/worlds/stardew_valley/logic.py deleted file mode 100644 index d4476a3f313a..000000000000 --- a/worlds/stardew_valley/logic.py +++ /dev/null @@ -1,1626 +0,0 @@ -from __future__ import annotations - -import math -from dataclasses import dataclass, field -from typing import Dict, Union, Optional, Iterable, Sized, List, Set - -from .data import all_fish, FishItem, all_purchasable_seeds, SeedItem, all_crops, CropItem -from .data.bundle_data import BundleItem -from .data.crops_data import crops_by_name -from .data.fish_data import island_fish -from .data.museum_data import all_museum_items, MuseumItem, all_museum_artifacts, all_museum_minerals -from .data.recipe_data import all_cooking_recipes, CookingRecipe, RecipeSource, FriendshipSource, QueenOfSauceSource, \ - StarterSource, ShopSource, SkillSource -from .data.villagers_data import all_villagers_by_name, Villager -from .items import all_items, Group -from .mods.logic.buildings import get_modded_building_rules -from .mods.logic.quests import get_modded_quest_rules -from .mods.logic.special_orders import get_modded_special_orders_rules -from .mods.logic.skullcavernelevator import has_skull_cavern_elevator_to_floor -from .mods.mod_data import ModNames -from .mods.logic import magic, skills -from .options import Museumsanity, SeasonRandomization, StardewValleyOptions, BuildingProgression, SkillProgression, ToolProgression, Friendsanity, Cropsanity, \ - ExcludeGingerIsland, ElevatorProgression, ArcadeMachineLocations, FestivalLocations, SpecialOrderLocations -from .regions import vanilla_regions -from .stardew_rule import False_, Reach, Or, True_, Received, Count, And, Has, TotalReceived, StardewRule -from .strings.animal_names import Animal, coop_animals, barn_animals -from .strings.animal_product_names import AnimalProduct -from .strings.ap_names.buff_names import Buff -from .strings.ap_names.transport_names import Transportation -from .strings.artisan_good_names import ArtisanGood -from .strings.building_names import Building -from .strings.calendar_names import Weekday -from .strings.craftable_names import Craftable -from .strings.crop_names import Fruit, Vegetable, all_fruits, all_vegetables -from .strings.fertilizer_names import Fertilizer -from .strings.festival_check_names import FestivalCheck -from .strings.fish_names import Fish, Trash, WaterItem -from .strings.flower_names import Flower -from .strings.forageable_names import Forageable -from .strings.fruit_tree_names import Sapling -from .strings.generic_names import Generic -from .strings.geode_names import Geode -from .strings.gift_names import Gift -from .strings.ingredient_names import Ingredient -from .strings.material_names import Material -from .strings.machine_names import Machine -from .strings.food_names import Meal, Beverage -from .strings.metal_names import Ore, MetalBar, Mineral, Fossil -from .strings.monster_drop_names import Loot -from .strings.performance_names import Performance -from .strings.quest_names import Quest -from .strings.region_names import Region -from .strings.season_names import Season -from .strings.seed_names import Seed -from .strings.skill_names import Skill, ModSkill -from .strings.special_order_names import SpecialOrder -from .strings.spells import MagicSpell -from .strings.tool_names import Tool, ToolMaterial, APTool -from .strings.tv_channel_names import Channel -from .strings.villager_names import NPC -from .strings.wallet_item_names import Wallet -from .strings.weapon_names import Weapon - -MAX_MONTHS = 12 -MONEY_PER_MONTH = 15000 -MISSING_ITEM = "THIS ITEM IS MISSING" - -tool_materials = { - ToolMaterial.copper: 1, - ToolMaterial.iron: 2, - ToolMaterial.gold: 3, - ToolMaterial.iridium: 4 -} - -tool_upgrade_prices = { - ToolMaterial.copper: 2000, - ToolMaterial.iron: 5000, - ToolMaterial.gold: 10000, - ToolMaterial.iridium: 25000 -} - -fishing_regions = [Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west] - - -@dataclass(frozen=True, repr=False) -class StardewLogic: - player: int - options: StardewValleyOptions - - item_rules: Dict[str, StardewRule] = field(default_factory=dict) - sapling_rules: Dict[str, StardewRule] = field(default_factory=dict) - tree_fruit_rules: Dict[str, StardewRule] = field(default_factory=dict) - seed_rules: Dict[str, StardewRule] = field(default_factory=dict) - cooking_rules: Dict[str, StardewRule] = field(default_factory=dict) - crop_rules: Dict[str, StardewRule] = field(default_factory=dict) - fish_rules: Dict[str, StardewRule] = field(default_factory=dict) - museum_rules: Dict[str, StardewRule] = field(default_factory=dict) - building_rules: Dict[str, StardewRule] = field(default_factory=dict) - quest_rules: Dict[str, StardewRule] = field(default_factory=dict) - festival_rules: Dict[str, StardewRule] = field(default_factory=dict) - special_order_rules: Dict[str, StardewRule] = field(default_factory=dict) - - def __post_init__(self): - self.fish_rules.update({fish.name: self.can_catch_fish(fish) for fish in all_fish}) - self.museum_rules.update({donation.name: self.can_find_museum_item(donation) for donation in all_museum_items}) - - for recipe in all_cooking_recipes: - can_cook_rule = self.can_cook(recipe) - if recipe.meal in self.cooking_rules: - can_cook_rule = can_cook_rule | self.cooking_rules[recipe.meal] - self.cooking_rules[recipe.meal] = can_cook_rule - - self.sapling_rules.update({ - Sapling.apple: self.can_buy_sapling(Fruit.apple), - Sapling.apricot: self.can_buy_sapling(Fruit.apricot), - Sapling.cherry: self.can_buy_sapling(Fruit.cherry), - Sapling.orange: self.can_buy_sapling(Fruit.orange), - Sapling.peach: self.can_buy_sapling(Fruit.peach), - Sapling.pomegranate: self.can_buy_sapling(Fruit.pomegranate), - Sapling.banana: self.can_buy_sapling(Fruit.banana), - Sapling.mango: self.can_buy_sapling(Fruit.mango), - }) - - self.tree_fruit_rules.update({ - Fruit.apple: self.can_plant_and_grow_item(Season.fall), - Fruit.apricot: self.can_plant_and_grow_item(Season.spring), - Fruit.cherry: self.can_plant_and_grow_item(Season.spring), - Fruit.orange: self.can_plant_and_grow_item(Season.summer), - Fruit.peach: self.can_plant_and_grow_item(Season.summer), - Fruit.pomegranate: self.can_plant_and_grow_item(Season.fall), - Fruit.banana: self.can_plant_and_grow_item(Season.summer), - Fruit.mango: self.can_plant_and_grow_item(Season.summer), - }) - - for tree_fruit in self.tree_fruit_rules: - existing_rules = self.tree_fruit_rules[tree_fruit] - sapling = f"{tree_fruit} Sapling" - self.tree_fruit_rules[tree_fruit] = existing_rules & self.has(sapling) & self.has_lived_months(1) - - self.seed_rules.update({seed.name: self.can_buy_seed(seed) for seed in all_purchasable_seeds}) - self.crop_rules.update({crop.name: self.can_grow_crop(crop) for crop in all_crops}) - self.crop_rules.update({ - Seed.coffee: (self.has_season(Season.spring) | self.has_season( - Season.summer)) & self.can_buy_seed(crops_by_name[Seed.coffee].seed), - Fruit.ancient_fruit: (self.received("Ancient Seeds") | self.received("Ancient Seeds Recipe")) & - self.can_reach_region(Region.greenhouse) & self.has(Machine.seed_maker), - }) - - self.item_rules.update({ - ArtisanGood.aged_roe: self.can_preserves_jar(AnimalProduct.roe), - AnimalProduct.any_egg: self.has(AnimalProduct.chicken_egg) | self.has(AnimalProduct.duck_egg), - Fish.any: Or([self.can_catch_fish(fish) for fish in all_fish]), - Geode.artifact_trove: self.has(Geode.omni) & self.can_reach_region(Region.desert), - Craftable.bait: (self.has_skill_level(Skill.fishing, 2) & self.has(Loot.bug_meat)) | self.has(Machine.worm_bin), - Fertilizer.basic: (self.has(Material.sap) & self.has_farming_level(1)) | (self.has_lived_months(1) & self.can_spend_money_at(Region.pierre_store, 100)), - Fertilizer.quality: (self.has_farming_level(9) & self.has(Material.sap) & self.has(Fish.any)) | (self.has_year_two() & self.can_spend_money_at(Region.pierre_store, 150)), - Fertilizer.deluxe: False_(), - # self.received("Deluxe Fertilizer Recipe") & self.has(MetalBar.iridium) & self.has(SVItem.sap), - Fertilizer.tree: self.has_skill_level(Skill.foraging, 7) & self.has(Material.fiber) & self.has(Material.stone), - Loot.bat_wing: self.can_mine_in_the_mines_floor_41_80() | self.can_mine_in_the_skull_cavern(), - ArtisanGood.battery_pack: (self.has(Machine.lightning_rod) & self.has_any_season_not_winter()) | self.has(Machine.solar_panel), - Machine.bee_house: self.has_farming_level(3) & self.has(MetalBar.iron) & self.has(ArtisanGood.maple_syrup) & self.has(Material.coal) & self.has(Material.wood), - Beverage.beer: self.can_keg(Vegetable.wheat) | self.can_spend_money_at(Region.saloon, 400), - Forageable.blackberry: self.can_forage(Season.fall), - Craftable.bomb: self.has_skill_level(Skill.mining, 6) & self.has(Material.coal) & self.has(Ore.iron), - Fossil.bone_fragment: self.can_reach_region(Region.dig_site), - Gift.bouquet: self.has_relationship(Generic.bachelor, 8) & self.can_spend_money_at(Region.pierre_store, 100), - Meal.bread: self.can_spend_money_at(Region.saloon, 120), - Trash.broken_cd: self.can_crab_pot(), - Trash.broken_glasses: self.can_crab_pot(), - Loot.bug_meat: self.can_mine_in_the_mines_floor_1_40(), - Forageable.cactus_fruit: self.can_forage(Generic.any, Region.desert), - Machine.cask: self.has_house(3) & self.can_reach_region(Region.cellar) & self.has(Material.wood) & self.has(Material.hardwood), - Forageable.cave_carrot: self.can_forage(Generic.any, Region.mines_floor_10, True), - ArtisanGood.caviar: self.can_preserves_jar(AnimalProduct.sturgeon_roe), - Forageable.chanterelle: self.can_forage(Season.fall, Region.secret_woods), - Machine.cheese_press: self.has_farming_level(6) & self.has(Material.wood) & self.has(Material.stone) & self.has(Material.hardwood) & self.has(MetalBar.copper), - ArtisanGood.cheese: (self.has(AnimalProduct.cow_milk) & self.has(Machine.cheese_press)) | (self.can_reach_region(Region.desert) & self.has(Mineral.emerald)), - Craftable.cherry_bomb: self.has_skill_level(Skill.mining, 1) & self.has(Material.coal) & self.has(Ore.copper), - Animal.chicken: self.can_buy_animal(Animal.chicken), - AnimalProduct.chicken_egg: self.has([AnimalProduct.egg, AnimalProduct.brown_egg, AnimalProduct.large_egg, AnimalProduct.large_brown_egg], 1), - Material.cinder_shard: self.can_reach_region(Region.volcano_floor_5), - WaterItem.clam: self.can_forage(Generic.any, Region.beach), - Material.clay: self.can_reach_any_region([Region.farm, Region.beach, Region.quarry]) & self.has_tool(Tool.hoe), - ArtisanGood.cloth: (self.has(AnimalProduct.wool) & self.has(Machine.loom)) | (self.can_reach_region(Region.desert) & self.has(Mineral.aquamarine)), - Material.coal: self.can_mine_in_the_mines_floor_41_80() | self.can_do_panning(), - WaterItem.cockle: self.can_forage(Generic.any, Region.beach), - Forageable.coconut: self.can_forage(Generic.any, Region.desert), - Beverage.coffee: self.can_keg(Seed.coffee) | self.has(Machine.coffee_maker) | (self.can_spend_money_at(Region.saloon, 300)) | self.has("Hot Java Ring"), - Machine.coffee_maker: self.received(Machine.coffee_maker), - Forageable.common_mushroom: self.can_forage(Season.fall) | (self.can_forage(Season.spring, Region.secret_woods)), - MetalBar.copper: self.can_smelt(Ore.copper), - Ore.copper: self.can_mine_in_the_mines_floor_1_40() | self.can_mine_in_the_skull_cavern() | self.can_do_panning(), - WaterItem.coral: self.can_forage(Generic.any, Region.tide_pools) | self.can_forage(Season.summer, Region.beach), - Animal.cow: self.can_buy_animal(Animal.cow), - AnimalProduct.cow_milk: self.has(AnimalProduct.milk) | self.has(AnimalProduct.large_milk), - Fish.crab: self.can_crab_pot(Region.beach), - Machine.crab_pot: self.has_skill_level(Skill.fishing, 3) & (self.can_spend_money_at(Region.fish_shop, 1500) | (self.has(MetalBar.iron) & self.has(Material.wood))), - Fish.crayfish: self.can_crab_pot(Region.town), - Forageable.crocus: self.can_forage(Season.winter), - Forageable.crystal_fruit: self.can_forage(Season.winter), - Forageable.daffodil: self.can_forage(Season.spring), - Forageable.dandelion: self.can_forage(Season.spring), - Animal.dinosaur: self.has_building(Building.big_coop) & self.has(AnimalProduct.dinosaur_egg), - Forageable.dragon_tooth: self.can_forage(Generic.any, Region.volcano_floor_10), - "Dried Starfish": self.can_fish() & self.can_reach_region(Region.beach), - Trash.driftwood: self.can_crab_pot(), - AnimalProduct.duck_egg: self.has_animal(Animal.duck), - AnimalProduct.duck_feather: self.has_happy_animal(Animal.duck), - Animal.duck: self.can_buy_animal(Animal.duck), - AnimalProduct.egg: self.has_animal(Animal.chicken), - AnimalProduct.brown_egg: self.has_animal(Animal.chicken), - "Energy Tonic": self.can_reach_region(Region.hospital) & self.can_spend_money(1000), - Material.fiber: True_(), - Forageable.fiddlehead_fern: self.can_forage(Season.summer, Region.secret_woods), - "Magic Rock Candy": self.can_reach_region(Region.desert) & self.has("Prismatic Shard"), - "Fishing Chest": self.can_fish_chests(), - Craftable.flute_block: self.has_relationship(NPC.robin, 6) & self.can_reach_region(Region.carpenter) & self.has(Material.wood) & self.has(Ore.copper) & self.has(Material.fiber), - Geode.frozen: self.can_mine_in_the_mines_floor_41_80(), - Machine.furnace: self.has(Material.stone) & self.has(Ore.copper), - Geode.geode: self.can_mine_in_the_mines_floor_1_40(), - Forageable.ginger: self.can_forage(Generic.any, Region.island_west, True), - ArtisanGood.goat_cheese: self.has(AnimalProduct.goat_milk) & self.has(Machine.cheese_press), - AnimalProduct.goat_milk: self.has(Animal.goat), - Animal.goat: self.can_buy_animal(Animal.goat), - MetalBar.gold: self.can_smelt(Ore.gold), - Ore.gold: self.can_mine_in_the_mines_floor_81_120() | self.can_mine_in_the_skull_cavern() | self.can_do_panning(), - Geode.golden_coconut: self.can_reach_region(Region.island_north), - Gift.golden_pumpkin: self.has_season(Season.fall) | self.can_open_geode(Geode.artifact_trove), - WaterItem.green_algae: self.can_fish_in_freshwater(), - ArtisanGood.green_tea: self.can_keg(Vegetable.tea_leaves), - Material.hardwood: self.has_tool(Tool.axe, ToolMaterial.copper) & (self.can_reach_region(Region.secret_woods) | self.can_reach_region(Region.island_south)), - Forageable.hay: self.has_building(Building.silo) & self.has_tool(Tool.scythe), - Forageable.hazelnut: self.can_forage(Season.fall), - Forageable.holly: self.can_forage(Season.winter), - ArtisanGood.honey: self.can_spend_money_at(Region.oasis, 200) | (self.has(Machine.bee_house) & self.has_any_season_not_winter()), - "Hot Java Ring": self.can_reach_region(Region.volcano_floor_10), - Meal.ice_cream: (self.has_season(Season.summer) & self.can_spend_money_at(Region.town, 250)) | self.can_spend_money_at(Region.oasis, 240), - # | (self.can_cook() & self.has_relationship(NPC.jodi, 7) & self.has(AnimalProduct.cow_milk) & self.has(Ingredient.sugar)), - MetalBar.iridium: self.can_smelt(Ore.iridium), - Ore.iridium: self.can_mine_in_the_skull_cavern(), - MetalBar.iron: self.can_smelt(Ore.iron), - Ore.iron: self.can_mine_in_the_mines_floor_41_80() | self.can_mine_in_the_skull_cavern() | self.can_do_panning(), - ArtisanGood.jelly: self.has_jelly(), - Trash.joja_cola: self.can_spend_money_at(Region.saloon, 75), - "JotPK Small Buff": self.has_jotpk_power_level(2), - "JotPK Medium Buff": self.has_jotpk_power_level(4), - "JotPK Big Buff": self.has_jotpk_power_level(7), - "JotPK Max Buff": self.has_jotpk_power_level(9), - ArtisanGood.juice: self.has_juice(), - "Junimo Kart Small Buff": self.has_junimo_kart_power_level(2), - "Junimo Kart Medium Buff": self.has_junimo_kart_power_level(4), - "Junimo Kart Big Buff": self.has_junimo_kart_power_level(6), - "Junimo Kart Max Buff": self.has_junimo_kart_power_level(8), - Machine.keg: self.has_farming_level(8) & self.has(Material.wood) & self.has(MetalBar.iron) & self.has(MetalBar.copper) & self.has(ArtisanGood.oak_resin), - AnimalProduct.large_egg: self.has_happy_animal(Animal.chicken), - AnimalProduct.large_brown_egg: self.has_happy_animal(Animal.chicken), - AnimalProduct.large_goat_milk: self.has_happy_animal(Animal.goat), - AnimalProduct.large_milk: self.has_happy_animal(Animal.cow), - Forageable.leek: self.can_forage(Season.spring), - Craftable.life_elixir: self.has_skill_level(Skill.combat, 2) & self.has(Forageable.red_mushroom) & self.has(Forageable.purple_mushroom) & self.has(Forageable.morel) & self.has(Forageable.chanterelle), - Machine.lightning_rod: self.has_skill_level(Skill.foraging, 6) & self.has(MetalBar.iron) & self.has(MetalBar.quartz) & self.has(Loot.bat_wing), - Fish.lobster: self.can_crab_pot(Region.beach), - Machine.loom: self.has_farming_level(7) & self.has(Material.wood) & self.has(Material.fiber) & self.has(ArtisanGood.pine_tar), - Forageable.magma_cap: self.can_forage(Generic.any, Region.volcano_floor_5), - Geode.magma: self.can_mine_in_the_mines_floor_81_120() | (self.has(Fish.lava_eel) & self.has_building(Building.fish_pond)), - ArtisanGood.maple_syrup: self.has(Machine.tapper), - ArtisanGood.mayonnaise: self.has(Machine.mayonnaise_machine) & self.has(AnimalProduct.chicken_egg), - Machine.mayonnaise_machine: self.has_farming_level(2) & self.has(Material.wood) & self.has(Material.stone) & self.has("Earth Crystal") & self.has(MetalBar.copper), - ArtisanGood.mead: self.can_keg(ArtisanGood.honey), - Craftable.mega_bomb: self.has_skill_level(Skill.mining, 8) & self.has(Ore.gold) & self.has(Loot.solar_essence) & self.has(Loot.void_essence), - Gift.mermaid_pendant: self.can_reach_region(Region.tide_pools) & self.has_relationship(Generic.bachelor, 10) & self.has_house(1) & self.has(Craftable.rain_totem), - AnimalProduct.milk: self.has_animal(Animal.cow), - Craftable.monster_musk: self.has_prismatic_jelly_reward_access() & self.has(Loot.slime) & self.has(Loot.bat_wing), - Forageable.morel: self.can_forage(Season.spring, Region.secret_woods), - "Muscle Remedy": self.can_reach_region(Region.hospital) & self.can_spend_money(1000), - Fish.mussel: self.can_forage(Generic.any, Region.beach) or self.has(Fish.mussel_node), - Fish.mussel_node: self.can_reach_region(Region.island_west), - WaterItem.nautilus_shell: self.can_forage(Season.winter, Region.beach), - ArtisanGood.oak_resin: self.has(Machine.tapper), - Ingredient.oil: self.can_spend_money_at(Region.pierre_store, 200) | (self.has(Machine.oil_maker) & (self.has(Vegetable.corn) | self.has(Flower.sunflower) | self.has(Seed.sunflower))), - Machine.oil_maker: self.has_farming_level(8) & self.has(Loot.slime) & self.has(Material.hardwood) & self.has(MetalBar.gold), - Craftable.oil_of_garlic: (self.has_skill_level(Skill.combat, 6) & self.has(Vegetable.garlic) & self.has(Ingredient.oil)) | (self.can_spend_money_at(Region.mines_dwarf_shop, 3000)), - Geode.omni: self.can_mine_in_the_mines_floor_41_80() | self.can_reach_region(Region.desert) | self.can_do_panning() | self.received(Wallet.rusty_key) | (self.has(Fish.octopus) & self.has_building(Building.fish_pond)) | self.can_reach_region(Region.volcano_floor_10), - Animal.ostrich: self.has_building(Building.barn) & self.has(AnimalProduct.ostrich_egg) & self.has(Machine.ostrich_incubator), - AnimalProduct.ostrich_egg: self.can_forage(Generic.any, Region.island_north, True), - Machine.ostrich_incubator: self.received("Ostrich Incubator Recipe") & self.has(Fossil.bone_fragment) & self.has(Material.hardwood) & self.has(Material.cinder_shard), - Fish.oyster: self.can_forage(Generic.any, Region.beach), - ArtisanGood.pale_ale: self.can_keg(Vegetable.hops), - Gift.pearl: (self.has(Fish.blobfish) & self.has_building(Building.fish_pond)) | self.can_open_geode(Geode.artifact_trove), - Fish.periwinkle: self.can_crab_pot(Region.town), - ArtisanGood.pickles: self.has_pickle(), - Animal.pig: self.can_buy_animal(Animal.pig), - Beverage.pina_colada: self.can_spend_money_at(Region.island_resort, 600), - ArtisanGood.pine_tar: self.has(Machine.tapper), - Meal.pizza: self.can_spend_money_at(Region.saloon, 600), - Machine.preserves_jar: self.has_farming_level(4) & self.has(Material.wood) & self.has(Material.stone) & self.has(Material.coal), - Forageable.purple_mushroom: self.can_forage(Generic.any, Region.mines_floor_95) | self.can_forage(Generic.any, Region.skull_cavern_25), - Animal.rabbit: self.can_buy_animal(Animal.rabbit), - AnimalProduct.rabbit_foot: self.has_happy_animal(Animal.rabbit), - MetalBar.radioactive: self.can_smelt(Ore.radioactive), - Ore.radioactive: self.can_mine_perfectly() & self.can_reach_region(Region.qi_walnut_room), - Forageable.rainbow_shell: self.can_forage(Season.summer, Region.beach), - Craftable.rain_totem: self.has_skill_level(Skill.foraging, 9) & self.has(Material.hardwood) & self.has(ArtisanGood.truffle_oil) & self.has(ArtisanGood.pine_tar), - Machine.recycling_machine: self.has_skill_level(Skill.fishing, 4) & self.has(Material.wood) & self.has(Material.stone) & self.has(MetalBar.iron), - Forageable.red_mushroom: self.can_forage(Season.summer, Region.secret_woods) | self.can_forage(Season.fall, Region.secret_woods), - MetalBar.quartz: self.can_smelt("Quartz") | self.can_smelt("Fire Quartz") | - (self.has(Machine.recycling_machine) & (self.has(Trash.broken_cd) | self.has(Trash.broken_glasses))), - Ingredient.rice: self.can_spend_money_at(Region.pierre_store, 200) | ( - self.has_building(Building.mill) & self.has(Vegetable.unmilled_rice)), - AnimalProduct.roe: self.can_fish() & self.has_building(Building.fish_pond), - Meal.salad: self.can_spend_money_at(Region.saloon, 220), - # | (self.can_cook() & self.has_relationship(NPC.emily, 3) & self.has(Forageable.leek) & self.has(Forageable.dandelion) & - # self.has(Ingredient.vinegar)), - Forageable.salmonberry: self.can_forage(Season.spring), - Material.sap: self.can_chop_trees(), - Craftable.scarecrow: self.has_farming_level(1) & self.has(Material.wood) & self.has(Material.coal) & self.has(Material.fiber), - WaterItem.sea_urchin: self.can_forage(Generic.any, Region.tide_pools), - WaterItem.seaweed: (self.can_fish() & self.can_reach_region(Region.beach)) | self.can_reach_region( - Region.tide_pools), - Forageable.secret_note: self.received(Wallet.magnifying_glass) & (self.can_chop_trees() | self.can_mine_in_the_mines_floor_1_40()), - Machine.seed_maker: self.has_farming_level(9) & self.has(Material.wood) & self.has(MetalBar.gold) & self.has( - Material.coal), - Animal.sheep: self.can_buy_animal(Animal.sheep), - Fish.shrimp: self.can_crab_pot(Region.beach), - Loot.slime: self.can_mine_in_the_mines_floor_1_40(), - Weapon.any_slingshot: self.received(Weapon.slingshot) | self.received(Weapon.master_slingshot), - Fish.snail: self.can_crab_pot(Region.town), - Forageable.snow_yam: self.can_forage(Season.winter, Region.beach, True), - Trash.soggy_newspaper: self.can_crab_pot(), - Loot.solar_essence: self.can_mine_in_the_mines_floor_41_80() | self.can_mine_in_the_skull_cavern(), - Machine.solar_panel: self.received("Solar Panel Recipe") & self.has(MetalBar.quartz) & self.has( - MetalBar.iron) & self.has(MetalBar.gold), - Meal.spaghetti: self.can_spend_money_at(Region.saloon, 240), - Forageable.spice_berry: self.can_forage(Season.summer), - Forageable.spring_onion: self.can_forage(Season.spring), - AnimalProduct.squid_ink: self.can_mine_in_the_mines_floor_81_120() | (self.has_building(Building.fish_pond) & self.has(Fish.squid)), - Craftable.staircase: self.has_skill_level(Skill.mining, 2) & self.has(Material.stone), - Material.stone: self.has_tool(Tool.pickaxe), - Meal.strange_bun: self.has_relationship(NPC.shane, 7) & self.has(Ingredient.wheat_flour) & self.has(Fish.periwinkle) & self.has(ArtisanGood.void_mayonnaise), - AnimalProduct.sturgeon_roe: self.has(Fish.sturgeon) & self.has_building(Building.fish_pond), - Ingredient.sugar: self.can_spend_money_at(Region.pierre_store, 100) | ( - self.has_building(Building.mill) & self.has(Vegetable.beet)), - Forageable.sweet_pea: self.can_forage(Season.summer), - Machine.tapper: self.has_skill_level(Skill.foraging, 3) & self.has(Material.wood) & self.has(MetalBar.copper), - Vegetable.tea_leaves: self.has(Sapling.tea) & self.has_lived_months(2) & self.has_any_season_not_winter(), - Sapling.tea: self.has_relationship(NPC.caroline, 2) & self.has(Material.fiber) & self.has(Material.wood), - Trash.trash: self.can_crab_pot(), - Beverage.triple_shot_espresso: self.has("Hot Java Ring"), - ArtisanGood.truffle_oil: self.has(AnimalProduct.truffle) & self.has(Machine.oil_maker), - AnimalProduct.truffle: self.has_animal(Animal.pig) & self.has_any_season_not_winter(), - Ingredient.vinegar: self.can_spend_money_at(Region.pierre_store, 200), - AnimalProduct.void_egg: self.can_spend_money_at(Region.sewer, 5000) | (self.has_building(Building.fish_pond) & self.has(Fish.void_salmon)), - Loot.void_essence: self.can_mine_in_the_mines_floor_81_120() | self.can_mine_in_the_skull_cavern(), - ArtisanGood.void_mayonnaise: (self.can_reach_region(Region.witch_swamp) & self.can_fish()) | (self.has(Machine.mayonnaise_machine) & self.has(AnimalProduct.void_egg)), - Ingredient.wheat_flour: self.can_spend_money_at(Region.pierre_store, 100) | - (self.has_building(Building.mill) & self.has(Vegetable.wheat)), - WaterItem.white_algae: self.can_fish() & self.can_reach_region(Region.mines_floor_20), - Forageable.wild_horseradish: self.can_forage(Season.spring), - Forageable.wild_plum: self.can_forage(Season.fall), - Gift.wilted_bouquet: self.has(Machine.furnace) & self.has(Gift.bouquet) & self.has(Material.coal), - ArtisanGood.wine: self.has_wine(), - Forageable.winter_root: self.can_forage(Season.winter, Region.forest, True), - Material.wood: self.has_tool(Tool.axe), - AnimalProduct.wool: self.has_animal(Animal.rabbit) | self.has_animal(Animal.sheep), - Machine.worm_bin: self.has_skill_level(Skill.fishing, 8) & self.has(Material.hardwood) & self.has(MetalBar.gold) & self.has(MetalBar.iron) & self.has(Material.fiber), - }) - self.item_rules.update(self.fish_rules) - self.item_rules.update(self.museum_rules) - self.item_rules.update(self.sapling_rules) - self.item_rules.update(self.tree_fruit_rules) - self.item_rules.update(self.seed_rules) - self.item_rules.update(self.crop_rules) - - # For some recipes, the cooked item can be obtained directly, so we either cook it or get it - for recipe in self.cooking_rules: - cooking_rule = self.cooking_rules[recipe] - obtention_rule = self.item_rules[recipe] if recipe in self.item_rules else False_() - self.item_rules[recipe] = obtention_rule | cooking_rule - - self.building_rules.update({ - Building.barn: self.can_spend_money_at(Region.carpenter, 6000) & self.has([Material.wood, Material.stone]), - Building.big_barn: self.can_spend_money_at(Region.carpenter, 12000) & self.has([Material.wood, Material.stone]) & self.has_building(Building.barn), - Building.deluxe_barn: self.can_spend_money_at(Region.carpenter, 25000) & self.has([Material.wood, Material.stone]) & self.has_building(Building.big_barn), - Building.coop: self.can_spend_money_at(Region.carpenter, 4000) & self.has([Material.wood, Material.stone]), - Building.big_coop: self.can_spend_money_at(Region.carpenter, 10000) & self.has([Material.wood, Material.stone]) & self.has_building(Building.coop), - Building.deluxe_coop: self.can_spend_money_at(Region.carpenter, 20000) & self.has([Material.wood, Material.stone]) & self.has_building(Building.big_coop), - Building.fish_pond: self.can_spend_money_at(Region.carpenter, 5000) & self.has([Material.stone, WaterItem.seaweed, WaterItem.green_algae]), - Building.mill: self.can_spend_money_at(Region.carpenter, 2500) & self.has([Material.stone, Material.wood, ArtisanGood.cloth]), - Building.shed: self.can_spend_money_at(Region.carpenter, 15000) & self.has(Material.wood), - Building.big_shed: self.can_spend_money_at(Region.carpenter, 20000) & self.has([Material.wood, Material.stone]) & self.has_building(Building.shed), - Building.silo: self.can_spend_money_at(Region.carpenter, 100) & self.has([Material.stone, Material.clay, MetalBar.copper]), - Building.slime_hutch: self.can_spend_money_at(Region.carpenter, 10000) & self.has([Material.stone, MetalBar.quartz, MetalBar.iridium]), - Building.stable: self.can_spend_money_at(Region.carpenter, 10000) & self.has([Material.hardwood, MetalBar.iron]), - Building.well: self.can_spend_money_at(Region.carpenter, 1000) & self.has(Material.stone), - Building.shipping_bin: self.can_spend_money_at(Region.carpenter, 250) & self.has(Material.wood), - Building.kitchen: self.can_spend_money_at(Region.carpenter, 10000) & self.has(Material.wood) & self.has_house(0), - Building.kids_room: self.can_spend_money_at(Region.carpenter, 50000) & self.has(Material.hardwood) & self.has_house(1), - Building.cellar: self.can_spend_money_at(Region.carpenter, 100000) & self.has_house(2), - }) - - self.building_rules.update(get_modded_building_rules(self, self.options.mods)) - - self.quest_rules.update({ - Quest.introductions: self.can_reach_region(Region.town), - Quest.how_to_win_friends: self.can_complete_quest(Quest.introductions), - Quest.getting_started: self.has(Vegetable.parsnip) & self.has_tool(Tool.hoe) & self.can_water(0), - Quest.to_the_beach: self.can_reach_region(Region.beach), - Quest.raising_animals: self.can_complete_quest(Quest.getting_started) & self.has_building(Building.coop), - Quest.advancement: self.can_complete_quest(Quest.getting_started) & self.has(Craftable.scarecrow), - Quest.archaeology: (self.has_tool(Tool.hoe) | self.can_mine_in_the_mines_floor_1_40() | self.can_fish()) & self.can_reach_region(Region.museum), - Quest.meet_the_wizard: self.can_reach_region(Region.town) & self.can_reach_region(Region.community_center) & self.can_reach_region(Region.wizard_tower), - Quest.forging_ahead: self.has(Ore.copper) & self.has(Machine.furnace), - Quest.smelting: self.has(MetalBar.copper), - Quest.initiation: self.can_mine_in_the_mines_floor_1_40(), - Quest.robins_lost_axe: self.has_season(Season.spring) & self.can_reach_region(Region.forest) & self.can_meet(NPC.robin), - Quest.jodis_request: self.has_season(Season.spring) & self.has(Vegetable.cauliflower) & self.can_meet(NPC.jodi), - Quest.mayors_shorts: self.has_season(Season.summer) & self.can_reach_region(Region.ranch) & - (self.has_relationship(NPC.marnie, 2) | (magic.can_blink(self))) & self.can_meet(NPC.lewis), - Quest.blackberry_basket: self.has_season(Season.fall) & self.can_meet(NPC.linus), - Quest.marnies_request: self.has_relationship(NPC.marnie, 3) & self.has(Forageable.cave_carrot) & self.can_reach_region(Region.ranch), - Quest.pam_is_thirsty: self.has_season(Season.summer) & self.has(ArtisanGood.pale_ale) & self.can_meet(NPC.pam), - Quest.a_dark_reagent: self.has_season(Season.winter) & self.has(Loot.void_essence) & self.can_meet(NPC.wizard), - Quest.cows_delight: self.has_season(Season.fall) & self.has(Vegetable.amaranth) & self.can_meet(NPC.marnie), - Quest.the_skull_key: self.received(Wallet.skull_key) & self.can_reach_region(Region.skull_cavern_entrance), - Quest.crop_research: self.has_season(Season.summer) & self.has(Fruit.melon) & self.can_meet(NPC.demetrius), - Quest.knee_therapy: self.has_season(Season.summer) & self.has(Fruit.hot_pepper) & self.can_meet(NPC.george), - Quest.robins_request: self.has_season(Season.winter) & self.has(Material.hardwood) & self.can_meet(NPC.robin), - Quest.qis_challenge: self.can_mine_in_the_skull_cavern(), - Quest.the_mysterious_qi: self.can_reach_region(Region.bus_tunnel) & self.has(ArtisanGood.battery_pack) & self.can_reach_region(Region.desert) & self.has(Forageable.rainbow_shell) & self.has(Vegetable.beet) & self.has(Loot.solar_essence), - Quest.carving_pumpkins: self.has_season(Season.fall) & self.has(Vegetable.pumpkin) & self.can_meet(NPC.caroline), - Quest.a_winter_mystery: self.has_season(Season.winter) & self.can_reach_region(Region.town), - Quest.strange_note: self.has(Forageable.secret_note) & self.can_reach_region(Region.secret_woods) & self.has(ArtisanGood.maple_syrup), - Quest.cryptic_note: self.has(Forageable.secret_note) & self.can_reach_region(Region.skull_cavern_100), - Quest.fresh_fruit: self.has_season(Season.spring) & self.has(Fruit.apricot) & self.can_meet(NPC.emily), - Quest.aquatic_research: self.has_season(Season.summer) & self.has(Fish.pufferfish) & self.can_meet(NPC.demetrius), - Quest.a_soldiers_star: self.has_season(Season.summer) & self.has_year_two() & self.has(Fruit.starfruit) & self.can_meet(NPC.kent), - Quest.mayors_need: self.has_season(Season.summer) & self.has(ArtisanGood.truffle_oil) & self.can_meet(NPC.lewis), - Quest.wanted_lobster: self.has_season(Season.fall) & self.has_season(Season.fall) & self.has(Fish.lobster) & self.can_meet(NPC.gus), - Quest.pam_needs_juice: self.has_season(Season.fall) & self.has(ArtisanGood.battery_pack) & self.can_meet(NPC.pam), - Quest.fish_casserole: self.has_relationship(NPC.jodi, 4) & self.has(Fish.largemouth_bass) & self.can_reach_region(Region.sam_house), - Quest.catch_a_squid: self.has_season(Season.winter) & self.has(Fish.squid) & self.can_meet(NPC.willy), - Quest.fish_stew: self.has_season(Season.winter) & self.has(Fish.albacore) & self.can_meet(NPC.gus), - Quest.pierres_notice: self.has_season(Season.spring) & self.has("Sashimi") & self.can_meet(NPC.pierre), - Quest.clints_attempt: self.has_season(Season.winter) & self.has(Mineral.amethyst) & self.can_meet(NPC.emily), - Quest.a_favor_for_clint: self.has_season(Season.winter) & self.has(MetalBar.iron) & self.can_meet(NPC.clint), - Quest.staff_of_power: self.has_season(Season.winter) & self.has(MetalBar.iridium) & self.can_meet(NPC.wizard), - Quest.grannys_gift: self.has_season(Season.spring) & self.has(Forageable.leek) & self.can_meet(NPC.evelyn), - Quest.exotic_spirits: self.has_season(Season.winter) & self.has(Forageable.coconut) & self.can_meet(NPC.gus), - Quest.catch_a_lingcod: self.has_season(Season.winter) & self.has("Lingcod") & self.can_meet(NPC.willy), - Quest.dark_talisman: self.has_rusty_key() & self.can_reach_region(Region.railroad) & self.can_meet(NPC.krobus) & self.can_reach_region(Region.mutant_bug_lair), - Quest.goblin_problem: self.can_reach_region(Region.witch_swamp) & self.has(ArtisanGood.void_mayonnaise), - Quest.magic_ink: self.can_reach_region(Region.witch_hut) & self.can_meet(NPC.wizard), - Quest.the_pirates_wife: self.can_reach_region(Region.island_west) & self.can_meet(NPC.kent) & - self.can_meet(NPC.gus) & self.can_meet(NPC.sandy) & self.can_meet(NPC.george) & - self.can_meet(NPC.wizard) & self.can_meet(NPC.willy), - }) - - self.quest_rules.update(get_modded_quest_rules(self, self.options.mods)) - - self.festival_rules.update({ - FestivalCheck.egg_hunt: self.has_season(Season.spring) & self.can_reach_region(Region.town) & self.can_win_egg_hunt(), - FestivalCheck.strawberry_seeds: self.has_season(Season.spring) & self.can_reach_region(Region.town) & self.can_spend_money(1000), - FestivalCheck.dance: self.has_season(Season.spring) & self.can_reach_region(Region.forest) & self.has_relationship(Generic.bachelor, 4), - FestivalCheck.rarecrow_5: self.has_season(Season.spring) & self.can_reach_region(Region.forest) & self.can_spend_money(2500), - FestivalCheck.luau_soup: self.has_season(Season.summer) & self.can_reach_region(Region.beach) & self.can_succeed_luau_soup(), - FestivalCheck.moonlight_jellies: self.has_season(Season.summer) & self.can_reach_region(Region.beach), - FestivalCheck.smashing_stone: self.has_season(Season.fall) & self.can_reach_region(Region.town), - FestivalCheck.grange_display: self.has_season(Season.fall) & self.can_reach_region(Region.town) & self.can_succeed_grange_display(), - FestivalCheck.rarecrow_1: self.has_season(Season.fall) & self.can_reach_region(Region.town), # only cost star tokens - FestivalCheck.fair_stardrop: self.has_season(Season.fall) & self.can_reach_region(Region.town), # only cost star tokens - FestivalCheck.spirit_eve_maze: self.has_season(Season.fall) & self.can_reach_region(Region.town), - FestivalCheck.rarecrow_2: self.has_season(Season.fall) & self.can_reach_region(Region.town) & self.can_spend_money(5000), - FestivalCheck.fishing_competition: self.has_season(Season.winter) & self.can_reach_region(Region.forest) & self.can_win_fishing_competition(), - FestivalCheck.rarecrow_4: self.has_season(Season.winter) & self.can_reach_region(Region.forest) & self.can_spend_money(5000), - FestivalCheck.mermaid_pearl: self.has_season(Season.winter) & self.can_reach_region(Region.beach), - FestivalCheck.cone_hat: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(2500), - FestivalCheck.iridium_fireplace: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(15000), - FestivalCheck.rarecrow_7: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(5000) & self.can_donate_museum_artifacts(20), - FestivalCheck.rarecrow_8: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(5000) & self.can_donate_museum_items(40), - FestivalCheck.lupini_red_eagle: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(1200), - FestivalCheck.lupini_portrait_mermaid: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(1200), - FestivalCheck.lupini_solar_kingdom: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.can_spend_money(1200), - FestivalCheck.lupini_clouds: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_two() & self.can_spend_money(1200), - FestivalCheck.lupini_1000_years: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_two() & self.can_spend_money(1200), - FestivalCheck.lupini_three_trees: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_two() & self.can_spend_money(1200), - FestivalCheck.lupini_the_serpent: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_three() & self.can_spend_money(1200), - FestivalCheck.lupini_tropical_fish: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_three() & self.can_spend_money(1200), - FestivalCheck.lupini_land_of_clay: self.has_season(Season.winter) & self.can_reach_region(Region.beach) & self.has_year_three() & self.can_spend_money(1200), - FestivalCheck.secret_santa: self.has_season(Season.winter) & self.can_reach_region(Region.town) & self.has_any_universal_love(), - FestivalCheck.legend_of_the_winter_star: self.has_season(Season.winter) & self.can_reach_region(Region.town), - FestivalCheck.all_rarecrows: self.can_reach_region(Region.farm) & self.has_all_rarecrows(), - }) - - self.special_order_rules.update({ - SpecialOrder.island_ingredients: self.can_meet(NPC.caroline) & self.has_island_transport() & self.can_farm_perfectly() & - self.can_ship(Vegetable.taro_root) & self.can_ship(Fruit.pineapple) & self.can_ship(Forageable.ginger), - SpecialOrder.cave_patrol: self.can_meet(NPC.clint) & self.can_mine_perfectly() & self.can_mine_to_floor(120), - SpecialOrder.aquatic_overpopulation: self.can_meet(NPC.demetrius) & self.can_fish_perfectly(), - SpecialOrder.biome_balance: self.can_meet(NPC.demetrius) & self.can_fish_perfectly(), - SpecialOrder.rock_rejuivenation: self.has_relationship(NPC.emily, 4) & self.has(Mineral.ruby) & self.has(Mineral.topaz) & - self.has(Mineral.emerald) & self.has(Mineral.jade) & self.has(Mineral.amethyst) & - self.has(ArtisanGood.cloth) & self.can_reach_region(Region.haley_house), - SpecialOrder.gifts_for_george: self.can_reach_region(Region.alex_house) & self.has_season(Season.spring) & self.has(Forageable.leek), - SpecialOrder.fragments_of_the_past: self.can_reach_region(Region.museum) & self.can_reach_region(Region.dig_site) & self.has_tool(Tool.pickaxe), - SpecialOrder.gus_famous_omelet: self.can_reach_region(Region.saloon) & self.has(AnimalProduct.any_egg), - SpecialOrder.crop_order: self.can_farm_perfectly() & self.can_ship(), - SpecialOrder.community_cleanup: self.can_reach_region(Region.railroad) & self.can_crab_pot(), - SpecialOrder.the_strong_stuff: self.can_reach_region(Region.trailer) & self.can_keg(Vegetable.potato), - SpecialOrder.pierres_prime_produce: self.can_reach_region(Region.pierre_store) & self.can_farm_perfectly(), - SpecialOrder.robins_project: self.can_meet(NPC.robin) & self.can_reach_region(Region.carpenter) & self.can_chop_perfectly() & - self.has(Material.hardwood), - SpecialOrder.robins_resource_rush: self.can_meet(NPC.robin) & self.can_reach_region(Region.carpenter) & self.can_chop_perfectly() & - self.has(Fertilizer.tree) & self.can_mine_perfectly(), - SpecialOrder.juicy_bugs_wanted_yum: self.can_reach_region(Region.beach) & self.has(Loot.bug_meat), - SpecialOrder.tropical_fish: self.can_meet(NPC.willy) & self.received("Island Resort") & self.has_island_transport() & - self.has(Fish.stingray) & self.has(Fish.blue_discus) & self.has(Fish.lionfish), - SpecialOrder.a_curious_substance: self.can_reach_region(Region.wizard_tower) & self.can_mine_perfectly() & self.can_mine_to_floor(80), - SpecialOrder.prismatic_jelly: self.can_reach_region(Region.wizard_tower) & self.can_mine_perfectly() & self.can_mine_to_floor(40), - SpecialOrder.qis_crop: self.can_farm_perfectly() & self.can_reach_region(Region.greenhouse) & - self.can_reach_region(Region.island_west) & self.has_total_skill_level(50) & - self.has(Machine.seed_maker) & self.has_building(Building.shipping_bin), - SpecialOrder.lets_play_a_game: self.has_junimo_kart_max_level(), - SpecialOrder.four_precious_stones: self.has_lived_months(MAX_MONTHS) & self.has("Prismatic Shard") & - self.can_mine_perfectly_in_the_skull_cavern(), - SpecialOrder.qis_hungry_challenge: self.can_mine_perfectly_in_the_skull_cavern() & self.has_max_buffs(), - SpecialOrder.qis_cuisine: self.can_cook() & (self.can_spend_money_at(Region.saloon, 205000) | self.can_spend_money_at(Region.pierre_store, 170000)) & - self.can_ship(), - SpecialOrder.qis_kindness: self.can_give_loved_gifts_to_everyone(), - SpecialOrder.extended_family: self.can_fish_perfectly() & self.has(Fish.angler) & self.has(Fish.glacierfish) & - self.has(Fish.crimsonfish) & self.has(Fish.mutant_carp) & self.has(Fish.legend), - SpecialOrder.danger_in_the_deep: self.can_mine_perfectly() & self.has_mine_elevator_to_floor(120), - SpecialOrder.skull_cavern_invasion: self.can_mine_perfectly_in_the_skull_cavern() & self.has_max_buffs(), - SpecialOrder.qis_prismatic_grange: self.has(Loot.bug_meat) & # 100 Bug Meat - self.can_spend_money_at(Region.saloon, 24000) & # 100 Spaghetti - self.can_spend_money_at(Region.blacksmith, 15000) & # 100 Copper Ore - self.can_spend_money_at(Region.ranch, 5000) & # 100 Hay - self.can_spend_money_at(Region.saloon, 22000) & # 100 Salads - self.can_spend_money_at(Region.saloon, 7500) & # 100 Joja Cola - self.can_spend_money(80000), # I need this extra rule because money rules aren't additive... - }) - - self.special_order_rules.update(get_modded_special_orders_rules(self, self.options.mods)) - - def has(self, items: Union[str, (Iterable[str], Sized)], count: Optional[int] = None) -> StardewRule: - if isinstance(items, str): - return Has(items, self.item_rules) - - if len(items) == 0: - return True_() - - if count is None or count == len(items): - return And(self.has(item) for item in items) - - if count == 1: - return Or(self.has(item) for item in items) - - return Count(count, (self.has(item) for item in items)) - - def received(self, items: Union[str, Iterable[str]], count: Optional[int] = 1) -> StardewRule: - if count <= 0 or not items: - return True_() - - if isinstance(items, str): - return Received(items, self.player, count) - - if count is None: - return And(self.received(item) for item in items) - - if count == 1: - return Or(self.received(item) for item in items) - - return TotalReceived(count, items, self.player) - - def can_reach_region(self, spot: str) -> StardewRule: - return Reach(spot, "Region", self.player) - - def can_reach_any_region(self, spots: Iterable[str]) -> StardewRule: - return Or(self.can_reach_region(spot) for spot in spots) - - def can_reach_all_regions(self, spots: Iterable[str]) -> StardewRule: - return And(self.can_reach_region(spot) for spot in spots) - - def can_reach_all_regions_except_one(self, spots: Iterable[str]) -> StardewRule: - num_required = len(list(spots)) - 1 - if num_required <= 0: - num_required = len(list(spots)) - return Count(num_required, [self.can_reach_region(spot) for spot in spots]) - - def can_reach_location(self, spot: str) -> StardewRule: - return Reach(spot, "Location", self.player) - - def can_reach_entrance(self, spot: str) -> StardewRule: - return Reach(spot, "Entrance", self.player) - - def can_have_earned_total_money(self, amount: int) -> StardewRule: - return self.has_lived_months(min(8, amount // MONEY_PER_MONTH)) - - def can_spend_money(self, amount: int) -> StardewRule: - if self.options.starting_money == -1: - return True_() - return self.has_lived_months(min(8, amount // (MONEY_PER_MONTH // 5))) - - def can_spend_money_at(self, region: str, amount: int) -> StardewRule: - return self.can_reach_region(region) & self.can_spend_money(amount) - - def has_tool(self, tool: str, material: str = ToolMaterial.basic) -> StardewRule: - if material == ToolMaterial.basic or tool == Tool.scythe: - return True_() - - if self.options.tool_progression == ToolProgression.option_progressive: - return self.received(f"Progressive {tool}", count=tool_materials[material]) - - return self.has(f"{material} Bar") & self.can_spend_money(tool_upgrade_prices[material]) - - def can_earn_skill_level(self, skill: str, level: int) -> StardewRule: - if level <= 0: - return True_() - - tool_level = (level - 1) // 2 - tool_material = ToolMaterial.tiers[tool_level] - months = max(1, level - 1) - months_rule = self.has_lived_months(months) - previous_level_rule = self.has_skill_level(skill, level - 1) - - if skill == Skill.fishing: - xp_rule = self.can_get_fishing_xp() & self.has_tool(Tool.fishing_rod, ToolMaterial.tiers[max(tool_level, 3)]) - elif skill == Skill.farming: - xp_rule = self.can_get_farming_xp() & self.has_tool(Tool.hoe, tool_material) & self.can_water(tool_level) - elif skill == Skill.foraging: - xp_rule = self.can_get_foraging_xp() & \ - (self.has_tool(Tool.axe, tool_material) | magic.can_use_clear_debris_instead_of_tool_level(self, tool_level)) - elif skill == Skill.mining: - xp_rule = self.can_get_mining_xp() & \ - (self.has_tool(Tool.pickaxe, tool_material) | magic.can_use_clear_debris_instead_of_tool_level(self, tool_level)) - elif skill == Skill.combat: - combat_tier = Performance.tiers[tool_level] - xp_rule = self.can_get_combat_xp() & self.can_do_combat_at_level(combat_tier) - else: - xp_rule = skills.can_earn_mod_skill_level(self, skill, level) - - return previous_level_rule & months_rule & xp_rule - - def has_skill_level(self, skill: str, level: int) -> StardewRule: - if level <= 0: - return True_() - - if self.options.skill_progression == SkillProgression.option_progressive: - return self.received(f"{skill} Level", count=level) - - return self.can_earn_skill_level(skill, level) - - def has_farming_level(self, level: int) -> StardewRule: - return self.has_skill_level(Skill.farming, level) - - def has_total_skill_level(self, level: int, allow_modded_skills: bool = False) -> StardewRule: - if level <= 0: - return True_() - - if self.options.skill_progression == SkillProgression.option_progressive: - skills_items = ["Farming Level", "Mining Level", "Foraging Level", - "Fishing Level", "Combat Level"] - if allow_modded_skills: - skills.append_mod_skill_level(skills_items, self.options) - return self.received(skills_items, count=level) - - months_with_4_skills = max(1, (level // 4) - 1) - months_with_5_skills = max(1, (level // 5) - 1) - rule_with_fishing = self.has_lived_months(months_with_5_skills) & self.can_get_fishing_xp() - if level > 40: - return rule_with_fishing - return self.has_lived_months(months_with_4_skills) | rule_with_fishing - - def has_building(self, building: str) -> StardewRule: - carpenter_rule = self.can_reach_region(Region.carpenter) - if not self.options.building_progression == BuildingProgression.option_vanilla: - count = 1 - if building in [Building.coop, Building.barn, Building.shed]: - building = f"Progressive {building}" - elif building.startswith("Big"): - count = 2 - building = " ".join(["Progressive", *building.split(" ")[1:]]) - elif building.startswith("Deluxe"): - count = 3 - building = " ".join(["Progressive", *building.split(" ")[1:]]) - return self.received(f"{building}", count) & carpenter_rule - - return Has(building, self.building_rules) & carpenter_rule - - def has_house(self, upgrade_level: int) -> StardewRule: - if upgrade_level < 1: - return True_() - - if upgrade_level > 3: - return False_() - - if not self.options.building_progression == BuildingProgression.option_vanilla: - return self.received(f"Progressive House", upgrade_level) & self.can_reach_region(Region.carpenter) - - if upgrade_level == 1: - return Has(Building.kitchen, self.building_rules) - - if upgrade_level == 2: - return Has(Building.kids_room, self.building_rules) - - # if upgrade_level == 3: - return Has(Building.cellar, self.building_rules) - - def can_complete_quest(self, quest: str) -> StardewRule: - return Has(quest, self.quest_rules) - - def can_complete_special_order(self, specialorder: str) -> StardewRule: - return Has(specialorder, self.special_order_rules) - - def can_get_farming_xp(self) -> StardewRule: - crop_rules = [] - for crop in all_crops: - crop_rules.append(self.can_grow_crop(crop)) - return Or(crop_rules) - - def can_get_foraging_xp(self) -> StardewRule: - tool_rule = self.has_tool(Tool.axe) - tree_rule = self.can_reach_region(Region.forest) & self.has_any_season_not_winter() - stump_rule = self.can_reach_region(Region.secret_woods) & self.has_tool(Tool.axe, ToolMaterial.copper) - return tool_rule & (tree_rule | stump_rule) - - def can_get_mining_xp(self) -> StardewRule: - tool_rule = self.has_tool(Tool.pickaxe) - stone_rule = self.can_reach_any_region([Region.mines_floor_5, Region.quarry, Region.skull_cavern_25, Region.volcano_floor_5]) - return tool_rule & stone_rule - - def can_get_combat_xp(self) -> StardewRule: - tool_rule = self.has_any_weapon() - enemy_rule = self.can_reach_any_region([Region.mines_floor_5, Region.skull_cavern_25, Region.volcano_floor_5]) - return tool_rule & enemy_rule - - def can_get_fishing_xp(self) -> StardewRule: - if self.options.skill_progression == SkillProgression.option_progressive: - return self.can_fish() | self.can_crab_pot() - - return self.can_fish() - - def can_fish(self, difficulty: int = 0) -> StardewRule: - skill_required = max(0, int((difficulty / 10) - 1)) - if difficulty <= 40: - skill_required = 0 - skill_rule = self.has_skill_level(Skill.fishing, skill_required) - region_rule = self.can_reach_any_region(fishing_regions) - number_fishing_rod_required = 1 if difficulty < 50 else 2 - if self.options.tool_progression == ToolProgression.option_progressive: - return self.received("Progressive Fishing Rod", number_fishing_rod_required) & skill_rule & region_rule - - return skill_rule & region_rule - - def can_fish_in_freshwater(self) -> StardewRule: - return self.can_fish() & self.can_reach_any_region([Region.forest, Region.town, Region.mountain]) - - def has_max_fishing(self) -> StardewRule: - skill_rule = self.has_skill_level(Skill.fishing, 10) - return self.has_max_fishing_rod() & skill_rule - - def can_fish_chests(self) -> StardewRule: - skill_rule = self.has_skill_level(Skill.fishing, 4) - return self.has_max_fishing_rod() & skill_rule - - def can_buy_seed(self, seed: SeedItem) -> StardewRule: - if self.options.cropsanity == Cropsanity.option_disabled: - item_rule = True_() - else: - item_rule = self.received(seed.name) - season_rule = self.has_any_season(seed.seasons) - region_rule = self.can_reach_all_regions(seed.regions) - currency_rule = self.can_spend_money(1000) - if seed.name == Seed.pineapple: - currency_rule = self.has(Forageable.magma_cap) - if seed.name == Seed.taro: - currency_rule = self.has(Fossil.bone_fragment) - return season_rule & region_rule & item_rule & currency_rule - - def can_buy_sapling(self, fruit: str) -> StardewRule: - sapling_prices = {Fruit.apple: 4000, Fruit.apricot: 2000, Fruit.cherry: 3400, Fruit.orange: 4000, - Fruit.peach: 6000, - Fruit.pomegranate: 6000, Fruit.banana: 0, Fruit.mango: 0} - received_sapling = self.received(f"{fruit} Sapling") - if self.options.cropsanity == Cropsanity.option_disabled: - allowed_buy_sapling = True_() - else: - allowed_buy_sapling = received_sapling - can_buy_sapling = self.can_spend_money_at(Region.pierre_store, sapling_prices[fruit]) - if fruit == Fruit.banana: - can_buy_sapling = self.has_island_trader() & self.has(Forageable.dragon_tooth) - elif fruit == Fruit.mango: - can_buy_sapling = self.has_island_trader() & self.has(Fish.mussel_node) - - return allowed_buy_sapling & can_buy_sapling - - def can_grow_crop(self, crop: CropItem) -> StardewRule: - season_rule = self.has_any_season(crop.farm_growth_seasons) - seed_rule = self.has(crop.seed.name) - farm_rule = self.can_reach_region(Region.farm) & season_rule - tool_rule = self.has_tool(Tool.hoe) & self.has_tool(Tool.watering_can) - region_rule = farm_rule | self.can_reach_region(Region.greenhouse) | self.can_reach_region(Region.island_west) - return seed_rule & region_rule & tool_rule - - def can_plant_and_grow_item(self, seasons: Union[str, Iterable[str]]) -> StardewRule: - if isinstance(seasons, str): - seasons = [seasons] - season_rule = self.has_any_season(seasons) | self.can_reach_region(Region.greenhouse) | self.has_island_farm() - farm_rule = self.can_reach_region(Region.farm) | self.can_reach_region( - Region.greenhouse) | self.has_island_farm() - return season_rule & farm_rule - - def has_island_farm(self) -> StardewRule: - return self.can_reach_region(Region.island_south) - - def can_catch_fish(self, fish: FishItem) -> StardewRule: - region_rule = self.can_reach_any_region(fish.locations) - season_rule = self.has_any_season(fish.seasons) - if fish.difficulty == -1: - difficulty_rule = self.can_crab_pot() - else: - difficulty_rule = self.can_fish(fish.difficulty) - return region_rule & season_rule & difficulty_rule - - def can_catch_every_fish(self) -> StardewRule: - rules = [self.has_skill_level(Skill.fishing, 10), self.has_max_fishing_rod()] - for fish in all_fish: - if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true and \ - fish in island_fish: - continue - rules.append(self.can_catch_fish(fish)) - return And(rules) - - def has_max_fishing_rod(self) -> StardewRule: - if self.options.tool_progression == ToolProgression.option_progressive: - return self.received(APTool.fishing_rod, 4) - return self.can_get_fishing_xp() - - def can_cook(self, recipe: CookingRecipe = None) -> StardewRule: - cook_rule = self.has_house(1) | self.has_skill_level(Skill.foraging, 9) - if recipe is None: - return cook_rule - - learn_rule = self.can_learn_recipe(recipe.source) - ingredients_rule = And([self.has(ingredient) for ingredient in recipe.ingredients]) - number_ingredients = sum(recipe.ingredients[ingredient] for ingredient in recipe.ingredients) - time_rule = self.has_lived_months(number_ingredients) - return cook_rule & learn_rule & ingredients_rule & time_rule - - def can_learn_recipe(self, source: RecipeSource) -> StardewRule: - if isinstance(source, StarterSource): - return True_() - if isinstance(source, ShopSource): - return self.can_spend_money_at(source.region, source.price) - if isinstance(source, SkillSource): - return self.has_skill_level(source.skill, source.level) - if isinstance(source, FriendshipSource): - return self.has_relationship(source.friend, source.hearts) - if isinstance(source, QueenOfSauceSource): - year_rule = self.has_year_two() if source.year == 2 else self.has_year_three() - return self.can_watch(Channel.queen_of_sauce) & self.has_season(source.season) & year_rule - - return False_() - - def can_watch(self, channel: str = None): - tv_rule = True_() - if channel is None: - return tv_rule - return self.received(channel) & tv_rule - - def can_smelt(self, item: str) -> StardewRule: - return self.has(Machine.furnace) & self.has(item) - - def can_do_panning(self, item: str = Generic.any) -> StardewRule: - return self.received("Glittering Boulder Removed") - - def can_crab_pot(self, region: str = Generic.any) -> StardewRule: - crab_pot_rule = self.has(Craftable.bait) - if self.options.skill_progression == SkillProgression.option_progressive: - crab_pot_rule = crab_pot_rule & self.has(Machine.crab_pot) - else: - crab_pot_rule = crab_pot_rule & self.can_get_fishing_xp() - - if region != Generic.any: - return crab_pot_rule & self.can_reach_region(region) - - water_region_rules = self.can_reach_any_region(fishing_regions) - return crab_pot_rule & water_region_rules - - # Regions - def can_mine_in_the_mines_floor_1_40(self) -> StardewRule: - return self.can_reach_region(Region.mines_floor_5) - - def can_mine_in_the_mines_floor_41_80(self) -> StardewRule: - return self.can_reach_region(Region.mines_floor_45) - - def can_mine_in_the_mines_floor_81_120(self) -> StardewRule: - return self.can_reach_region(Region.mines_floor_85) - - def can_mine_in_the_skull_cavern(self) -> StardewRule: - return (self.can_progress_in_the_mines_from_floor(120) & - self.can_reach_region(Region.skull_cavern)) - - def can_mine_perfectly(self) -> StardewRule: - return self.can_progress_in_the_mines_from_floor(160) - - def can_mine_perfectly_in_the_skull_cavern(self) -> StardewRule: - return (self.can_mine_perfectly() & - self.can_reach_region(Region.skull_cavern)) - - def can_farm_perfectly(self) -> StardewRule: - tool_rule = self.has_tool(Tool.hoe, ToolMaterial.iridium) & self.can_water(4) - return tool_rule & self.has_farming_level(10) - - def can_fish_perfectly(self) -> StardewRule: - skill_rule = self.has_skill_level(Skill.fishing, 10) - return skill_rule & self.has_max_fishing_rod() - - def can_chop_trees(self) -> StardewRule: - return self.has_tool(Tool.axe) & self.can_reach_region(Region.forest) - - def can_chop_perfectly(self) -> StardewRule: - magic_rule = (magic.can_use_clear_debris_instead_of_tool_level(self, 3)) & self.has_skill_level(ModSkill.magic, 10) - tool_rule = self.has_tool(Tool.axe, ToolMaterial.iridium) - foraging_rule = self.has_skill_level(Skill.foraging, 10) - region_rule = self.can_reach_region(Region.forest) - return region_rule & ((tool_rule & foraging_rule) | magic_rule) - - def has_max_buffs(self) -> StardewRule: - return self.received(Buff.movement, self.options.movement_buff_number.value) & self.received(Buff.luck, self.options.luck_buff_number.value) - - def get_weapon_rule_for_floor_tier(self, tier: int): - if tier >= 4: - return self.can_do_combat_at_level(Performance.galaxy) - if tier >= 3: - return self.can_do_combat_at_level(Performance.great) - if tier >= 2: - return self.can_do_combat_at_level(Performance.good) - if tier >= 1: - return self.can_do_combat_at_level(Performance.decent) - return self.can_do_combat_at_level(Performance.basic) - - def can_progress_in_the_mines_from_floor(self, floor: int) -> StardewRule: - tier = int(floor / 40) - rules = [] - weapon_rule = self.get_weapon_rule_for_floor_tier(tier) - rules.append(weapon_rule) - if self.options.tool_progression == ToolProgression.option_progressive: - rules.append(self.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier])) - if self.options.skill_progression == SkillProgression.option_progressive: - combat_tier = min(10, max(0, tier * 2)) - rules.append(self.has_skill_level(Skill.combat, combat_tier)) - return And(rules) - - def can_progress_easily_in_the_mines_from_floor(self, floor: int) -> StardewRule: - tier = int(floor / 40) + 1 - rules = [] - weapon_rule = self.get_weapon_rule_for_floor_tier(tier) - rules.append(weapon_rule) - if self.options.tool_progression == ToolProgression.option_progressive: - rules.append(self.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier])) - if self.options.skill_progression == SkillProgression.option_progressive: - combat_tier = min(10, max(0, tier * 2)) - rules.append(self.has_skill_level(Skill.combat, combat_tier)) - return And(rules) - - def has_mine_elevator_to_floor(self, floor: int) -> StardewRule: - if self.options.elevator_progression != ElevatorProgression.option_vanilla: - return self.received("Progressive Mine Elevator", count=int(floor / 5)) - return True_() - - def can_mine_to_floor(self, floor: int) -> StardewRule: - previous_elevator = max(floor - 5, 0) - previous_previous_elevator = max(floor - 10, 0) - return ((self.has_mine_elevator_to_floor(previous_elevator) & - self.can_progress_in_the_mines_from_floor(previous_elevator)) | - (self.has_mine_elevator_to_floor(previous_previous_elevator) & - self.can_progress_easily_in_the_mines_from_floor(previous_previous_elevator))) - - def can_progress_in_the_skull_cavern_from_floor(self, floor: int) -> StardewRule: - tier = floor // 50 - rules = [] - weapon_rule = self.has_great_weapon() - rules.append(weapon_rule) - rules.append(self.can_cook()) - if self.options.tool_progression == ToolProgression.option_progressive: - rules.append(self.received("Progressive Pickaxe", min(4, max(0, tier + 2)))) - if self.options.skill_progression == SkillProgression.option_progressive: - skill_tier = min(10, max(0, tier * 2 + 6)) - rules.extend({self.has_skill_level(Skill.combat, skill_tier), - self.has_skill_level(Skill.mining, skill_tier)}) - return And(rules) - - def can_progress_easily_in_the_skull_cavern_from_floor(self, floor: int) -> StardewRule: - return self.can_progress_in_the_skull_cavern_from_floor(floor + 50) - - def can_mine_to_skull_cavern_floor(self, floor: int) -> StardewRule: - previous_elevator = max(floor - 25, 0) - previous_previous_elevator = max(floor - 50, 0) - has_mine_elevator = self.has_mine_elevator_to_floor(5) # Skull Cavern Elevator menu needs a normal elevator... - return ((has_skull_cavern_elevator_to_floor(self, previous_elevator) & - self.can_progress_in_the_skull_cavern_from_floor(previous_elevator)) | - (has_skull_cavern_elevator_to_floor(self, previous_previous_elevator) & - self.can_progress_easily_in_the_skull_cavern_from_floor(previous_previous_elevator))) & has_mine_elevator - - def has_jotpk_power_level(self, power_level: int) -> StardewRule: - if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling: - return True_() - jotpk_buffs = ["JotPK: Progressive Boots", "JotPK: Progressive Gun", - "JotPK: Progressive Ammo", "JotPK: Extra Life", "JotPK: Increased Drop Rate"] - return self.received(jotpk_buffs, power_level) - - def has_junimo_kart_power_level(self, power_level: int) -> StardewRule: - if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling: - return True_() - return self.received("Junimo Kart: Extra Life", power_level) - - def has_junimo_kart_max_level(self) -> StardewRule: - play_rule = self.can_reach_region(Region.junimo_kart_3) - if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling: - return play_rule - return self.has_junimo_kart_power_level(8) - - def has_traveling_merchant(self, tier: int = 1): - traveling_merchant_days = [f"Traveling Merchant: {day}" for day in Weekday.all_days] - return self.received(traveling_merchant_days, tier) - - def can_get_married(self) -> StardewRule: - return self.has_relationship(Generic.bachelor, 10) & self.has(Gift.mermaid_pendant) - - def has_children(self, number_children: int) -> StardewRule: - if number_children <= 0: - return True_() - possible_kids = ["Cute Baby", "Ugly Baby"] - return self.received(possible_kids, number_children) & self.has_house(2) - - def can_reproduce(self, number_children: int = 1) -> StardewRule: - if number_children <= 0: - return True_() - return self.can_get_married() & self.has_house(2) & self.has_relationship(Generic.bachelor, 12) & self.has_children(number_children - 1) - - def has_relationship(self, npc: str, hearts: int = 1) -> StardewRule: - if hearts <= 0: - return True_() - friendsanity = self.options.friendsanity - if friendsanity == Friendsanity.option_none: - return self.can_earn_relationship(npc, hearts) - if npc not in all_villagers_by_name: - if npc == NPC.pet: - if friendsanity == Friendsanity.option_bachelors: - return self.can_befriend_pet(hearts) - return self.received_hearts(NPC.pet, hearts) - if npc == Generic.any or npc == Generic.bachelor: - possible_friends = [] - for name in all_villagers_by_name: - if not self.npc_is_in_current_slot(name): - continue - if npc == Generic.any or all_villagers_by_name[name].bachelor: - possible_friends.append(self.has_relationship(name, hearts)) - return Or(possible_friends) - if npc == Generic.all: - mandatory_friends = [] - for name in all_villagers_by_name: - if not self.npc_is_in_current_slot(name): - continue - mandatory_friends.append(self.has_relationship(name, hearts)) - return And(mandatory_friends) - if npc.isnumeric(): - possible_friends = [] - for name in all_villagers_by_name: - if not self.npc_is_in_current_slot(name): - continue - possible_friends.append(self.has_relationship(name, hearts)) - return Count(int(npc), possible_friends) - return self.can_earn_relationship(npc, hearts) - - if not self.npc_is_in_current_slot(npc): - return True_() - villager = all_villagers_by_name[npc] - if friendsanity == Friendsanity.option_bachelors and not villager.bachelor: - return self.can_earn_relationship(npc, hearts) - if friendsanity == Friendsanity.option_starting_npcs and not villager.available: - return self.can_earn_relationship(npc, hearts) - is_capped_at_8 = villager.bachelor and friendsanity != Friendsanity.option_all_with_marriage - if is_capped_at_8 and hearts > 8: - return self.received_hearts(villager, 8) & self.can_earn_relationship(npc, hearts) - return self.received_hearts(villager, hearts) - - def received_hearts(self, npc: Union[str, Villager], hearts: int) -> StardewRule: - if isinstance(npc, Villager): - return self.received_hearts(npc.name, hearts) - heart_size = self.options.friendsanity_heart_size.value - return self.received(self.heart(npc), math.ceil(hearts / heart_size)) - - def can_meet(self, npc: str) -> StardewRule: - if npc not in all_villagers_by_name or not self.npc_is_in_current_slot(npc): - return True_() - villager = all_villagers_by_name[npc] - rules = [self.can_reach_any_region(villager.locations)] - if npc == NPC.kent: - rules.append(self.has_year_two()) - elif npc == NPC.leo: - rules.append(self.received("Island West Turtle")) - - return And(rules) - - def can_give_loved_gifts_to_everyone(self) -> StardewRule: - rules = [] - for npc in all_villagers_by_name: - if not self.npc_is_in_current_slot(npc): - continue - villager = all_villagers_by_name[npc] - gift_rule = self.has_any_universal_love() - meet_rule = self.can_meet(npc) - rules.append(meet_rule & gift_rule) - loved_gifts_rules = And(rules) - simplified_rules = loved_gifts_rules.simplify() - return simplified_rules - - def can_earn_relationship(self, npc: str, hearts: int = 0) -> StardewRule: - if hearts <= 0: - return True_() - - heart_size = self.options.friendsanity_heart_size.value - previous_heart = hearts - heart_size - previous_heart_rule = self.has_relationship(npc, previous_heart) - - if npc == NPC.pet: - earn_rule = self.can_befriend_pet(hearts) - elif npc == NPC.wizard and ModNames.magic in self.options.mods: - earn_rule = self.can_meet(npc) & self.has_lived_months(hearts) - elif npc in all_villagers_by_name: - if not self.npc_is_in_current_slot(npc): - return previous_heart_rule - villager = all_villagers_by_name[npc] - rule_if_birthday = self.has_season(villager.birthday) & self.has_any_universal_love() & self.has_lived_months(hearts // 2) - rule_if_not_birthday = self.has_lived_months(hearts) - earn_rule = self.can_meet(npc) & (rule_if_birthday | rule_if_not_birthday) - if villager.bachelor: - if hearts > 8: - earn_rule = earn_rule & self.can_date(npc) - if hearts > 10: - earn_rule = earn_rule & self.can_marry(npc) - else: - earn_rule = self.has_lived_months(min(hearts // 2, 8)) - - return previous_heart_rule & earn_rule - - def can_date(self, npc: str) -> StardewRule: - return self.has_relationship(npc, 8) & self.has(Gift.bouquet) - - def can_marry(self, npc: str) -> StardewRule: - return self.has_relationship(npc, 10) & self.has(Gift.mermaid_pendant) - - def can_befriend_pet(self, hearts: int): - if hearts <= 0: - return True_() - points = hearts * 200 - points_per_month = 12 * 14 - points_per_water_month = 18 * 14 - return self.can_reach_region(Region.farm) & \ - ((self.can_water(0) & self.has_lived_months(points // points_per_water_month)) | - self.has_lived_months(points // points_per_month)) - - def can_complete_bundle(self, bundle_requirements: List[BundleItem], number_required: int) -> StardewRule: - item_rules = [] - highest_quality_yet = 0 - can_speak_junimo = self.can_reach_region(Region.wizard_tower) - for bundle_item in bundle_requirements: - if bundle_item.item.item_id == -1: - return can_speak_junimo & self.can_spend_money(bundle_item.amount) - else: - item_rules.append(bundle_item.item.name) - if bundle_item.quality > highest_quality_yet: - highest_quality_yet = bundle_item.quality - return can_speak_junimo & self.has(item_rules, number_required) & self.can_grow_gold_quality(highest_quality_yet) - - def can_grow_gold_quality(self, quality: int) -> StardewRule: - if quality <= 0: - return True_() - if quality == 1: - return self.has_farming_level(5) | (self.has_fertilizer(1) & self.has_farming_level(2)) | ( - self.has_fertilizer(2) & self.has_farming_level(1)) | self.has_fertilizer(3) - if quality == 2: - return self.has_farming_level(10) | (self.has_fertilizer(1) & self.has_farming_level(5)) | ( - self.has_fertilizer(2) & self.has_farming_level(3)) | ( - self.has_fertilizer(3) & self.has_farming_level(2)) - if quality >= 3: - return self.has_fertilizer(3) & self.has_farming_level(4) - - def has_fertilizer(self, tier: int) -> StardewRule: - if tier <= 0: - return True_() - if tier == 1: - return self.has(Fertilizer.basic) - if tier == 2: - return self.has(Fertilizer.quality) - if tier >= 3: - return self.has(Fertilizer.deluxe) - - def can_complete_field_office(self) -> StardewRule: - field_office = self.can_reach_region(Region.field_office) - professor_snail = self.received("Open Professor Snail Cave") - dig_site = self.can_reach_region(Region.dig_site) - tools = self.has_tool(Tool.pickaxe) & self.has_tool(Tool.hoe) & self.has_tool(Tool.scythe) - leg_and_snake_skull = dig_site - ribs_and_spine = self.can_reach_region(Region.island_south) - skull = self.can_open_geode(Geode.golden_coconut) - tail = self.can_do_panning() & dig_site - frog = self.can_reach_region(Region.island_east) - bat = self.can_reach_region(Region.volcano_floor_5) - snake_vertebrae = self.can_reach_region(Region.island_west) - return field_office & professor_snail & tools & leg_and_snake_skull & ribs_and_spine & skull & tail & frog & bat & snake_vertebrae - - def can_complete_community_center(self) -> StardewRule: - return (self.can_reach_location("Complete Crafts Room") & - self.can_reach_location("Complete Pantry") & - self.can_reach_location("Complete Fish Tank") & - self.can_reach_location("Complete Bulletin Board") & - self.can_reach_location("Complete Vault") & - self.can_reach_location("Complete Boiler Room")) - - def can_finish_grandpa_evaluation(self) -> StardewRule: - # https://stardewvalleywiki.com/Grandpa - rules_worth_a_point = [self.can_have_earned_total_money(50000), # 50 000g - self.can_have_earned_total_money(100000), # 100 000g - self.can_have_earned_total_money(200000), # 200 000g - self.can_have_earned_total_money(300000), # 300 000g - self.can_have_earned_total_money(500000), # 500 000g - self.can_have_earned_total_money(1000000), # 1 000 000g first point - self.can_have_earned_total_money(1000000), # 1 000 000g second point - self.has_total_skill_level(30), # Total Skills: 30 - self.has_total_skill_level(50), # Total Skills: 50 - self.can_complete_museum(), # Completing the museum for a point - # Catching every fish not expected - # Shipping every item not expected - self.can_get_married() & self.has_house(2), - self.has_relationship("5", 8), # 5 Friends - self.has_relationship("10", 8), # 10 friends - self.has_relationship(NPC.pet, 5), # Max Pet - self.can_complete_community_center(), # Community Center Completion - self.can_complete_community_center(), # CC Ceremony first point - self.can_complete_community_center(), # CC Ceremony second point - self.received(Wallet.skull_key), # Skull Key obtained - self.has_rusty_key(), # Rusty key obtained - ] - return Count(12, rules_worth_a_point) - - def has_island_transport(self) -> StardewRule: - return self.received(Transportation.island_obelisk) | self.received(Transportation.boat_repair) - - def has_any_weapon(self) -> StardewRule: - return self.has_decent_weapon() | self.received(item.name for item in all_items if Group.WEAPON in item.groups) - - def has_decent_weapon(self) -> StardewRule: - return (self.has_good_weapon() | - self.received(item.name for item in all_items - if Group.WEAPON in item.groups and - (Group.MINES_FLOOR_50 in item.groups or Group.MINES_FLOOR_60 in item.groups))) - - def has_good_weapon(self) -> StardewRule: - return ((self.has_great_weapon() | - self.received(item.name for item in all_items - if Group.WEAPON in item.groups and - (Group.MINES_FLOOR_80 in item.groups or Group.MINES_FLOOR_90 in item.groups))) & - self.received("Adventurer's Guild")) - - def has_great_weapon(self) -> StardewRule: - return ((self.has_galaxy_weapon() | - self.received(item.name for item in all_items - if Group.WEAPON in item.groups and Group.MINES_FLOOR_110 in item.groups)) & - self.received("Adventurer's Guild")) - - def has_galaxy_weapon(self) -> StardewRule: - return (self.received(item.name for item in all_items - if Group.WEAPON in item.groups and Group.GALAXY_WEAPONS in item.groups) & - self.received("Adventurer's Guild")) - - def has_year_two(self) -> StardewRule: - return self.has_lived_months(4) - - def has_year_three(self) -> StardewRule: - return self.has_lived_months(8) - - def can_speak_dwarf(self) -> StardewRule: - return self.received("Dwarvish Translation Guide") - - def can_donate_museum_item(self, item: MuseumItem) -> StardewRule: - return self.can_reach_region(Region.museum) & self.can_find_museum_item(item) - - def can_donate_museum_items(self, number: int) -> StardewRule: - return self.can_reach_region(Region.museum) & self.can_find_museum_items(number) - - def can_donate_museum_artifacts(self, number: int) -> StardewRule: - return self.can_reach_region(Region.museum) & self.can_find_museum_artifacts(number) - - def can_donate_museum_minerals(self, number: int) -> StardewRule: - return self.can_reach_region(Region.museum) & self.can_find_museum_minerals(number) - - def can_find_museum_item(self, item: MuseumItem) -> StardewRule: - region_rule = self.can_reach_all_regions_except_one(item.locations) - geodes_rule = And([self.can_open_geode(geode) for geode in item.geodes]) - # monster_rule = self.can_farm_monster(item.monsters) - # extra_rule = True_() - pan_rule = False_() - if item.name == "Earth Crystal" or item.name == "Fire Quartz" or item.name == "Frozen Tear": - pan_rule = self.can_do_panning() - return pan_rule | (region_rule & geodes_rule) # & monster_rule & extra_rule - - def can_find_museum_artifacts(self, number: int) -> StardewRule: - rules = [] - for artifact in all_museum_artifacts: - rules.append(self.can_find_museum_item(artifact)) - - return Count(number, rules) - - def can_find_museum_minerals(self, number: int) -> StardewRule: - rules = [] - for mineral in all_museum_minerals: - rules.append(self.can_find_museum_item(mineral)) - - return Count(number, rules) - - def can_find_museum_items(self, number: int) -> StardewRule: - rules = [] - for donation in all_museum_items: - rules.append(self.can_find_museum_item(donation)) - - return Count(number, rules) - - def can_complete_museum(self) -> StardewRule: - rules = [self.can_reach_region(Region.museum), self.can_mine_perfectly()] - - if self.options.museumsanity != Museumsanity.option_none: - rules.append(self.received("Traveling Merchant Metal Detector", 4)) - - for donation in all_museum_items: - rules.append(self.can_find_museum_item(donation)) - return And(rules) - - def has_season(self, season: str) -> StardewRule: - if season == Generic.any: - return True_() - seasons_order = [Season.spring, Season.summer, Season.fall, Season.winter] - if self.options.season_randomization == SeasonRandomization.option_progressive: - return self.received(Season.progressive, seasons_order.index(season)) - if self.options.season_randomization == SeasonRandomization.option_disabled: - if season == Season.spring: - return True_() - return self.has_lived_months(1) - return self.received(season) - - def has_any_season(self, seasons: Iterable[str]): - if not seasons: - return True_() - return Or([self.has_season(season) for season in seasons]) - - def has_any_season_not_winter(self): - return self.has_any_season([Season.spring, Season.summer, Season.fall]) - - def has_all_seasons(self, seasons: Iterable[str]): - if not seasons: - return True_() - return And([self.has_season(season) for season in seasons]) - - def has_lived_months(self, number: int) -> StardewRule: - number = max(0, min(number, MAX_MONTHS)) - return self.received("Month End", number) - - def has_rusty_key(self) -> StardewRule: - return self.received(Wallet.rusty_key) - - def can_win_egg_hunt(self) -> StardewRule: - number_of_movement_buffs = self.options.movement_buff_number.value - if self.options.festival_locations == FestivalLocations.option_hard or number_of_movement_buffs < 2: - return True_() - return self.received(Buff.movement, number_of_movement_buffs // 2) - - def can_succeed_luau_soup(self) -> StardewRule: - if self.options.festival_locations != FestivalLocations.option_hard: - return True_() - eligible_fish = [Fish.blobfish, Fish.crimsonfish, "Ice Pip", Fish.lava_eel, Fish.legend, Fish.angler, Fish.catfish, Fish.glacierfish, - Fish.mutant_carp, Fish.spookfish, Fish.stingray, Fish.sturgeon, "Super Cucumber"] - fish_rule = [self.has(fish) for fish in eligible_fish] - eligible_kegables = [Fruit.ancient_fruit, Fruit.apple, Fruit.banana, Forageable.coconut, Forageable.crystal_fruit, Fruit.mango, - Fruit.melon, Fruit.orange, Fruit.peach, Fruit.pineapple, Fruit.pomegranate, Fruit.rhubarb, - Fruit.starfruit, Fruit.strawberry, Forageable.cactus_fruit, - Fruit.cherry, Fruit.cranberries, Fruit.grape, Forageable.spice_berry, Forageable.wild_plum, Vegetable.hops, Vegetable.wheat] - keg_rules = [self.can_keg(kegable) for kegable in eligible_kegables] - aged_rule = [self.can_age(rule, "Iridium") for rule in keg_rules] - # There are a few other valid items but I don't feel like coding them all - return Or(fish_rule) | Or(aged_rule) - - def can_succeed_grange_display(self) -> StardewRule: - if self.options.festival_locations != FestivalLocations.option_hard: - return True_() - animal_rule = self.has_animal(Generic.any) - artisan_rule = self.can_keg(Generic.any) | self.can_preserves_jar(Generic.any) - cooking_rule = True_() # Salads at the bar are good enough - fish_rule = self.can_fish(50) - forage_rule = True_() # Hazelnut always available since the grange display is in fall - mineral_rule = self.can_open_geode(Generic.any) # More than half the minerals are good enough - good_fruits = [Fruit.apple, Fruit.banana, Forageable.coconut, Forageable.crystal_fruit, Fruit.mango, Fruit.orange, Fruit.peach, - Fruit.pomegranate, - Fruit.strawberry, Fruit.melon, Fruit.rhubarb, Fruit.pineapple, Fruit.ancient_fruit, Fruit.starfruit, ] - fruit_rule = Or([self.has(fruit) for fruit in good_fruits]) - good_vegetables = [Vegetable.amaranth, Vegetable.artichoke, Vegetable.beet, Vegetable.cauliflower, Forageable.fiddlehead_fern, Vegetable.kale, - Vegetable.radish, Vegetable.taro_root, Vegetable.yam, Vegetable.red_cabbage, Vegetable.pumpkin] - vegetable_rule = Or([self.has(vegetable) for vegetable in good_vegetables]) - - return animal_rule & artisan_rule & cooking_rule & fish_rule & \ - forage_rule & fruit_rule & mineral_rule & vegetable_rule - - def can_win_fishing_competition(self) -> StardewRule: - return self.can_fish(60) - - def has_any_universal_love(self) -> StardewRule: - return self.has(Gift.golden_pumpkin) | self.has("Magic Rock Candy") | self.has(Gift.pearl) | self.has( - "Prismatic Shard") | self.has(AnimalProduct.rabbit_foot) - - def has_jelly(self) -> StardewRule: - return self.can_preserves_jar(Fruit.any) - - def has_pickle(self) -> StardewRule: - return self.can_preserves_jar(Vegetable.any) - - def can_preserves_jar(self, item: str) -> StardewRule: - machine_rule = self.has(Machine.preserves_jar) - if item == Generic.any: - return machine_rule - if item == Fruit.any: - return machine_rule & self.has(all_fruits, 1) - if item == Vegetable.any: - return machine_rule & self.has(all_vegetables, 1) - return machine_rule & self.has(item) - - def has_wine(self) -> StardewRule: - return self.can_keg(Fruit.any) - - def has_juice(self) -> StardewRule: - return self.can_keg(Vegetable.any) - - def can_keg(self, item: str) -> StardewRule: - machine_rule = self.has(Machine.keg) - if item == Generic.any: - return machine_rule - if item == Fruit.any: - return machine_rule & self.has(all_fruits, 1) - if item == Vegetable.any: - return machine_rule & self.has(all_vegetables, 1) - return machine_rule & self.has(item) - - def can_age(self, item: Union[str, StardewRule], quality: str) -> StardewRule: - months = 1 - if quality == "Gold": - months = 2 - elif quality == "Iridium": - months = 3 - if isinstance(item, str): - rule = self.has(item) - else: - rule: StardewRule = item - return self.has(Machine.cask) & self.has_lived_months(months) & rule - - def can_buy_animal(self, animal: str) -> StardewRule: - price = 0 - building = "" - if animal == Animal.chicken: - price = 800 - building = Building.coop - elif animal == Animal.cow: - price = 1500 - building = Building.barn - elif animal == Animal.goat: - price = 4000 - building = Building.big_barn - elif animal == Animal.duck: - price = 1200 - building = Building.big_coop - elif animal == Animal.sheep: - price = 8000 - building = Building.deluxe_barn - elif animal == Animal.rabbit: - price = 8000 - building = Building.deluxe_coop - elif animal == Animal.pig: - price = 16000 - building = Building.deluxe_barn - else: - return True_() - return self.can_spend_money_at(Region.ranch, price) & self.has_building(building) - - def has_animal(self, animal: str) -> StardewRule: - if animal == Generic.any: - return self.has_any_animal() - elif animal == Building.coop: - return self.has_any_coop_animal() - elif animal == Building.barn: - return self.has_any_barn_animal() - return self.has(animal) - - def has_happy_animal(self, animal: str) -> StardewRule: - return self.has_animal(animal) & self.has(Forageable.hay) - - def has_any_animal(self) -> StardewRule: - return self.has_any_coop_animal() | self.has_any_barn_animal() - - def has_any_coop_animal(self) -> StardewRule: - coop_rule = Or([self.has_animal(coop_animal) for coop_animal in coop_animals]) - return coop_rule - - def has_any_barn_animal(self) -> StardewRule: - barn_rule = Or([self.has_animal(barn_animal) for barn_animal in barn_animals]) - return barn_rule - - def can_open_geode(self, geode: str) -> StardewRule: - blacksmith_access = self.can_reach_region("Clint's Blacksmith") - geodes = [Geode.geode, Geode.frozen, Geode.magma, Geode.omni] - if geode == Generic.any: - return blacksmith_access & Or([self.has(geode_type) for geode_type in geodes]) - return blacksmith_access & self.has(geode) - - def has_island_trader(self) -> StardewRule: - if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: - return False_() - return self.can_reach_region(Region.island_trader) - - def has_walnut(self, number: int) -> StardewRule: - if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: - return False_() - if number <= 0: - return True_() - # https://stardewcommunitywiki.com/Golden_Walnut#Walnut_Locations - reach_south = self.can_reach_region(Region.island_south) - reach_north = self.can_reach_region(Region.island_north) - reach_west = self.can_reach_region(Region.island_west) - reach_hut = self.can_reach_region(Region.leo_hut) - reach_southeast = self.can_reach_region(Region.island_south_east) - reach_field_office = self.can_reach_region(Region.field_office) - reach_pirate_cove = self.can_reach_region(Region.pirate_cove) - reach_outside_areas = And(reach_south, reach_north, reach_west, reach_hut) - reach_volcano_regions = [self.can_reach_region(Region.volcano), - self.can_reach_region(Region.volcano_secret_beach), - self.can_reach_region(Region.volcano_floor_5), - self.can_reach_region(Region.volcano_floor_10)] - reach_volcano = Or(reach_volcano_regions) - reach_all_volcano = And(reach_volcano_regions) - reach_walnut_regions = [reach_south, reach_north, reach_west, reach_volcano, reach_field_office] - reach_caves = And(self.can_reach_region(Region.qi_walnut_room), self.can_reach_region(Region.dig_site), - self.can_reach_region(Region.gourmand_frog_cave), - self.can_reach_region(Region.colored_crystals_cave), - self.can_reach_region(Region.shipwreck), self.has(Weapon.any_slingshot)) - reach_entire_island = And(reach_outside_areas, reach_field_office, reach_all_volcano, - reach_caves, reach_southeast, reach_pirate_cove) - if number <= 5: - return Or(reach_south, reach_north, reach_west, reach_volcano) - if number <= 10: - return Count(2, reach_walnut_regions) - if number <= 15: - return Count(3, reach_walnut_regions) - if number <= 20: - return And(reach_walnut_regions) - if number <= 50: - return reach_entire_island - gems = [Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz] - return reach_entire_island & self.has(Fruit.banana) & self.has(gems) & self.can_mine_perfectly() & \ - self.can_fish_perfectly() & self.has(Craftable.flute_block) & self.has(Seed.melon) & self.has(Seed.wheat) & self.has(Seed.garlic) & \ - self.can_complete_field_office() - - def has_everything(self, all_progression_items: Set[str]) -> StardewRule: - all_regions = [region.name for region in vanilla_regions] - rules = self.received(all_progression_items, len(all_progression_items)) & \ - self.can_reach_all_regions(all_regions) - return rules - - def heart(self, npc: Union[str, Villager]) -> str: - if isinstance(npc, str): - return f"{npc} <3" - return self.heart(npc.name) - - def can_forage(self, season: str, region: str = Region.forest, need_hoe: bool = False) -> StardewRule: - season_rule = self.has_season(season) - region_rule = self.can_reach_region(region) - if need_hoe: - return season_rule & region_rule & self.has_tool(Tool.hoe) - return season_rule & region_rule - - def npc_is_in_current_slot(self, name: str) -> bool: - npc = all_villagers_by_name[name] - mod = npc.mod_name - return mod is None or mod in self.options.mods - - def can_do_combat_at_level(self, level: str) -> StardewRule: - if level == Performance.basic: - return self.has_any_weapon() | magic.has_any_spell(self) - if level == Performance.decent: - return self.has_decent_weapon() | magic.has_decent_spells(self) - if level == Performance.good: - return self.has_good_weapon() | magic.has_good_spells(self) - if level == Performance.great: - return self.has_great_weapon() | magic.has_great_spells(self) - if level == Performance.galaxy: - return self.has_galaxy_weapon() | magic.has_amazing_spells(self) - - def can_water(self, level: int) -> StardewRule: - tool_rule = self.has_tool(Tool.watering_can, ToolMaterial.tiers[level]) - spell_rule = (self.received(MagicSpell.water) & magic.can_use_altar(self) & self.has_skill_level(ModSkill.magic, level)) - return tool_rule | spell_rule - - def has_prismatic_jelly_reward_access(self) -> StardewRule: - if self.options.special_order_locations == SpecialOrderLocations.option_disabled: - return self.can_complete_special_order("Prismatic Jelly") - return self.received("Monster Musk Recipe") - - def has_all_rarecrows(self) -> StardewRule: - rules = [] - for rarecrow_number in range(1, 9): - rules.append(self.received(f"Rarecrow #{rarecrow_number}")) - return And(rules) - - def can_ship(self, item: str = "") -> StardewRule: - shipping_bin_rule = self.has_building(Building.shipping_bin) - if item == "": - return shipping_bin_rule - return shipping_bin_rule & self.has(item) - diff --git a/worlds/stardew_valley/logic/__init__.py b/worlds/stardew_valley/logic/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/worlds/stardew_valley/logic/ability_logic.py b/worlds/stardew_valley/logic/ability_logic.py new file mode 100644 index 000000000000..ae12ffee4742 --- /dev/null +++ b/worlds/stardew_valley/logic/ability_logic.py @@ -0,0 +1,46 @@ +from typing import Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .mine_logic import MineLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .skill_logic import SkillLogicMixin +from .tool_logic import ToolLogicMixin +from ..mods.logic.magic_logic import MagicLogicMixin +from ..stardew_rule import StardewRule +from ..strings.region_names import Region +from ..strings.skill_names import Skill, ModSkill +from ..strings.tool_names import ToolMaterial, Tool + + +class AbilityLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.ability = AbilityLogic(*args, **kwargs) + + +class AbilityLogic(BaseLogic[Union[AbilityLogicMixin, RegionLogicMixin, ReceivedLogicMixin, ToolLogicMixin, SkillLogicMixin, MineLogicMixin, MagicLogicMixin]]): + def can_mine_perfectly(self) -> StardewRule: + return self.logic.mine.can_progress_in_the_mines_from_floor(160) + + def can_mine_perfectly_in_the_skull_cavern(self) -> StardewRule: + return (self.logic.ability.can_mine_perfectly() & + self.logic.region.can_reach(Region.skull_cavern)) + + def can_farm_perfectly(self) -> StardewRule: + tool_rule = self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iridium) & self.logic.tool.can_water(4) + return tool_rule & self.logic.skill.has_farming_level(10) + + def can_fish_perfectly(self) -> StardewRule: + skill_rule = self.logic.skill.has_level(Skill.fishing, 10) + return skill_rule & self.logic.tool.has_fishing_rod(4) + + def can_chop_trees(self) -> StardewRule: + return self.logic.tool.has_tool(Tool.axe) & self.logic.region.can_reach(Region.forest) + + def can_chop_perfectly(self) -> StardewRule: + magic_rule = (self.logic.magic.can_use_clear_debris_instead_of_tool_level(3)) & self.logic.mod.skill.has_mod_level(ModSkill.magic, 10) + tool_rule = self.logic.tool.has_tool(Tool.axe, ToolMaterial.iridium) + foraging_rule = self.logic.skill.has_level(Skill.foraging, 10) + region_rule = self.logic.region.can_reach(Region.forest) + return region_rule & ((tool_rule & foraging_rule) | magic_rule) diff --git a/worlds/stardew_valley/logic/action_logic.py b/worlds/stardew_valley/logic/action_logic.py new file mode 100644 index 000000000000..820ae4ead429 --- /dev/null +++ b/worlds/stardew_valley/logic/action_logic.py @@ -0,0 +1,40 @@ +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from ..stardew_rule import StardewRule, True_, Or +from ..strings.generic_names import Generic +from ..strings.geode_names import Geode +from ..strings.region_names import Region + + +class ActionLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.action = ActionLogic(*args, **kwargs) + + +class ActionLogic(BaseLogic[Union[ActionLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin]]): + + def can_watch(self, channel: str = None): + tv_rule = True_() + if channel is None: + return tv_rule + return self.logic.received(channel) & tv_rule + + def can_pan(self) -> StardewRule: + return self.logic.received("Glittering Boulder Removed") & self.logic.region.can_reach(Region.mountain) + + def can_pan_at(self, region: str) -> StardewRule: + return self.logic.region.can_reach(region) & self.logic.action.can_pan() + + @cache_self1 + def can_open_geode(self, geode: str) -> StardewRule: + blacksmith_access = self.logic.region.can_reach(Region.blacksmith) + geodes = [Geode.geode, Geode.frozen, Geode.magma, Geode.omni] + if geode == Generic.any: + return blacksmith_access & Or(*(self.logic.has(geode_type) for geode_type in geodes)) + return blacksmith_access & self.logic.has(geode) diff --git a/worlds/stardew_valley/logic/animal_logic.py b/worlds/stardew_valley/logic/animal_logic.py new file mode 100644 index 000000000000..eb1ebeeec54b --- /dev/null +++ b/worlds/stardew_valley/logic/animal_logic.py @@ -0,0 +1,59 @@ +from typing import Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .building_logic import BuildingLogicMixin +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from ..stardew_rule import StardewRule, true_ +from ..strings.animal_names import Animal, coop_animals, barn_animals +from ..strings.building_names import Building +from ..strings.forageable_names import Forageable +from ..strings.generic_names import Generic +from ..strings.region_names import Region + +cost_and_building_by_animal = { + Animal.chicken: (800, Building.coop), + Animal.cow: (1500, Building.barn), + Animal.goat: (4000, Building.big_barn), + Animal.duck: (1200, Building.big_coop), + Animal.sheep: (8000, Building.deluxe_barn), + Animal.rabbit: (8000, Building.deluxe_coop), + Animal.pig: (16000, Building.deluxe_barn) +} + + +class AnimalLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.animal = AnimalLogic(*args, **kwargs) + + +class AnimalLogic(BaseLogic[Union[HasLogicMixin, MoneyLogicMixin, BuildingLogicMixin]]): + + def can_buy_animal(self, animal: str) -> StardewRule: + try: + price, building = cost_and_building_by_animal[animal] + except KeyError: + return true_ + return self.logic.money.can_spend_at(Region.ranch, price) & self.logic.building.has_building(building) + + def has_animal(self, animal: str) -> StardewRule: + if animal == Generic.any: + return self.has_any_animal() + elif animal == Building.coop: + return self.has_any_coop_animal() + elif animal == Building.barn: + return self.has_any_barn_animal() + return self.logic.has(animal) + + def has_happy_animal(self, animal: str) -> StardewRule: + return self.has_animal(animal) & self.logic.has(Forageable.hay) + + def has_any_animal(self) -> StardewRule: + return self.has_any_coop_animal() | self.has_any_barn_animal() + + def has_any_coop_animal(self) -> StardewRule: + return self.logic.has_any(*coop_animals) + + def has_any_barn_animal(self) -> StardewRule: + return self.logic.has_any(*barn_animals) diff --git a/worlds/stardew_valley/logic/arcade_logic.py b/worlds/stardew_valley/logic/arcade_logic.py new file mode 100644 index 000000000000..5e6a02a18435 --- /dev/null +++ b/worlds/stardew_valley/logic/arcade_logic.py @@ -0,0 +1,34 @@ +from typing import Union + +from .base_logic import BaseLogic, BaseLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .. import options +from ..stardew_rule import StardewRule, True_ +from ..strings.region_names import Region + + +class ArcadeLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.arcade = ArcadeLogic(*args, **kwargs) + + +class ArcadeLogic(BaseLogic[Union[ArcadeLogicMixin, RegionLogicMixin, ReceivedLogicMixin]]): + + def has_jotpk_power_level(self, power_level: int) -> StardewRule: + if self.options.arcade_machine_locations != options.ArcadeMachineLocations.option_full_shuffling: + return True_() + jotpk_buffs = ("JotPK: Progressive Boots", "JotPK: Progressive Gun", "JotPK: Progressive Ammo", "JotPK: Extra Life", "JotPK: Increased Drop Rate") + return self.logic.received_n(*jotpk_buffs, count=power_level) + + def has_junimo_kart_power_level(self, power_level: int) -> StardewRule: + if self.options.arcade_machine_locations != options.ArcadeMachineLocations.option_full_shuffling: + return True_() + return self.logic.received("Junimo Kart: Extra Life", power_level) + + def has_junimo_kart_max_level(self) -> StardewRule: + play_rule = self.logic.region.can_reach(Region.junimo_kart_3) + if self.options.arcade_machine_locations != options.ArcadeMachineLocations.option_full_shuffling: + return play_rule + return self.logic.arcade.has_junimo_kart_power_level(8) diff --git a/worlds/stardew_valley/logic/artisan_logic.py b/worlds/stardew_valley/logic/artisan_logic.py new file mode 100644 index 000000000000..cdc2186d807a --- /dev/null +++ b/worlds/stardew_valley/logic/artisan_logic.py @@ -0,0 +1,53 @@ +from typing import Union + +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from .time_logic import TimeLogicMixin +from ..stardew_rule import StardewRule +from ..strings.crop_names import all_vegetables, all_fruits, Vegetable, Fruit +from ..strings.generic_names import Generic +from ..strings.machine_names import Machine + + +class ArtisanLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.artisan = ArtisanLogic(*args, **kwargs) + + +class ArtisanLogic(BaseLogic[Union[ArtisanLogicMixin, TimeLogicMixin, HasLogicMixin]]): + + def has_jelly(self) -> StardewRule: + return self.logic.artisan.can_preserves_jar(Fruit.any) + + def has_pickle(self) -> StardewRule: + return self.logic.artisan.can_preserves_jar(Vegetable.any) + + def can_preserves_jar(self, item: str) -> StardewRule: + machine_rule = self.logic.has(Machine.preserves_jar) + if item == Generic.any: + return machine_rule + if item == Fruit.any: + return machine_rule & self.logic.has_any(*all_fruits) + if item == Vegetable.any: + return machine_rule & self.logic.has_any(*all_vegetables) + return machine_rule & self.logic.has(item) + + def has_wine(self) -> StardewRule: + return self.logic.artisan.can_keg(Fruit.any) + + def has_juice(self) -> StardewRule: + return self.logic.artisan.can_keg(Vegetable.any) + + def can_keg(self, item: str) -> StardewRule: + machine_rule = self.logic.has(Machine.keg) + if item == Generic.any: + return machine_rule + if item == Fruit.any: + return machine_rule & self.logic.has_any(*all_fruits) + if item == Vegetable.any: + return machine_rule & self.logic.has_any(*all_vegetables) + return machine_rule & self.logic.has(item) + + def can_mayonnaise(self, item: str) -> StardewRule: + return self.logic.has(Machine.mayonnaise_machine) & self.logic.has(item) diff --git a/worlds/stardew_valley/logic/base_logic.py b/worlds/stardew_valley/logic/base_logic.py new file mode 100644 index 000000000000..9cfd089ea4f6 --- /dev/null +++ b/worlds/stardew_valley/logic/base_logic.py @@ -0,0 +1,50 @@ +from __future__ import annotations + +from typing import TypeVar, Generic, Dict, Collection + +from ..options import StardewValleyOptions +from ..stardew_rule import StardewRule + + +class LogicRegistry: + + def __init__(self): + self.item_rules: Dict[str, StardewRule] = {} + self.sapling_rules: Dict[str, StardewRule] = {} + self.tree_fruit_rules: Dict[str, StardewRule] = {} + self.seed_rules: Dict[str, StardewRule] = {} + self.cooking_rules: Dict[str, StardewRule] = {} + self.crafting_rules: Dict[str, StardewRule] = {} + self.crop_rules: Dict[str, StardewRule] = {} + self.fish_rules: Dict[str, StardewRule] = {} + self.museum_rules: Dict[str, StardewRule] = {} + self.festival_rules: Dict[str, StardewRule] = {} + self.quest_rules: Dict[str, StardewRule] = {} + self.building_rules: Dict[str, StardewRule] = {} + self.special_order_rules: Dict[str, StardewRule] = {} + + self.sve_location_rules: Dict[str, StardewRule] = {} + + +class BaseLogicMixin: + def __init__(self, *args, **kwargs): + pass + + +T = TypeVar("T", bound=BaseLogicMixin) + + +class BaseLogic(BaseLogicMixin, Generic[T]): + player: int + registry: LogicRegistry + options: StardewValleyOptions + regions: Collection[str] + logic: T + + def __init__(self, player: int, registry: LogicRegistry, options: StardewValleyOptions, regions: Collection[str], logic: T): + super().__init__(player, registry, options, regions, logic) + self.player = player + self.registry = registry + self.options = options + self.regions = regions + self.logic = logic diff --git a/worlds/stardew_valley/logic/buff_logic.py b/worlds/stardew_valley/logic/buff_logic.py new file mode 100644 index 000000000000..fee9c9fc4d25 --- /dev/null +++ b/worlds/stardew_valley/logic/buff_logic.py @@ -0,0 +1,23 @@ +from typing import Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .received_logic import ReceivedLogicMixin +from ..stardew_rule import StardewRule +from ..strings.ap_names.buff_names import Buff + + +class BuffLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.buff = BuffLogic(*args, **kwargs) + + +class BuffLogic(BaseLogic[Union[ReceivedLogicMixin]]): + def has_max_buffs(self) -> StardewRule: + return self.has_max_speed() & self.has_max_luck() + + def has_max_speed(self) -> StardewRule: + return self.logic.received(Buff.movement, self.options.movement_buff_number.value) + + def has_max_luck(self) -> StardewRule: + return self.logic.received(Buff.luck, self.options.luck_buff_number.value) diff --git a/worlds/stardew_valley/logic/building_logic.py b/worlds/stardew_valley/logic/building_logic.py new file mode 100644 index 000000000000..7be3d19ec33b --- /dev/null +++ b/worlds/stardew_valley/logic/building_logic.py @@ -0,0 +1,95 @@ +from typing import Dict, Union + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from ..options import BuildingProgression +from ..stardew_rule import StardewRule, True_, False_, Has +from ..strings.ap_names.event_names import Event +from ..strings.artisan_good_names import ArtisanGood +from ..strings.building_names import Building +from ..strings.fish_names import WaterItem +from ..strings.material_names import Material +from ..strings.metal_names import MetalBar + + +class BuildingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.building = BuildingLogic(*args, **kwargs) + + +class BuildingLogic(BaseLogic[Union[BuildingLogicMixin, MoneyLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin]]): + def initialize_rules(self): + self.registry.building_rules.update({ + # @formatter:off + Building.barn: self.logic.money.can_spend(6000) & self.logic.has_all(Material.wood, Material.stone), + Building.big_barn: self.logic.money.can_spend(12000) & self.logic.has_all(Material.wood, Material.stone) & self.logic.building.has_building(Building.barn), + Building.deluxe_barn: self.logic.money.can_spend(25000) & self.logic.has_all(Material.wood, Material.stone) & self.logic.building.has_building(Building.big_barn), + Building.coop: self.logic.money.can_spend(4000) & self.logic.has_all(Material.wood, Material.stone), + Building.big_coop: self.logic.money.can_spend(10000) & self.logic.has_all(Material.wood, Material.stone) & self.logic.building.has_building(Building.coop), + Building.deluxe_coop: self.logic.money.can_spend(20000) & self.logic.has_all(Material.wood, Material.stone) & self.logic.building.has_building(Building.big_coop), + Building.fish_pond: self.logic.money.can_spend(5000) & self.logic.has_all(Material.stone, WaterItem.seaweed, WaterItem.green_algae), + Building.mill: self.logic.money.can_spend(2500) & self.logic.has_all(Material.stone, Material.wood, ArtisanGood.cloth), + Building.shed: self.logic.money.can_spend(15000) & self.logic.has(Material.wood), + Building.big_shed: self.logic.money.can_spend(20000) & self.logic.has_all(Material.wood, Material.stone) & self.logic.building.has_building(Building.shed), + Building.silo: self.logic.money.can_spend(100) & self.logic.has_all(Material.stone, Material.clay, MetalBar.copper), + Building.slime_hutch: self.logic.money.can_spend(10000) & self.logic.has_all(Material.stone, MetalBar.quartz, MetalBar.iridium), + Building.stable: self.logic.money.can_spend(10000) & self.logic.has_all(Material.hardwood, MetalBar.iron), + Building.well: self.logic.money.can_spend(1000) & self.logic.has(Material.stone), + Building.shipping_bin: self.logic.money.can_spend(250) & self.logic.has(Material.wood), + Building.kitchen: self.logic.money.can_spend(10000) & self.logic.has(Material.wood) & self.logic.building.has_house(0), + Building.kids_room: self.logic.money.can_spend(50000) & self.logic.has(Material.hardwood) & self.logic.building.has_house(1), + Building.cellar: self.logic.money.can_spend(100000) & self.logic.building.has_house(2), + # @formatter:on + }) + + def update_rules(self, new_rules: Dict[str, StardewRule]): + self.registry.building_rules.update(new_rules) + + @cache_self1 + def has_building(self, building: str) -> StardewRule: + # Shipping bin is special. The mod auto-builds it when received, no need to go to Robin. + if building is Building.shipping_bin: + if not self.options.building_progression & BuildingProgression.option_progressive: + return True_() + return self.logic.received(building) + + carpenter_rule = self.logic.received(Event.can_construct_buildings) + if not self.options.building_progression & BuildingProgression.option_progressive: + return Has(building, self.registry.building_rules) & carpenter_rule + + count = 1 + if building in [Building.coop, Building.barn, Building.shed]: + building = f"Progressive {building}" + elif building.startswith("Big"): + count = 2 + building = " ".join(["Progressive", *building.split(" ")[1:]]) + elif building.startswith("Deluxe"): + count = 3 + building = " ".join(["Progressive", *building.split(" ")[1:]]) + return self.logic.received(building, count) & carpenter_rule + + @cache_self1 + def has_house(self, upgrade_level: int) -> StardewRule: + if upgrade_level < 1: + return True_() + + if upgrade_level > 3: + return False_() + + carpenter_rule = self.logic.received(Event.can_construct_buildings) + if self.options.building_progression & BuildingProgression.option_progressive: + return carpenter_rule & self.logic.received(f"Progressive House", upgrade_level) + + if upgrade_level == 1: + return carpenter_rule & Has(Building.kitchen, self.registry.building_rules) + + if upgrade_level == 2: + return carpenter_rule & Has(Building.kids_room, self.registry.building_rules) + + # if upgrade_level == 3: + return carpenter_rule & Has(Building.cellar, self.registry.building_rules) diff --git a/worlds/stardew_valley/logic/bundle_logic.py b/worlds/stardew_valley/logic/bundle_logic.py new file mode 100644 index 000000000000..1ae07cf2ed82 --- /dev/null +++ b/worlds/stardew_valley/logic/bundle_logic.py @@ -0,0 +1,66 @@ +from functools import cached_property +from typing import Union, List + +from .base_logic import BaseLogicMixin, BaseLogic +from .farming_logic import FarmingLogicMixin +from .fishing_logic import FishingLogicMixin +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .region_logic import RegionLogicMixin +from .skill_logic import SkillLogicMixin +from ..bundles.bundle import Bundle +from ..stardew_rule import StardewRule, And, True_ +from ..strings.currency_names import Currency +from ..strings.machine_names import Machine +from ..strings.quality_names import CropQuality, ForageQuality, FishQuality, ArtisanQuality +from ..strings.region_names import Region + + +class BundleLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.bundle = BundleLogic(*args, **kwargs) + + +class BundleLogic(BaseLogic[Union[HasLogicMixin, RegionLogicMixin, MoneyLogicMixin, FarmingLogicMixin, FishingLogicMixin, SkillLogicMixin]]): + # Should be cached + def can_complete_bundle(self, bundle: Bundle) -> StardewRule: + item_rules = [] + qualities = [] + can_speak_junimo = self.logic.region.can_reach(Region.wizard_tower) + for bundle_item in bundle.items: + if Currency.is_currency(bundle_item.item_name): + return can_speak_junimo & self.logic.money.can_trade(bundle_item.item_name, bundle_item.amount) + + item_rules.append(bundle_item.item_name) + qualities.append(bundle_item.quality) + quality_rules = self.get_quality_rules(qualities) + item_rules = self.logic.has_n(*item_rules, count=bundle.number_required) + return can_speak_junimo & item_rules & quality_rules + + def get_quality_rules(self, qualities: List[str]) -> StardewRule: + crop_quality = CropQuality.get_highest(qualities) + fish_quality = FishQuality.get_highest(qualities) + forage_quality = ForageQuality.get_highest(qualities) + artisan_quality = ArtisanQuality.get_highest(qualities) + quality_rules = [] + if crop_quality != CropQuality.basic: + quality_rules.append(self.logic.farming.can_grow_crop_quality(crop_quality)) + if fish_quality != FishQuality.basic: + quality_rules.append(self.logic.fishing.can_catch_quality_fish(fish_quality)) + if forage_quality != ForageQuality.basic: + quality_rules.append(self.logic.skill.can_forage_quality(forage_quality)) + if artisan_quality != ArtisanQuality.basic: + quality_rules.append(self.logic.has(Machine.cask)) + if not quality_rules: + return True_() + return And(*quality_rules) + + @cached_property + def can_complete_community_center(self) -> StardewRule: + return (self.logic.region.can_reach_location("Complete Crafts Room") & + self.logic.region.can_reach_location("Complete Pantry") & + self.logic.region.can_reach_location("Complete Fish Tank") & + self.logic.region.can_reach_location("Complete Bulletin Board") & + self.logic.region.can_reach_location("Complete Vault") & + self.logic.region.can_reach_location("Complete Boiler Room")) diff --git a/worlds/stardew_valley/logic/combat_logic.py b/worlds/stardew_valley/logic/combat_logic.py new file mode 100644 index 000000000000..ba825192a99e --- /dev/null +++ b/worlds/stardew_valley/logic/combat_logic.py @@ -0,0 +1,57 @@ +from functools import cached_property +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from ..mods.logic.magic_logic import MagicLogicMixin +from ..stardew_rule import StardewRule, Or, False_ +from ..strings.ap_names.ap_weapon_names import APWeapon +from ..strings.performance_names import Performance + +valid_weapons = (APWeapon.weapon, APWeapon.sword, APWeapon.club, APWeapon.dagger) + + +class CombatLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.combat = CombatLogic(*args, **kwargs) + + +class CombatLogic(BaseLogic[Union[CombatLogicMixin, RegionLogicMixin, ReceivedLogicMixin, MagicLogicMixin]]): + @cache_self1 + def can_fight_at_level(self, level: str) -> StardewRule: + if level == Performance.basic: + return self.logic.combat.has_any_weapon | self.logic.magic.has_any_spell() + if level == Performance.decent: + return self.logic.combat.has_decent_weapon | self.logic.magic.has_decent_spells() + if level == Performance.good: + return self.logic.combat.has_good_weapon | self.logic.magic.has_good_spells() + if level == Performance.great: + return self.logic.combat.has_great_weapon | self.logic.magic.has_great_spells() + if level == Performance.galaxy: + return self.logic.combat.has_galaxy_weapon | self.logic.magic.has_amazing_spells() + if level == Performance.maximum: + return self.logic.combat.has_galaxy_weapon | self.logic.magic.has_amazing_spells() # Someday we will have the ascended weapons in AP + return False_() + + @cached_property + def has_any_weapon(self) -> StardewRule: + return self.logic.received_any(*valid_weapons) + + @cached_property + def has_decent_weapon(self) -> StardewRule: + return Or(*(self.logic.received(weapon, 2) for weapon in valid_weapons)) + + @cached_property + def has_good_weapon(self) -> StardewRule: + return Or(*(self.logic.received(weapon, 3) for weapon in valid_weapons)) + + @cached_property + def has_great_weapon(self) -> StardewRule: + return Or(*(self.logic.received(weapon, 4) for weapon in valid_weapons)) + + @cached_property + def has_galaxy_weapon(self) -> StardewRule: + return Or(*(self.logic.received(weapon, 5) for weapon in valid_weapons)) diff --git a/worlds/stardew_valley/logic/cooking_logic.py b/worlds/stardew_valley/logic/cooking_logic.py new file mode 100644 index 000000000000..51cc74d0517a --- /dev/null +++ b/worlds/stardew_valley/logic/cooking_logic.py @@ -0,0 +1,108 @@ +from functools import cached_property +from typing import Union + +from Utils import cache_self1 +from .action_logic import ActionLogicMixin +from .base_logic import BaseLogicMixin, BaseLogic +from .building_logic import BuildingLogicMixin +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .relationship_logic import RelationshipLogicMixin +from .season_logic import SeasonLogicMixin +from .skill_logic import SkillLogicMixin +from ..data.recipe_data import RecipeSource, StarterSource, ShopSource, SkillSource, FriendshipSource, \ + QueenOfSauceSource, CookingRecipe, ShopFriendshipSource, \ + all_cooking_recipes_by_name +from ..data.recipe_source import CutsceneSource, ShopTradeSource +from ..locations import locations_by_tag, LocationTags +from ..options import Chefsanity +from ..options import ExcludeGingerIsland +from ..stardew_rule import StardewRule, True_, False_, And +from ..strings.region_names import Region +from ..strings.skill_names import Skill +from ..strings.tv_channel_names import Channel + + +class CookingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.cooking = CookingLogic(*args, **kwargs) + + +class CookingLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, MoneyLogicMixin, ActionLogicMixin, +BuildingLogicMixin, RelationshipLogicMixin, SkillLogicMixin, CookingLogicMixin]]): + @cached_property + def can_cook_in_kitchen(self) -> StardewRule: + return self.logic.building.has_house(1) | self.logic.skill.has_level(Skill.foraging, 9) + + # Should be cached + def can_cook(self, recipe: CookingRecipe = None) -> StardewRule: + cook_rule = self.logic.region.can_reach(Region.kitchen) + if recipe is None: + return cook_rule + + recipe_rule = self.logic.cooking.knows_recipe(recipe.source, recipe.meal) + ingredients_rule = self.logic.has_all(*sorted(recipe.ingredients)) + return cook_rule & recipe_rule & ingredients_rule + + # Should be cached + def knows_recipe(self, source: RecipeSource, meal_name: str) -> StardewRule: + if self.options.chefsanity == Chefsanity.option_none: + return self.logic.cooking.can_learn_recipe(source) + if isinstance(source, StarterSource): + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, ShopTradeSource) and self.options.chefsanity & Chefsanity.option_purchases: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, ShopSource) and self.options.chefsanity & Chefsanity.option_purchases: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, SkillSource) and self.options.chefsanity & Chefsanity.option_skills: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, CutsceneSource) and self.options.chefsanity & Chefsanity.option_friendship: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, FriendshipSource) and self.options.chefsanity & Chefsanity.option_friendship: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, QueenOfSauceSource) and self.options.chefsanity & Chefsanity.option_queen_of_sauce: + return self.logic.cooking.received_recipe(meal_name) + if isinstance(source, ShopFriendshipSource) and self.options.chefsanity & Chefsanity.option_friendship: + return self.logic.cooking.received_recipe(meal_name) + return self.logic.cooking.can_learn_recipe(source) + + @cache_self1 + def can_learn_recipe(self, source: RecipeSource) -> StardewRule: + if isinstance(source, StarterSource): + return True_() + if isinstance(source, ShopTradeSource): + return self.logic.money.can_trade_at(source.region, source.currency, source.price) + if isinstance(source, ShopSource): + return self.logic.money.can_spend_at(source.region, source.price) + if isinstance(source, SkillSource): + return self.logic.skill.has_level(source.skill, source.level) + if isinstance(source, CutsceneSource): + return self.logic.region.can_reach(source.region) & self.logic.relationship.has_hearts(source.friend, source.hearts) + if isinstance(source, FriendshipSource): + return self.logic.relationship.has_hearts(source.friend, source.hearts) + if isinstance(source, QueenOfSauceSource): + return self.logic.action.can_watch(Channel.queen_of_sauce) & self.logic.season.has(source.season) + if isinstance(source, ShopFriendshipSource): + return self.logic.money.can_spend_at(source.region, source.price) & self.logic.relationship.has_hearts(source.friend, source.hearts) + return False_() + + @cache_self1 + def received_recipe(self, meal_name: str): + return self.logic.received(f"{meal_name} Recipe") + + @cached_property + def can_cook_everything(self) -> StardewRule: + cooksanity_prefix = "Cook " + all_recipes_names = [] + exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true + for location in locations_by_tag[LocationTags.COOKSANITY]: + if exclude_island and LocationTags.GINGER_ISLAND in location.tags: + continue + if location.mod_name and location.mod_name not in self.options.mods: + continue + all_recipes_names.append(location.name[len(cooksanity_prefix):]) + all_recipes = [all_cooking_recipes_by_name[recipe_name] for recipe_name in all_recipes_names] + return And(*(self.logic.cooking.can_cook(recipe) for recipe in all_recipes)) diff --git a/worlds/stardew_valley/logic/crafting_logic.py b/worlds/stardew_valley/logic/crafting_logic.py new file mode 100644 index 000000000000..8c267b7d1090 --- /dev/null +++ b/worlds/stardew_valley/logic/crafting_logic.py @@ -0,0 +1,111 @@ +from functools import cached_property +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .quest_logic import QuestLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .relationship_logic import RelationshipLogicMixin +from .skill_logic import SkillLogicMixin +from .special_order_logic import SpecialOrderLogicMixin +from .. import options +from ..data.craftable_data import CraftingRecipe, all_crafting_recipes_by_name +from ..data.recipe_data import StarterSource, ShopSource, SkillSource, FriendshipSource +from ..data.recipe_source import CutsceneSource, ShopTradeSource, ArchipelagoSource, LogicSource, SpecialOrderSource, \ + FestivalShopSource, QuestSource +from ..locations import locations_by_tag, LocationTags +from ..options import Craftsanity, SpecialOrderLocations, ExcludeGingerIsland +from ..stardew_rule import StardewRule, True_, False_, And +from ..strings.region_names import Region + + +class CraftingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.crafting = CraftingLogic(*args, **kwargs) + + +class CraftingLogic(BaseLogic[Union[ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, MoneyLogicMixin, RelationshipLogicMixin, +SkillLogicMixin, SpecialOrderLogicMixin, CraftingLogicMixin, QuestLogicMixin]]): + @cache_self1 + def can_craft(self, recipe: CraftingRecipe = None) -> StardewRule: + if recipe is None: + return True_() + + learn_rule = self.logic.crafting.knows_recipe(recipe) + ingredients_rule = self.logic.has_all(*recipe.ingredients) + return learn_rule & ingredients_rule + + @cache_self1 + def knows_recipe(self, recipe: CraftingRecipe) -> StardewRule: + if isinstance(recipe.source, ArchipelagoSource): + return self.logic.received_all(*recipe.source.ap_item) + if isinstance(recipe.source, FestivalShopSource): + if self.options.festival_locations == options.FestivalLocations.option_disabled: + return self.logic.crafting.can_learn_recipe(recipe) + else: + return self.logic.crafting.received_recipe(recipe.item) + if isinstance(recipe.source, QuestSource): + if self.options.quest_locations < 0: + return self.logic.crafting.can_learn_recipe(recipe) + else: + return self.logic.crafting.received_recipe(recipe.item) + if self.options.craftsanity == Craftsanity.option_none: + return self.logic.crafting.can_learn_recipe(recipe) + if isinstance(recipe.source, StarterSource) or isinstance(recipe.source, ShopTradeSource) or isinstance( + recipe.source, ShopSource): + return self.logic.crafting.received_recipe(recipe.item) + if isinstance(recipe.source, SpecialOrderSource) and self.options.special_order_locations != SpecialOrderLocations.option_disabled: + return self.logic.crafting.received_recipe(recipe.item) + return self.logic.crafting.can_learn_recipe(recipe) + + @cache_self1 + def can_learn_recipe(self, recipe: CraftingRecipe) -> StardewRule: + if isinstance(recipe.source, StarterSource): + return True_() + if isinstance(recipe.source, ArchipelagoSource): + return self.logic.received_all(*recipe.source.ap_item) + if isinstance(recipe.source, ShopTradeSource): + return self.logic.money.can_trade_at(recipe.source.region, recipe.source.currency, recipe.source.price) + if isinstance(recipe.source, ShopSource): + return self.logic.money.can_spend_at(recipe.source.region, recipe.source.price) + if isinstance(recipe.source, SkillSource): + return self.logic.skill.has_level(recipe.source.skill, recipe.source.level) + if isinstance(recipe.source, CutsceneSource): + return self.logic.region.can_reach(recipe.source.region) & self.logic.relationship.has_hearts(recipe.source.friend, recipe.source.hearts) + if isinstance(recipe.source, FriendshipSource): + return self.logic.relationship.has_hearts(recipe.source.friend, recipe.source.hearts) + if isinstance(recipe.source, QuestSource): + return self.logic.quest.can_complete_quest(recipe.source.quest) + if isinstance(recipe.source, SpecialOrderSource): + if self.options.special_order_locations == SpecialOrderLocations.option_disabled: + return self.logic.special_order.can_complete_special_order(recipe.source.special_order) + return self.logic.crafting.received_recipe(recipe.item) + if isinstance(recipe.source, LogicSource): + if recipe.source.logic_rule == "Cellar": + return self.logic.region.can_reach(Region.cellar) + + return False_() + + @cache_self1 + def received_recipe(self, item_name: str): + return self.logic.received(f"{item_name} Recipe") + + @cached_property + def can_craft_everything(self) -> StardewRule: + craftsanity_prefix = "Craft " + all_recipes_names = [] + exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true + for location in locations_by_tag[LocationTags.CRAFTSANITY]: + if not location.name.startswith(craftsanity_prefix): + continue + if exclude_island and LocationTags.GINGER_ISLAND in location.tags: + continue + if location.mod_name and location.mod_name not in self.options.mods: + continue + all_recipes_names.append(location.name[len(craftsanity_prefix):]) + all_recipes = [all_crafting_recipes_by_name[recipe_name] for recipe_name in all_recipes_names] + return And(*(self.logic.crafting.can_craft(recipe) for recipe in all_recipes)) diff --git a/worlds/stardew_valley/logic/crop_logic.py b/worlds/stardew_valley/logic/crop_logic.py new file mode 100644 index 000000000000..8c107ba6a5df --- /dev/null +++ b/worlds/stardew_valley/logic/crop_logic.py @@ -0,0 +1,72 @@ +from typing import Union, Iterable + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .season_logic import SeasonLogicMixin +from .tool_logic import ToolLogicMixin +from .traveling_merchant_logic import TravelingMerchantLogicMixin +from ..data import CropItem, SeedItem +from ..options import Cropsanity, ExcludeGingerIsland +from ..stardew_rule import StardewRule, True_, False_ +from ..strings.craftable_names import Craftable +from ..strings.forageable_names import Forageable +from ..strings.machine_names import Machine +from ..strings.metal_names import Fossil +from ..strings.region_names import Region +from ..strings.seed_names import Seed +from ..strings.tool_names import Tool + + +class CropLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.crop = CropLogic(*args, **kwargs) + + +class CropLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, TravelingMerchantLogicMixin, SeasonLogicMixin, MoneyLogicMixin, + ToolLogicMixin, CropLogicMixin]]): + @cache_self1 + def can_grow(self, crop: CropItem) -> StardewRule: + season_rule = self.logic.season.has_any(crop.farm_growth_seasons) + seed_rule = self.logic.has(crop.seed.name) + farm_rule = self.logic.region.can_reach(Region.farm) & season_rule + tool_rule = self.logic.tool.has_tool(Tool.hoe) & self.logic.tool.has_tool(Tool.watering_can) + region_rule = farm_rule | self.logic.region.can_reach(Region.greenhouse) | self.logic.crop.has_island_farm() + if crop.name == Forageable.cactus_fruit: + region_rule = self.logic.region.can_reach(Region.greenhouse) | self.logic.has(Craftable.garden_pot) + return seed_rule & region_rule & tool_rule + + def can_plant_and_grow_item(self, seasons: Union[str, Iterable[str]]) -> StardewRule: + if isinstance(seasons, str): + seasons = [seasons] + season_rule = self.logic.season.has_any(seasons) | self.logic.region.can_reach(Region.greenhouse) | self.logic.crop.has_island_farm() + farm_rule = self.logic.region.can_reach(Region.farm) | self.logic.region.can_reach(Region.greenhouse) | self.logic.crop.has_island_farm() + return season_rule & farm_rule + + def has_island_farm(self) -> StardewRule: + if self.options.exclude_ginger_island == ExcludeGingerIsland.option_false: + return self.logic.region.can_reach(Region.island_west) + return False_() + + @cache_self1 + def can_buy_seed(self, seed: SeedItem) -> StardewRule: + if seed.requires_island and self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return False_() + if self.options.cropsanity == Cropsanity.option_disabled or seed.name == Seed.qi_bean: + item_rule = True_() + else: + item_rule = self.logic.received(seed.name) + if seed.name == Seed.coffee: + item_rule = item_rule & self.logic.traveling_merchant.has_days(3) + season_rule = self.logic.season.has_any(seed.seasons) + region_rule = self.logic.region.can_reach_all(seed.regions) + currency_rule = self.logic.money.can_spend(1000) + if seed.name == Seed.pineapple: + currency_rule = self.logic.has(Forageable.magma_cap) + if seed.name == Seed.taro: + currency_rule = self.logic.has(Fossil.bone_fragment) + return season_rule & region_rule & item_rule & currency_rule diff --git a/worlds/stardew_valley/logic/farming_logic.py b/worlds/stardew_valley/logic/farming_logic.py new file mode 100644 index 000000000000..b255aa27f785 --- /dev/null +++ b/worlds/stardew_valley/logic/farming_logic.py @@ -0,0 +1,41 @@ +from typing import Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .has_logic import HasLogicMixin +from .skill_logic import SkillLogicMixin +from ..stardew_rule import StardewRule, True_, False_ +from ..strings.fertilizer_names import Fertilizer +from ..strings.quality_names import CropQuality + + +class FarmingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.farming = FarmingLogic(*args, **kwargs) + + +class FarmingLogic(BaseLogic[Union[HasLogicMixin, SkillLogicMixin, FarmingLogicMixin]]): + def has_fertilizer(self, tier: int) -> StardewRule: + if tier <= 0: + return True_() + if tier == 1: + return self.logic.has(Fertilizer.basic) + if tier == 2: + return self.logic.has(Fertilizer.quality) + if tier >= 3: + return self.logic.has(Fertilizer.deluxe) + + def can_grow_crop_quality(self, quality: str) -> StardewRule: + if quality == CropQuality.basic: + return True_() + if quality == CropQuality.silver: + return self.logic.skill.has_farming_level(5) | (self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(2)) | ( + self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(1)) | self.logic.farming.has_fertilizer(3) + if quality == CropQuality.gold: + return self.logic.skill.has_farming_level(10) | ( + self.logic.farming.has_fertilizer(1) & self.logic.skill.has_farming_level(5)) | ( + self.logic.farming.has_fertilizer(2) & self.logic.skill.has_farming_level(3)) | ( + self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(2)) + if quality == CropQuality.iridium: + return self.logic.farming.has_fertilizer(3) & self.logic.skill.has_farming_level(4) + return False_() diff --git a/worlds/stardew_valley/logic/fishing_logic.py b/worlds/stardew_valley/logic/fishing_logic.py new file mode 100644 index 000000000000..65b3cdc2ac88 --- /dev/null +++ b/worlds/stardew_valley/logic/fishing_logic.py @@ -0,0 +1,100 @@ +from typing import Union, List + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .season_logic import SeasonLogicMixin +from .skill_logic import SkillLogicMixin +from .tool_logic import ToolLogicMixin +from ..data import FishItem, fish_data +from ..locations import LocationTags, locations_by_tag +from ..options import ExcludeGingerIsland, Fishsanity +from ..options import SpecialOrderLocations +from ..stardew_rule import StardewRule, True_, False_, And +from ..strings.fish_names import SVEFish +from ..strings.quality_names import FishQuality +from ..strings.region_names import Region +from ..strings.skill_names import Skill + + +class FishingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fishing = FishingLogic(*args, **kwargs) + + +class FishingLogic(BaseLogic[Union[FishingLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, ToolLogicMixin, SkillLogicMixin]]): + def can_fish_in_freshwater(self) -> StardewRule: + return self.logic.skill.can_fish() & self.logic.region.can_reach_any((Region.forest, Region.town, Region.mountain)) + + def has_max_fishing(self) -> StardewRule: + skill_rule = self.logic.skill.has_level(Skill.fishing, 10) + return self.logic.tool.has_fishing_rod(4) & skill_rule + + def can_fish_chests(self) -> StardewRule: + skill_rule = self.logic.skill.has_level(Skill.fishing, 6) + return self.logic.tool.has_fishing_rod(4) & skill_rule + + def can_fish_at(self, region: str) -> StardewRule: + return self.logic.skill.can_fish() & self.logic.region.can_reach(region) + + @cache_self1 + def can_catch_fish(self, fish: FishItem) -> StardewRule: + quest_rule = True_() + if fish.extended_family: + quest_rule = self.logic.fishing.can_start_extended_family_quest() + region_rule = self.logic.region.can_reach_any(fish.locations) + season_rule = self.logic.season.has_any(fish.seasons) + if fish.difficulty == -1: + difficulty_rule = self.logic.skill.can_crab_pot + else: + difficulty_rule = self.logic.skill.can_fish(difficulty=(120 if fish.legendary else fish.difficulty)) + if fish.name == SVEFish.kittyfish: + item_rule = self.logic.received("Kittyfish Spell") + else: + item_rule = True_() + return quest_rule & region_rule & season_rule & difficulty_rule & item_rule + + def can_start_extended_family_quest(self) -> StardewRule: + if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return False_() + if self.options.special_order_locations != SpecialOrderLocations.option_board_qi: + return False_() + return self.logic.region.can_reach(Region.qi_walnut_room) & And(*(self.logic.fishing.can_catch_fish(fish) for fish in fish_data.legendary_fish)) + + def can_catch_quality_fish(self, fish_quality: str) -> StardewRule: + if fish_quality == FishQuality.basic: + return True_() + rod_rule = self.logic.tool.has_fishing_rod(2) + if fish_quality == FishQuality.silver: + return rod_rule + if fish_quality == FishQuality.gold: + return rod_rule & self.logic.skill.has_level(Skill.fishing, 4) + if fish_quality == FishQuality.iridium: + return rod_rule & self.logic.skill.has_level(Skill.fishing, 10) + return False_() + + def can_catch_every_fish(self) -> StardewRule: + rules = [self.has_max_fishing()] + exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true + exclude_extended_family = self.options.special_order_locations != SpecialOrderLocations.option_board_qi + for fish in fish_data.get_fish_for_mods(self.options.mods.value): + if exclude_island and fish in fish_data.island_fish: + continue + if exclude_extended_family and fish in fish_data.extended_family: + continue + rules.append(self.logic.fishing.can_catch_fish(fish)) + return And(*rules) + + def can_catch_every_fish_in_slot(self, all_location_names_in_slot: List[str]) -> StardewRule: + if self.options.fishsanity == Fishsanity.option_none: + return self.can_catch_every_fish() + + rules = [self.has_max_fishing()] + + for fishsanity_location in locations_by_tag[LocationTags.FISHSANITY]: + if fishsanity_location.name not in all_location_names_in_slot: + continue + rules.append(self.logic.region.can_reach_location(fishsanity_location.name)) + return And(*rules) diff --git a/worlds/stardew_valley/logic/gift_logic.py b/worlds/stardew_valley/logic/gift_logic.py new file mode 100644 index 000000000000..527da6876411 --- /dev/null +++ b/worlds/stardew_valley/logic/gift_logic.py @@ -0,0 +1,20 @@ +from functools import cached_property + +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from ..stardew_rule import StardewRule +from ..strings.animal_product_names import AnimalProduct +from ..strings.gift_names import Gift + + +class GiftLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.gifts = GiftLogic(*args, **kwargs) + + +class GiftLogic(BaseLogic[HasLogicMixin]): + + @cached_property + def has_any_universal_love(self) -> StardewRule: + return self.logic.has_any(Gift.golden_pumpkin, Gift.pearl, "Prismatic Shard", AnimalProduct.rabbit_foot) diff --git a/worlds/stardew_valley/logic/has_logic.py b/worlds/stardew_valley/logic/has_logic.py new file mode 100644 index 000000000000..d92d4224d7d2 --- /dev/null +++ b/worlds/stardew_valley/logic/has_logic.py @@ -0,0 +1,34 @@ +from .base_logic import BaseLogic +from ..stardew_rule import StardewRule, And, Or, Has, Count + + +class HasLogicMixin(BaseLogic[None]): + # Should be cached + def has(self, item: str) -> StardewRule: + return Has(item, self.registry.item_rules) + + def has_all(self, *items: str): + assert items, "Can't have all of no items." + + return And(*(self.has(item) for item in items)) + + def has_any(self, *items: str): + assert items, "Can't have any of no items." + + return Or(*(self.has(item) for item in items)) + + def has_n(self, *items: str, count: int): + return self.count(count, *(self.has(item) for item in items)) + + @staticmethod + def count(count: int, *rules: StardewRule) -> StardewRule: + assert rules, "Can't create a Count conditions without rules" + assert len(rules) >= count, "Count need at least as many rules as the count" + + if count == 1: + return Or(*rules) + + if count == len(rules): + return And(*rules) + + return Count(list(rules), count) diff --git a/worlds/stardew_valley/logic/logic.py b/worlds/stardew_valley/logic/logic.py new file mode 100644 index 000000000000..1c79e9345930 --- /dev/null +++ b/worlds/stardew_valley/logic/logic.py @@ -0,0 +1,673 @@ +from __future__ import annotations + +from dataclasses import dataclass +from typing import Collection + +from .ability_logic import AbilityLogicMixin +from .action_logic import ActionLogicMixin +from .animal_logic import AnimalLogicMixin +from .arcade_logic import ArcadeLogicMixin +from .artisan_logic import ArtisanLogicMixin +from .base_logic import LogicRegistry +from .buff_logic import BuffLogicMixin +from .building_logic import BuildingLogicMixin +from .bundle_logic import BundleLogicMixin +from .combat_logic import CombatLogicMixin +from .cooking_logic import CookingLogicMixin +from .crafting_logic import CraftingLogicMixin +from .crop_logic import CropLogicMixin +from .farming_logic import FarmingLogicMixin +from .fishing_logic import FishingLogicMixin +from .gift_logic import GiftLogicMixin +from .has_logic import HasLogicMixin +from .mine_logic import MineLogicMixin +from .money_logic import MoneyLogicMixin +from .monster_logic import MonsterLogicMixin +from .museum_logic import MuseumLogicMixin +from .pet_logic import PetLogicMixin +from .quest_logic import QuestLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .relationship_logic import RelationshipLogicMixin +from .season_logic import SeasonLogicMixin +from .shipping_logic import ShippingLogicMixin +from .skill_logic import SkillLogicMixin +from .special_order_logic import SpecialOrderLogicMixin +from .time_logic import TimeLogicMixin +from .tool_logic import ToolLogicMixin +from .traveling_merchant_logic import TravelingMerchantLogicMixin +from .wallet_logic import WalletLogicMixin +from ..data import all_purchasable_seeds, all_crops +from ..data.craftable_data import all_crafting_recipes +from ..data.crops_data import crops_by_name +from ..data.fish_data import get_fish_for_mods +from ..data.museum_data import all_museum_items +from ..data.recipe_data import all_cooking_recipes +from ..mods.logic.magic_logic import MagicLogicMixin +from ..mods.logic.mod_logic import ModLogicMixin +from ..mods.mod_data import ModNames +from ..options import Cropsanity, SpecialOrderLocations, ExcludeGingerIsland, FestivalLocations, Fishsanity, Friendsanity, StardewValleyOptions +from ..stardew_rule import False_, Or, True_, And, StardewRule +from ..strings.animal_names import Animal +from ..strings.animal_product_names import AnimalProduct +from ..strings.ap_names.ap_weapon_names import APWeapon +from ..strings.ap_names.buff_names import Buff +from ..strings.ap_names.community_upgrade_names import CommunityUpgrade +from ..strings.artisan_good_names import ArtisanGood +from ..strings.building_names import Building +from ..strings.craftable_names import Consumable, Furniture, Ring, Fishing, Lighting, WildSeeds +from ..strings.crop_names import Fruit, Vegetable +from ..strings.currency_names import Currency +from ..strings.decoration_names import Decoration +from ..strings.fertilizer_names import Fertilizer, SpeedGro, RetainingSoil +from ..strings.festival_check_names import FestivalCheck +from ..strings.fish_names import Fish, Trash, WaterItem, WaterChest +from ..strings.flower_names import Flower +from ..strings.food_names import Meal, Beverage +from ..strings.forageable_names import Forageable +from ..strings.fruit_tree_names import Sapling +from ..strings.generic_names import Generic +from ..strings.geode_names import Geode +from ..strings.gift_names import Gift +from ..strings.ingredient_names import Ingredient +from ..strings.machine_names import Machine +from ..strings.material_names import Material +from ..strings.metal_names import Ore, MetalBar, Mineral, Fossil +from ..strings.monster_drop_names import Loot +from ..strings.monster_names import Monster +from ..strings.region_names import Region +from ..strings.season_names import Season +from ..strings.seed_names import Seed, TreeSeed +from ..strings.skill_names import Skill +from ..strings.tool_names import Tool, ToolMaterial +from ..strings.villager_names import NPC +from ..strings.wallet_item_names import Wallet + + +@dataclass(frozen=False, repr=False) +class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, BuffLogicMixin, TravelingMerchantLogicMixin, TimeLogicMixin, + SeasonLogicMixin, MoneyLogicMixin, ActionLogicMixin, ArcadeLogicMixin, ArtisanLogicMixin, GiftLogicMixin, + BuildingLogicMixin, ShippingLogicMixin, RelationshipLogicMixin, MuseumLogicMixin, WalletLogicMixin, AnimalLogicMixin, + CombatLogicMixin, MagicLogicMixin, MonsterLogicMixin, ToolLogicMixin, PetLogicMixin, CropLogicMixin, + SkillLogicMixin, FarmingLogicMixin, BundleLogicMixin, FishingLogicMixin, MineLogicMixin, CookingLogicMixin, AbilityLogicMixin, + SpecialOrderLogicMixin, QuestLogicMixin, CraftingLogicMixin, ModLogicMixin): + player: int + options: StardewValleyOptions + regions: Collection[str] + + def __init__(self, player: int, options: StardewValleyOptions, regions: Collection[str]): + self.registry = LogicRegistry() + super().__init__(player, self.registry, options, regions, self) + + self.registry.fish_rules.update({fish.name: self.fishing.can_catch_fish(fish) for fish in get_fish_for_mods(self.options.mods.value)}) + self.registry.museum_rules.update({donation.item_name: self.museum.can_find_museum_item(donation) for donation in all_museum_items}) + + for recipe in all_cooking_recipes: + if recipe.mod_name and recipe.mod_name not in self.options.mods: + continue + can_cook_rule = self.cooking.can_cook(recipe) + if recipe.meal in self.registry.cooking_rules: + can_cook_rule = can_cook_rule | self.registry.cooking_rules[recipe.meal] + self.registry.cooking_rules[recipe.meal] = can_cook_rule + + for recipe in all_crafting_recipes: + if recipe.mod_name and recipe.mod_name not in self.options.mods: + continue + can_craft_rule = self.crafting.can_craft(recipe) + if recipe.item in self.registry.crafting_rules: + can_craft_rule = can_craft_rule | self.registry.crafting_rules[recipe.item] + self.registry.crafting_rules[recipe.item] = can_craft_rule + + self.registry.sapling_rules.update({ + Sapling.apple: self.can_buy_sapling(Fruit.apple), + Sapling.apricot: self.can_buy_sapling(Fruit.apricot), + Sapling.cherry: self.can_buy_sapling(Fruit.cherry), + Sapling.orange: self.can_buy_sapling(Fruit.orange), + Sapling.peach: self.can_buy_sapling(Fruit.peach), + Sapling.pomegranate: self.can_buy_sapling(Fruit.pomegranate), + Sapling.banana: self.can_buy_sapling(Fruit.banana), + Sapling.mango: self.can_buy_sapling(Fruit.mango), + }) + + self.registry.tree_fruit_rules.update({ + Fruit.apple: self.crop.can_plant_and_grow_item(Season.fall), + Fruit.apricot: self.crop.can_plant_and_grow_item(Season.spring), + Fruit.cherry: self.crop.can_plant_and_grow_item(Season.spring), + Fruit.orange: self.crop.can_plant_and_grow_item(Season.summer), + Fruit.peach: self.crop.can_plant_and_grow_item(Season.summer), + Fruit.pomegranate: self.crop.can_plant_and_grow_item(Season.fall), + Fruit.banana: self.crop.can_plant_and_grow_item(Season.summer), + Fruit.mango: self.crop.can_plant_and_grow_item(Season.summer), + }) + + for tree_fruit in self.registry.tree_fruit_rules: + existing_rules = self.registry.tree_fruit_rules[tree_fruit] + sapling = f"{tree_fruit} Sapling" + self.registry.tree_fruit_rules[tree_fruit] = existing_rules & self.has(sapling) & self.time.has_lived_months(1) + + self.registry.seed_rules.update({seed.name: self.crop.can_buy_seed(seed) for seed in all_purchasable_seeds}) + self.registry.crop_rules.update({crop.name: self.crop.can_grow(crop) for crop in all_crops}) + self.registry.crop_rules.update({ + Seed.coffee: (self.season.has(Season.spring) | self.season.has(Season.summer)) & self.crop.can_buy_seed(crops_by_name[Seed.coffee].seed), + Fruit.ancient_fruit: (self.received("Ancient Seeds") | self.received("Ancient Seeds Recipe")) & + self.region.can_reach(Region.greenhouse) & self.has(Machine.seed_maker), + }) + + # @formatter:off + self.registry.item_rules.update({ + "Energy Tonic": self.money.can_spend_at(Region.hospital, 1000), + WaterChest.fishing_chest: self.fishing.can_fish_chests(), + WaterChest.treasure: self.fishing.can_fish_chests(), + Ring.hot_java_ring: self.region.can_reach(Region.volcano_floor_10), + "Galaxy Soul": self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 40), + "JotPK Big Buff": self.arcade.has_jotpk_power_level(7), + "JotPK Max Buff": self.arcade.has_jotpk_power_level(9), + "JotPK Medium Buff": self.arcade.has_jotpk_power_level(4), + "JotPK Small Buff": self.arcade.has_jotpk_power_level(2), + "Junimo Kart Big Buff": self.arcade.has_junimo_kart_power_level(6), + "Junimo Kart Max Buff": self.arcade.has_junimo_kart_power_level(8), + "Junimo Kart Medium Buff": self.arcade.has_junimo_kart_power_level(4), + "Junimo Kart Small Buff": self.arcade.has_junimo_kart_power_level(2), + "Magic Rock Candy": self.region.can_reach(Region.desert) & self.has("Prismatic Shard"), + "Muscle Remedy": self.money.can_spend_at(Region.hospital, 1000), + # self.has(Ingredient.vinegar)), + # self.received("Deluxe Fertilizer Recipe") & self.has(MetalBar.iridium) & self.has(SVItem.sap), + # | (self.ability.can_cook() & self.relationship.has_hearts(NPC.emily, 3) & self.has(Forageable.leek) & self.has(Forageable.dandelion) & + # | (self.ability.can_cook() & self.relationship.has_hearts(NPC.jodi, 7) & self.has(AnimalProduct.cow_milk) & self.has(Ingredient.sugar)), + Animal.chicken: self.animal.can_buy_animal(Animal.chicken), + Animal.cow: self.animal.can_buy_animal(Animal.cow), + Animal.dinosaur: self.building.has_building(Building.big_coop) & self.has(AnimalProduct.dinosaur_egg), + Animal.duck: self.animal.can_buy_animal(Animal.duck), + Animal.goat: self.animal.can_buy_animal(Animal.goat), + Animal.ostrich: self.building.has_building(Building.barn) & self.has(AnimalProduct.ostrich_egg) & self.has(Machine.ostrich_incubator), + Animal.pig: self.animal.can_buy_animal(Animal.pig), + Animal.rabbit: self.animal.can_buy_animal(Animal.rabbit), + Animal.sheep: self.animal.can_buy_animal(Animal.sheep), + AnimalProduct.any_egg: self.has_any(AnimalProduct.chicken_egg, AnimalProduct.duck_egg), + AnimalProduct.brown_egg: self.animal.has_animal(Animal.chicken), + AnimalProduct.chicken_egg: self.has_any(AnimalProduct.egg, AnimalProduct.brown_egg, AnimalProduct.large_egg, AnimalProduct.large_brown_egg), + AnimalProduct.cow_milk: self.has_any(AnimalProduct.milk, AnimalProduct.large_milk), + AnimalProduct.duck_egg: self.animal.has_animal(Animal.duck), + AnimalProduct.duck_feather: self.animal.has_happy_animal(Animal.duck), + AnimalProduct.egg: self.animal.has_animal(Animal.chicken), + AnimalProduct.goat_milk: self.has(Animal.goat), + AnimalProduct.golden_egg: self.received(AnimalProduct.golden_egg) & (self.money.can_spend_at(Region.ranch, 100000) | self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 100)), + AnimalProduct.large_brown_egg: self.animal.has_happy_animal(Animal.chicken), + AnimalProduct.large_egg: self.animal.has_happy_animal(Animal.chicken), + AnimalProduct.large_goat_milk: self.animal.has_happy_animal(Animal.goat), + AnimalProduct.large_milk: self.animal.has_happy_animal(Animal.cow), + AnimalProduct.milk: self.animal.has_animal(Animal.cow), + AnimalProduct.ostrich_egg: self.tool.can_forage(Generic.any, Region.island_north, True), + AnimalProduct.rabbit_foot: self.animal.has_happy_animal(Animal.rabbit), + AnimalProduct.roe: self.skill.can_fish() & self.building.has_building(Building.fish_pond), + AnimalProduct.squid_ink: self.mine.can_mine_in_the_mines_floor_81_120() | (self.building.has_building(Building.fish_pond) & self.has(Fish.squid)), + AnimalProduct.sturgeon_roe: self.has(Fish.sturgeon) & self.building.has_building(Building.fish_pond), + AnimalProduct.truffle: self.animal.has_animal(Animal.pig) & self.season.has_any_not_winter(), + AnimalProduct.void_egg: self.money.can_spend_at(Region.sewer, 5000) | (self.building.has_building(Building.fish_pond) & self.has(Fish.void_salmon)), + AnimalProduct.wool: self.animal.has_animal(Animal.rabbit) | self.animal.has_animal(Animal.sheep), + AnimalProduct.slime_egg_green: self.has(Machine.slime_egg_press) & self.has(Loot.slime), + AnimalProduct.slime_egg_blue: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(3), + AnimalProduct.slime_egg_red: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(6), + AnimalProduct.slime_egg_purple: self.has(Machine.slime_egg_press) & self.has(Loot.slime) & self.time.has_lived_months(9), + AnimalProduct.slime_egg_tiger: self.has(Fish.lionfish) & self.building.has_building(Building.fish_pond), + ArtisanGood.aged_roe: self.artisan.can_preserves_jar(AnimalProduct.roe), + ArtisanGood.battery_pack: (self.has(Machine.lightning_rod) & self.season.has_any_not_winter()) | self.has(Machine.solar_panel), + ArtisanGood.caviar: self.artisan.can_preserves_jar(AnimalProduct.sturgeon_roe), + ArtisanGood.cheese: (self.has(AnimalProduct.cow_milk) & self.has(Machine.cheese_press)) | (self.region.can_reach(Region.desert) & self.has(Mineral.emerald)), + ArtisanGood.cloth: (self.has(AnimalProduct.wool) & self.has(Machine.loom)) | (self.region.can_reach(Region.desert) & self.has(Mineral.aquamarine)), + ArtisanGood.dinosaur_mayonnaise: self.artisan.can_mayonnaise(AnimalProduct.dinosaur_egg), + ArtisanGood.duck_mayonnaise: self.artisan.can_mayonnaise(AnimalProduct.duck_egg), + ArtisanGood.goat_cheese: self.has(AnimalProduct.goat_milk) & self.has(Machine.cheese_press), + ArtisanGood.green_tea: self.artisan.can_keg(Vegetable.tea_leaves), + ArtisanGood.honey: self.money.can_spend_at(Region.oasis, 200) | (self.has(Machine.bee_house) & self.season.has_any_not_winter()), + ArtisanGood.jelly: self.artisan.has_jelly(), + ArtisanGood.juice: self.artisan.has_juice(), + ArtisanGood.maple_syrup: self.has(Machine.tapper), + ArtisanGood.mayonnaise: self.artisan.can_mayonnaise(AnimalProduct.chicken_egg), + ArtisanGood.mead: self.artisan.can_keg(ArtisanGood.honey), + ArtisanGood.oak_resin: self.has(Machine.tapper), + ArtisanGood.pale_ale: self.artisan.can_keg(Vegetable.hops), + ArtisanGood.pickles: self.artisan.has_pickle(), + ArtisanGood.pine_tar: self.has(Machine.tapper), + ArtisanGood.truffle_oil: self.has(AnimalProduct.truffle) & self.has(Machine.oil_maker), + ArtisanGood.void_mayonnaise: (self.skill.can_fish(Region.witch_swamp)) | (self.artisan.can_mayonnaise(AnimalProduct.void_egg)), + ArtisanGood.wine: self.artisan.has_wine(), + Beverage.beer: self.artisan.can_keg(Vegetable.wheat) | self.money.can_spend_at(Region.saloon, 400), + Beverage.coffee: self.artisan.can_keg(Seed.coffee) | self.has(Machine.coffee_maker) | (self.money.can_spend_at(Region.saloon, 300)) | self.has("Hot Java Ring"), + Beverage.pina_colada: self.money.can_spend_at(Region.island_resort, 600), + Beverage.triple_shot_espresso: self.has("Hot Java Ring"), + Decoration.rotten_plant: self.has(Lighting.jack_o_lantern) & self.season.has(Season.winter), + Fertilizer.basic: self.money.can_spend_at(Region.pierre_store, 100), + Fertilizer.quality: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150), + Fertilizer.tree: self.skill.has_level(Skill.foraging, 7) & self.has(Material.fiber) & self.has(Material.stone), + Fish.any: Or(*(self.fishing.can_catch_fish(fish) for fish in get_fish_for_mods(self.options.mods.value))), + Fish.crab: self.skill.can_crab_pot_at(Region.beach), + Fish.crayfish: self.skill.can_crab_pot_at(Region.town), + Fish.lobster: self.skill.can_crab_pot_at(Region.beach), + Fish.mussel: self.tool.can_forage(Generic.any, Region.beach) or self.has(Fish.mussel_node), + Fish.mussel_node: self.region.can_reach(Region.island_west), + Fish.oyster: self.tool.can_forage(Generic.any, Region.beach), + Fish.periwinkle: self.skill.can_crab_pot_at(Region.town), + Fish.shrimp: self.skill.can_crab_pot_at(Region.beach), + Fish.snail: self.skill.can_crab_pot_at(Region.town), + Fishing.curiosity_lure: self.monster.can_kill(self.monster.all_monsters_by_name[Monster.mummy]), + Fishing.lead_bobber: self.skill.has_level(Skill.fishing, 6) & self.money.can_spend_at(Region.fish_shop, 200), + Forageable.blackberry: self.tool.can_forage(Season.fall) | self.has_fruit_bats(), + Forageable.cactus_fruit: self.tool.can_forage(Generic.any, Region.desert), + Forageable.cave_carrot: self.tool.can_forage(Generic.any, Region.mines_floor_10, True), + Forageable.chanterelle: self.tool.can_forage(Season.fall, Region.secret_woods) | self.has_mushroom_cave(), + Forageable.coconut: self.tool.can_forage(Generic.any, Region.desert), + Forageable.common_mushroom: self.tool.can_forage(Season.fall) | (self.tool.can_forage(Season.spring, Region.secret_woods)) | self.has_mushroom_cave(), + Forageable.crocus: self.tool.can_forage(Season.winter), + Forageable.crystal_fruit: self.tool.can_forage(Season.winter), + Forageable.daffodil: self.tool.can_forage(Season.spring), + Forageable.dandelion: self.tool.can_forage(Season.spring), + Forageable.dragon_tooth: self.tool.can_forage(Generic.any, Region.volcano_floor_10), + Forageable.fiddlehead_fern: self.tool.can_forage(Season.summer, Region.secret_woods), + Forageable.ginger: self.tool.can_forage(Generic.any, Region.island_west, True), + Forageable.hay: self.building.has_building(Building.silo) & self.tool.has_tool(Tool.scythe), + Forageable.hazelnut: self.tool.can_forage(Season.fall), + Forageable.holly: self.tool.can_forage(Season.winter), + Forageable.journal_scrap: self.region.can_reach_all((Region.island_west, Region.island_north, Region.island_south, Region.volcano_floor_10)) & self.quest.has_magnifying_glass() & (self.ability.can_chop_trees() | self.mine.can_mine_in_the_mines_floor_1_40()), + Forageable.leek: self.tool.can_forage(Season.spring), + Forageable.magma_cap: self.tool.can_forage(Generic.any, Region.volcano_floor_5), + Forageable.morel: self.tool.can_forage(Season.spring, Region.secret_woods) | self.has_mushroom_cave(), + Forageable.purple_mushroom: self.tool.can_forage(Generic.any, Region.mines_floor_95) | self.tool.can_forage(Generic.any, Region.skull_cavern_25) | self.has_mushroom_cave(), + Forageable.rainbow_shell: self.tool.can_forage(Season.summer, Region.beach), + Forageable.red_mushroom: self.tool.can_forage(Season.summer, Region.secret_woods) | self.tool.can_forage(Season.fall, Region.secret_woods) | self.has_mushroom_cave(), + Forageable.salmonberry: self.tool.can_forage(Season.spring) | self.has_fruit_bats(), + Forageable.secret_note: self.quest.has_magnifying_glass() & (self.ability.can_chop_trees() | self.mine.can_mine_in_the_mines_floor_1_40()), + Forageable.snow_yam: self.tool.can_forage(Season.winter, Region.beach, True), + Forageable.spice_berry: self.tool.can_forage(Season.summer) | self.has_fruit_bats(), + Forageable.spring_onion: self.tool.can_forage(Season.spring), + Forageable.sweet_pea: self.tool.can_forage(Season.summer), + Forageable.wild_horseradish: self.tool.can_forage(Season.spring), + Forageable.wild_plum: self.tool.can_forage(Season.fall) | self.has_fruit_bats(), + Forageable.winter_root: self.tool.can_forage(Season.winter, Region.forest, True), + Fossil.bone_fragment: (self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.pickaxe)) | self.monster.can_kill(Monster.skeleton), + Fossil.fossilized_leg: self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.pickaxe), + Fossil.fossilized_ribs: self.region.can_reach(Region.island_south) & self.tool.has_tool(Tool.hoe), + Fossil.fossilized_skull: self.action.can_open_geode(Geode.golden_coconut), + Fossil.fossilized_spine: self.skill.can_fish(Region.dig_site), + Fossil.fossilized_tail: self.action.can_pan_at(Region.dig_site), + Fossil.mummified_bat: self.region.can_reach(Region.volcano_floor_10), + Fossil.mummified_frog: self.region.can_reach(Region.island_east) & self.tool.has_tool(Tool.scythe), + Fossil.snake_skull: self.region.can_reach(Region.dig_site) & self.tool.has_tool(Tool.hoe), + Fossil.snake_vertebrae: self.region.can_reach(Region.island_west) & self.tool.has_tool(Tool.hoe), + Geode.artifact_trove: self.has(Geode.omni) & self.region.can_reach(Region.desert), + Geode.frozen: self.mine.can_mine_in_the_mines_floor_41_80(), + Geode.geode: self.mine.can_mine_in_the_mines_floor_1_40(), + Geode.golden_coconut: self.region.can_reach(Region.island_north), + Geode.magma: self.mine.can_mine_in_the_mines_floor_81_120() | (self.has(Fish.lava_eel) & self.building.has_building(Building.fish_pond)), + Geode.omni: self.mine.can_mine_in_the_mines_floor_41_80() | self.region.can_reach(Region.desert) | self.action.can_pan() | self.received(Wallet.rusty_key) | (self.has(Fish.octopus) & self.building.has_building(Building.fish_pond)) | self.region.can_reach(Region.volcano_floor_10), + Gift.bouquet: self.relationship.has_hearts(Generic.bachelor, 8) & self.money.can_spend_at(Region.pierre_store, 100), + Gift.golden_pumpkin: self.season.has(Season.fall) | self.action.can_open_geode(Geode.artifact_trove), + Gift.mermaid_pendant: self.region.can_reach(Region.tide_pools) & self.relationship.has_hearts(Generic.bachelor, 10) & self.building.has_house(1) & self.has(Consumable.rain_totem), + Gift.movie_ticket: self.money.can_spend_at(Region.movie_ticket_stand, 1000), + Gift.pearl: (self.has(Fish.blobfish) & self.building.has_building(Building.fish_pond)) | self.action.can_open_geode(Geode.artifact_trove), + Gift.tea_set: self.season.has(Season.winter) & self.time.has_lived_max_months, + Gift.void_ghost_pendant: self.money.can_trade_at(Region.desert, Loot.void_essence, 200) & self.relationship.has_hearts(NPC.krobus, 10), + Gift.wilted_bouquet: self.has(Machine.furnace) & self.has(Gift.bouquet) & self.has(Material.coal), + Ingredient.oil: self.money.can_spend_at(Region.pierre_store, 200) | (self.has(Machine.oil_maker) & (self.has(Vegetable.corn) | self.has(Flower.sunflower) | self.has(Seed.sunflower))), + Ingredient.qi_seasoning: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 10), + Ingredient.rice: self.money.can_spend_at(Region.pierre_store, 200) | (self.building.has_building(Building.mill) & self.has(Vegetable.unmilled_rice)), + Ingredient.sugar: self.money.can_spend_at(Region.pierre_store, 100) | (self.building.has_building(Building.mill) & self.has(Vegetable.beet)), + Ingredient.vinegar: self.money.can_spend_at(Region.pierre_store, 200), + Ingredient.wheat_flour: self.money.can_spend_at(Region.pierre_store, 100) | (self.building.has_building(Building.mill) & self.has(Vegetable.wheat)), + Loot.bat_wing: self.mine.can_mine_in_the_mines_floor_41_80() | self.mine.can_mine_in_the_skull_cavern(), + Loot.bug_meat: self.mine.can_mine_in_the_mines_floor_1_40(), + Loot.slime: self.mine.can_mine_in_the_mines_floor_1_40(), + Loot.solar_essence: self.mine.can_mine_in_the_mines_floor_41_80() | self.mine.can_mine_in_the_skull_cavern(), + Loot.void_essence: self.mine.can_mine_in_the_mines_floor_81_120() | self.mine.can_mine_in_the_skull_cavern(), + Machine.bee_house: self.skill.has_farming_level(3) & self.has(MetalBar.iron) & self.has(ArtisanGood.maple_syrup) & self.has(Material.coal) & self.has(Material.wood), + Machine.cask: self.building.has_house(3) & self.region.can_reach(Region.cellar) & self.has(Material.wood) & self.has(Material.hardwood), + Machine.cheese_press: self.skill.has_farming_level(6) & self.has(Material.wood) & self.has(Material.stone) & self.has(Material.hardwood) & self.has(MetalBar.copper), + Machine.coffee_maker: self.received(Machine.coffee_maker), + Machine.crab_pot: self.skill.has_level(Skill.fishing, 3) & (self.money.can_spend_at(Region.fish_shop, 1500) | (self.has(MetalBar.iron) & self.has(Material.wood))), + Machine.furnace: self.has(Material.stone) & self.has(Ore.copper), + Machine.keg: self.skill.has_farming_level(8) & self.has(Material.wood) & self.has(MetalBar.iron) & self.has(MetalBar.copper) & self.has(ArtisanGood.oak_resin), + Machine.lightning_rod: self.skill.has_level(Skill.foraging, 6) & self.has(MetalBar.iron) & self.has(MetalBar.quartz) & self.has(Loot.bat_wing), + Machine.loom: self.skill.has_farming_level(7) & self.has(Material.wood) & self.has(Material.fiber) & self.has(ArtisanGood.pine_tar), + Machine.mayonnaise_machine: self.skill.has_farming_level(2) & self.has(Material.wood) & self.has(Material.stone) & self.has("Earth Crystal") & self.has(MetalBar.copper), + Machine.ostrich_incubator: self.received("Ostrich Incubator Recipe") & self.has(Fossil.bone_fragment) & self.has(Material.hardwood) & self.has(Material.cinder_shard), + Machine.preserves_jar: self.skill.has_farming_level(4) & self.has(Material.wood) & self.has(Material.stone) & self.has(Material.coal), + Machine.recycling_machine: self.skill.has_level(Skill.fishing, 4) & self.has(Material.wood) & self.has(Material.stone) & self.has(MetalBar.iron), + Machine.seed_maker: self.skill.has_farming_level(9) & self.has(Material.wood) & self.has(MetalBar.gold) & self.has(Material.coal), + Machine.solar_panel: self.received("Solar Panel Recipe") & self.has(MetalBar.quartz) & self.has(MetalBar.iron) & self.has(MetalBar.gold), + Machine.tapper: self.skill.has_level(Skill.foraging, 3) & self.has(Material.wood) & self.has(MetalBar.copper), + Machine.worm_bin: self.skill.has_level(Skill.fishing, 8) & self.has(Material.hardwood) & self.has(MetalBar.gold) & self.has(MetalBar.iron) & self.has(Material.fiber), + Machine.enricher: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 20), + Machine.pressure_nozzle: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 20), + Material.cinder_shard: self.region.can_reach(Region.volcano_floor_5), + Material.clay: self.region.can_reach_any((Region.farm, Region.beach, Region.quarry)) & self.tool.has_tool(Tool.hoe), + Material.coal: self.mine.can_mine_in_the_mines_floor_41_80() | self.action.can_pan(), + Material.fiber: True_(), + Material.hardwood: self.tool.has_tool(Tool.axe, ToolMaterial.copper) & (self.region.can_reach(Region.secret_woods) | self.region.can_reach(Region.island_west)), + Material.sap: self.ability.can_chop_trees(), + Material.stone: self.tool.has_tool(Tool.pickaxe), + Material.wood: self.tool.has_tool(Tool.axe), + Meal.bread: self.money.can_spend_at(Region.saloon, 120), + Meal.ice_cream: (self.season.has(Season.summer) & self.money.can_spend_at(Region.town, 250)) | self.money.can_spend_at(Region.oasis, 240), + Meal.pizza: self.money.can_spend_at(Region.saloon, 600), + Meal.salad: self.money.can_spend_at(Region.saloon, 220), + Meal.spaghetti: self.money.can_spend_at(Region.saloon, 240), + Meal.strange_bun: self.relationship.has_hearts(NPC.shane, 7) & self.has(Ingredient.wheat_flour) & self.has(Fish.periwinkle) & self.has(ArtisanGood.void_mayonnaise), + MetalBar.copper: self.can_smelt(Ore.copper), + MetalBar.gold: self.can_smelt(Ore.gold), + MetalBar.iridium: self.can_smelt(Ore.iridium), + MetalBar.iron: self.can_smelt(Ore.iron), + MetalBar.quartz: self.can_smelt(Mineral.quartz) | self.can_smelt("Fire Quartz") | (self.has(Machine.recycling_machine) & (self.has(Trash.broken_cd) | self.has(Trash.broken_glasses))), + MetalBar.radioactive: self.can_smelt(Ore.radioactive), + Ore.copper: self.mine.can_mine_in_the_mines_floor_1_40() | self.mine.can_mine_in_the_skull_cavern() | self.action.can_pan(), + Ore.gold: self.mine.can_mine_in_the_mines_floor_81_120() | self.mine.can_mine_in_the_skull_cavern() | self.action.can_pan(), + Ore.iridium: self.mine.can_mine_in_the_skull_cavern() | self.can_fish_pond(Fish.super_cucumber), + Ore.iron: self.mine.can_mine_in_the_mines_floor_41_80() | self.mine.can_mine_in_the_skull_cavern() | self.action.can_pan(), + Ore.radioactive: self.ability.can_mine_perfectly() & self.region.can_reach(Region.qi_walnut_room), + RetainingSoil.basic: self.money.can_spend_at(Region.pierre_store, 100), + RetainingSoil.quality: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150), + Sapling.tea: self.relationship.has_hearts(NPC.caroline, 2) & self.has(Material.fiber) & self.has(Material.wood), + Seed.mixed: self.tool.has_tool(Tool.scythe) & self.region.can_reach_all((Region.farm, Region.forest, Region.town)), + SpeedGro.basic: self.money.can_spend_at(Region.pierre_store, 100), + SpeedGro.deluxe: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150), + Trash.broken_cd: self.skill.can_crab_pot, + Trash.broken_glasses: self.skill.can_crab_pot, + Trash.driftwood: self.skill.can_crab_pot, + Trash.joja_cola: self.money.can_spend_at(Region.saloon, 75), + Trash.soggy_newspaper: self.skill.can_crab_pot, + Trash.trash: self.skill.can_crab_pot, + TreeSeed.acorn: self.skill.has_level(Skill.foraging, 1) & self.ability.can_chop_trees(), + TreeSeed.mahogany: self.region.can_reach(Region.secret_woods) & self.tool.has_tool(Tool.axe, ToolMaterial.iron) & self.skill.has_level(Skill.foraging, 1), + TreeSeed.maple: self.skill.has_level(Skill.foraging, 1) & self.ability.can_chop_trees(), + TreeSeed.mushroom: self.money.can_trade_at(Region.qi_walnut_room, Currency.qi_gem, 5), + TreeSeed.pine: self.skill.has_level(Skill.foraging, 1) & self.ability.can_chop_trees(), + Vegetable.tea_leaves: self.has(Sapling.tea) & self.time.has_lived_months(2) & self.season.has_any_not_winter(), + Fish.clam: self.tool.can_forage(Generic.any, Region.beach), + Fish.cockle: self.tool.can_forage(Generic.any, Region.beach), + WaterItem.coral: self.tool.can_forage(Generic.any, Region.tide_pools) | self.tool.can_forage(Season.summer, Region.beach), + WaterItem.green_algae: self.fishing.can_fish_in_freshwater(), + WaterItem.nautilus_shell: self.tool.can_forage(Season.winter, Region.beach), + WaterItem.sea_urchin: self.tool.can_forage(Generic.any, Region.tide_pools), + WaterItem.seaweed: self.skill.can_fish(Region.tide_pools), + WaterItem.white_algae: self.skill.can_fish(Region.mines_floor_20), + WildSeeds.grass_starter: self.money.can_spend_at(Region.pierre_store, 100), + }) + # @formatter:on + self.registry.item_rules.update(self.registry.fish_rules) + self.registry.item_rules.update(self.registry.museum_rules) + self.registry.item_rules.update(self.registry.sapling_rules) + self.registry.item_rules.update(self.registry.tree_fruit_rules) + self.registry.item_rules.update(self.registry.seed_rules) + self.registry.item_rules.update(self.registry.crop_rules) + + self.registry.item_rules.update(self.mod.item.get_modded_item_rules()) + self.mod.item.modify_vanilla_item_rules_with_mod_additions(self.registry.item_rules) # New regions and content means new ways to obtain old items + + # For some recipes, the cooked item can be obtained directly, so we either cook it or get it + for recipe in self.registry.cooking_rules: + cooking_rule = self.registry.cooking_rules[recipe] + obtention_rule = self.registry.item_rules[recipe] if recipe in self.registry.item_rules else False_() + self.registry.item_rules[recipe] = obtention_rule | cooking_rule + + # For some recipes, the crafted item can be obtained directly, so we either craft it or get it + for recipe in self.registry.crafting_rules: + crafting_rule = self.registry.crafting_rules[recipe] + obtention_rule = self.registry.item_rules[recipe] if recipe in self.registry.item_rules else False_() + self.registry.item_rules[recipe] = obtention_rule | crafting_rule + + self.building.initialize_rules() + self.building.update_rules(self.mod.building.get_modded_building_rules()) + + self.quest.initialize_rules() + self.quest.update_rules(self.mod.quest.get_modded_quest_rules()) + + self.registry.festival_rules.update({ + FestivalCheck.egg_hunt: self.can_win_egg_hunt(), + FestivalCheck.strawberry_seeds: self.money.can_spend(1000), + FestivalCheck.dance: self.relationship.has_hearts(Generic.bachelor, 4), + FestivalCheck.tub_o_flowers: self.money.can_spend(2000), + FestivalCheck.rarecrow_5: self.money.can_spend(2500), + FestivalCheck.luau_soup: self.can_succeed_luau_soup(), + FestivalCheck.moonlight_jellies: True_(), + FestivalCheck.moonlight_jellies_banner: self.money.can_spend(800), + FestivalCheck.starport_decal: self.money.can_spend(1000), + FestivalCheck.smashing_stone: True_(), + FestivalCheck.grange_display: self.can_succeed_grange_display(), + FestivalCheck.rarecrow_1: True_(), # only cost star tokens + FestivalCheck.fair_stardrop: True_(), # only cost star tokens + FestivalCheck.spirit_eve_maze: True_(), + FestivalCheck.jack_o_lantern: self.money.can_spend(2000), + FestivalCheck.rarecrow_2: self.money.can_spend(5000), + FestivalCheck.fishing_competition: self.can_win_fishing_competition(), + FestivalCheck.rarecrow_4: self.money.can_spend(5000), + FestivalCheck.mermaid_pearl: self.has(Forageable.secret_note), + FestivalCheck.cone_hat: self.money.can_spend(2500), + FestivalCheck.iridium_fireplace: self.money.can_spend(15000), + FestivalCheck.rarecrow_7: self.money.can_spend(5000) & self.museum.can_donate_museum_artifacts(20), + FestivalCheck.rarecrow_8: self.money.can_spend(5000) & self.museum.can_donate_museum_items(40), + FestivalCheck.lupini_red_eagle: self.money.can_spend(1200), + FestivalCheck.lupini_portrait_mermaid: self.money.can_spend(1200), + FestivalCheck.lupini_solar_kingdom: self.money.can_spend(1200), + FestivalCheck.lupini_clouds: self.time.has_year_two & self.money.can_spend(1200), + FestivalCheck.lupini_1000_years: self.time.has_year_two & self.money.can_spend(1200), + FestivalCheck.lupini_three_trees: self.time.has_year_two & self.money.can_spend(1200), + FestivalCheck.lupini_the_serpent: self.time.has_year_three & self.money.can_spend(1200), + FestivalCheck.lupini_tropical_fish: self.time.has_year_three & self.money.can_spend(1200), + FestivalCheck.lupini_land_of_clay: self.time.has_year_three & self.money.can_spend(1200), + FestivalCheck.secret_santa: self.gifts.has_any_universal_love, + FestivalCheck.legend_of_the_winter_star: True_(), + FestivalCheck.rarecrow_3: True_(), + FestivalCheck.all_rarecrows: self.region.can_reach(Region.farm) & self.has_all_rarecrows(), + }) + + self.special_order.initialize_rules() + self.special_order.update_rules(self.mod.special_order.get_modded_special_orders_rules()) + + def can_buy_sapling(self, fruit: str) -> StardewRule: + sapling_prices = {Fruit.apple: 4000, Fruit.apricot: 2000, Fruit.cherry: 3400, Fruit.orange: 4000, + Fruit.peach: 6000, + Fruit.pomegranate: 6000, Fruit.banana: 0, Fruit.mango: 0} + received_sapling = self.received(f"{fruit} Sapling") + if self.options.cropsanity == Cropsanity.option_disabled: + allowed_buy_sapling = True_() + else: + allowed_buy_sapling = received_sapling + can_buy_sapling = self.money.can_spend_at(Region.pierre_store, sapling_prices[fruit]) + if fruit == Fruit.banana: + can_buy_sapling = self.has_island_trader() & self.has(Forageable.dragon_tooth) + elif fruit == Fruit.mango: + can_buy_sapling = self.has_island_trader() & self.has(Fish.mussel_node) + + return allowed_buy_sapling & can_buy_sapling + + def can_smelt(self, item: str) -> StardewRule: + return self.has(Machine.furnace) & self.has(item) + + def can_complete_field_office(self) -> StardewRule: + field_office = self.region.can_reach(Region.field_office) + professor_snail = self.received("Open Professor Snail Cave") + tools = self.tool.has_tool(Tool.pickaxe) & self.tool.has_tool(Tool.hoe) & self.tool.has_tool(Tool.scythe) + leg_and_snake_skull = self.has_all(Fossil.fossilized_leg, Fossil.snake_skull) + ribs_and_spine = self.has_all(Fossil.fossilized_ribs, Fossil.fossilized_spine) + skull = self.has(Fossil.fossilized_skull) + tail = self.has(Fossil.fossilized_tail) + frog = self.has(Fossil.mummified_frog) + bat = self.has(Fossil.mummified_bat) + snake_vertebrae = self.has(Fossil.snake_vertebrae) + return field_office & professor_snail & tools & leg_and_snake_skull & ribs_and_spine & skull & tail & frog & bat & snake_vertebrae + + def can_finish_grandpa_evaluation(self) -> StardewRule: + # https://stardewvalleywiki.com/Grandpa + rules_worth_a_point = [ + self.money.can_have_earned_total(50000), # 50 000g + self.money.can_have_earned_total(100000), # 100 000g + self.money.can_have_earned_total(200000), # 200 000g + self.money.can_have_earned_total(300000), # 300 000g + self.money.can_have_earned_total(500000), # 500 000g + self.money.can_have_earned_total(1000000), # 1 000 000g first point + self.money.can_have_earned_total(1000000), # 1 000 000g second point + self.skill.has_total_level(30), # Total Skills: 30 + self.skill.has_total_level(50), # Total Skills: 50 + self.museum.can_complete_museum(), # Completing the museum for a point + # Catching every fish not expected + # Shipping every item not expected + self.relationship.can_get_married() & self.building.has_house(2), + self.relationship.has_hearts("5", 8), # 5 Friends + self.relationship.has_hearts("10", 8), # 10 friends + self.pet.has_hearts(5), # Max Pet + self.bundle.can_complete_community_center, # Community Center Completion + self.bundle.can_complete_community_center, # CC Ceremony first point + self.bundle.can_complete_community_center, # CC Ceremony second point + self.received(Wallet.skull_key), # Skull Key obtained + self.wallet.has_rusty_key(), # Rusty key obtained + ] + return self.count(12, *rules_worth_a_point) + + def can_win_egg_hunt(self) -> StardewRule: + number_of_movement_buffs = self.options.movement_buff_number + if self.options.festival_locations == FestivalLocations.option_hard or number_of_movement_buffs < 2: + return True_() + return self.received(Buff.movement, number_of_movement_buffs // 2) + + def can_succeed_luau_soup(self) -> StardewRule: + if self.options.festival_locations != FestivalLocations.option_hard: + return True_() + eligible_fish = [Fish.blobfish, Fish.crimsonfish, "Ice Pip", Fish.lava_eel, Fish.legend, Fish.angler, Fish.catfish, Fish.glacierfish, Fish.mutant_carp, + Fish.spookfish, Fish.stingray, Fish.sturgeon, "Super Cucumber"] + fish_rule = self.has_any(*eligible_fish) + eligible_kegables = [Fruit.ancient_fruit, Fruit.apple, Fruit.banana, Forageable.coconut, Forageable.crystal_fruit, Fruit.mango, Fruit.melon, + Fruit.orange, Fruit.peach, Fruit.pineapple, Fruit.pomegranate, Fruit.rhubarb, Fruit.starfruit, Fruit.strawberry, + Forageable.cactus_fruit, Fruit.cherry, Fruit.cranberries, Fruit.grape, Forageable.spice_berry, Forageable.wild_plum, + Vegetable.hops, Vegetable.wheat] + keg_rules = [self.artisan.can_keg(kegable) for kegable in eligible_kegables] + aged_rule = self.has(Machine.cask) & Or(*keg_rules) + # There are a few other valid items, but I don't feel like coding them all + return fish_rule | aged_rule + + def can_succeed_grange_display(self) -> StardewRule: + if self.options.festival_locations != FestivalLocations.option_hard: + return True_() + animal_rule = self.animal.has_animal(Generic.any) + artisan_rule = self.artisan.can_keg(Generic.any) | self.artisan.can_preserves_jar(Generic.any) + cooking_rule = self.money.can_spend_at(Region.saloon, 220) # Salads at the bar are good enough + fish_rule = self.skill.can_fish(difficulty=50) + forage_rule = self.region.can_reach_any((Region.forest, Region.backwoods)) # Hazelnut always available since the grange display is in fall + mineral_rule = self.action.can_open_geode(Generic.any) # More than half the minerals are good enough + good_fruits = [Fruit.apple, Fruit.banana, Forageable.coconut, Forageable.crystal_fruit, Fruit.mango, Fruit.orange, Fruit.peach, Fruit.pomegranate, + Fruit.strawberry, Fruit.melon, Fruit.rhubarb, Fruit.pineapple, Fruit.ancient_fruit, Fruit.starfruit, ] + fruit_rule = self.has_any(*good_fruits) + good_vegetables = [Vegetable.amaranth, Vegetable.artichoke, Vegetable.beet, Vegetable.cauliflower, Forageable.fiddlehead_fern, Vegetable.kale, + Vegetable.radish, Vegetable.taro_root, Vegetable.yam, Vegetable.red_cabbage, Vegetable.pumpkin] + vegetable_rule = self.has_any(*good_vegetables) + + return animal_rule & artisan_rule & cooking_rule & fish_rule & \ + forage_rule & fruit_rule & mineral_rule & vegetable_rule + + def can_win_fishing_competition(self) -> StardewRule: + return self.skill.can_fish(difficulty=60) + + def has_island_trader(self) -> StardewRule: + if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return False_() + return self.region.can_reach(Region.island_trader) + + def has_walnut(self, number: int) -> StardewRule: + if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return False_() + if number <= 0: + return True_() + # https://stardewcommunitywiki.com/Golden_Walnut#Walnut_Locations + reach_south = self.region.can_reach(Region.island_south) + reach_north = self.region.can_reach(Region.island_north) + reach_west = self.region.can_reach(Region.island_west) + reach_hut = self.region.can_reach(Region.leo_hut) + reach_southeast = self.region.can_reach(Region.island_south_east) + reach_field_office = self.region.can_reach(Region.field_office) + reach_pirate_cove = self.region.can_reach(Region.pirate_cove) + reach_outside_areas = And(reach_south, reach_north, reach_west, reach_hut) + reach_volcano_regions = [self.region.can_reach(Region.volcano), + self.region.can_reach(Region.volcano_secret_beach), + self.region.can_reach(Region.volcano_floor_5), + self.region.can_reach(Region.volcano_floor_10)] + reach_volcano = Or(*reach_volcano_regions) + reach_all_volcano = And(*reach_volcano_regions) + reach_walnut_regions = [reach_south, reach_north, reach_west, reach_volcano, reach_field_office] + reach_caves = And(self.region.can_reach(Region.qi_walnut_room), self.region.can_reach(Region.dig_site), + self.region.can_reach(Region.gourmand_frog_cave), + self.region.can_reach(Region.colored_crystals_cave), + self.region.can_reach(Region.shipwreck), self.received(APWeapon.slingshot)) + reach_entire_island = And(reach_outside_areas, reach_all_volcano, + reach_caves, reach_southeast, reach_field_office, reach_pirate_cove) + if number <= 5: + return Or(reach_south, reach_north, reach_west, reach_volcano) + if number <= 10: + return self.count(2, *reach_walnut_regions) + if number <= 15: + return self.count(3, *reach_walnut_regions) + if number <= 20: + return And(*reach_walnut_regions) + if number <= 50: + return reach_entire_island + gems = (Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz) + return reach_entire_island & self.has(Fruit.banana) & self.has_all(*gems) & self.ability.can_mine_perfectly() & \ + self.ability.can_fish_perfectly() & self.has(Furniture.flute_block) & self.has(Seed.melon) & self.has(Seed.wheat) & self.has(Seed.garlic) & \ + self.can_complete_field_office() + + def has_all_stardrops(self) -> StardewRule: + other_rules = [] + number_of_stardrops_to_receive = 0 + number_of_stardrops_to_receive += 1 # The Mines level 100 + number_of_stardrops_to_receive += 1 # Old Master Cannoli + number_of_stardrops_to_receive += 1 # Museum Stardrop + number_of_stardrops_to_receive += 1 # Krobus Stardrop + + if self.options.fishsanity == Fishsanity.option_none: # Master Angler Stardrop + other_rules.append(self.fishing.can_catch_every_fish()) + else: + number_of_stardrops_to_receive += 1 + + if self.options.festival_locations == FestivalLocations.option_disabled: # Fair Stardrop + other_rules.append(self.season.has(Season.fall)) + else: + number_of_stardrops_to_receive += 1 + + if self.options.friendsanity == Friendsanity.option_none: # Spouse Stardrop + other_rules.append(self.relationship.has_hearts(Generic.bachelor, 13)) + else: + number_of_stardrops_to_receive += 1 + + if ModNames.deepwoods in self.options.mods: # Petting the Unicorn + number_of_stardrops_to_receive += 1 + + if not other_rules: + return self.received("Stardrop", number_of_stardrops_to_receive) + + return self.received("Stardrop", number_of_stardrops_to_receive) & And(*other_rules) + + def has_prismatic_jelly_reward_access(self) -> StardewRule: + if self.options.special_order_locations == SpecialOrderLocations.option_disabled: + return self.special_order.can_complete_special_order("Prismatic Jelly") + return self.received("Monster Musk Recipe") + + def has_all_rarecrows(self) -> StardewRule: + rules = [] + for rarecrow_number in range(1, 9): + rules.append(self.received(f"Rarecrow #{rarecrow_number}")) + return And(*rules) + + def has_abandoned_jojamart(self) -> StardewRule: + return self.received(CommunityUpgrade.movie_theater, 1) + + def has_movie_theater(self) -> StardewRule: + return self.received(CommunityUpgrade.movie_theater, 2) + + def can_use_obelisk(self, obelisk: str) -> StardewRule: + return self.region.can_reach(Region.farm) & self.received(obelisk) + + def has_fruit_bats(self) -> StardewRule: + return self.region.can_reach(Region.farm_cave) & self.received(CommunityUpgrade.fruit_bats) + + def has_mushroom_cave(self) -> StardewRule: + return self.region.can_reach(Region.farm_cave) & self.received(CommunityUpgrade.mushroom_boxes) + + def can_fish_pond(self, fish: str) -> StardewRule: + return self.building.has_building(Building.fish_pond) & self.has(fish) diff --git a/worlds/stardew_valley/logic/logic_and_mods_design.md b/worlds/stardew_valley/logic/logic_and_mods_design.md new file mode 100644 index 000000000000..14716e1af0e1 --- /dev/null +++ b/worlds/stardew_valley/logic/logic_and_mods_design.md @@ -0,0 +1,58 @@ +# Logic mixin + +Mixins are used to split the logic building methods in multiple classes, so it's more scoped and easier to extend specific methods. + +One single instance of Logic is necessary so mods can change the logics. This means that, when calling itself, a `Logic` class has to call its instance in +the `logic`, because it might have been overriden. + +```python +class TimeLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.time = TimeLogic(*args, **kwargs) + + +class TimeLogic(BaseLogic[Union[TimeLogicMixin, ReceivedLogicMixin]]): + + def has_lived_months(self, number: int) -> StardewRule: + return self.logic.received(Event.month_end, number) + + def has_year_two(self) -> StardewRule: + return self.logic.time.has_lived_months(4) + + def has_year_three(self) -> StardewRule: + return self.logic.time.has_lived_months(8) +``` + +Creating the rules for actual items has to be outside the `logic` instance. Once the vanilla logic builder is created, mods will be able to replace the logic +implementations by their own modified version. For instance, the `combat` logic can be replaced by the magic mod to extends its methods to add spells in the +combat logic. + +## Logic class created on the fly (idea) + +The logic class could be created dynamically, based on the `LogicMixin` provided by the content packs. This would allow replacing completely mixins, instead of +overriding their logic afterward. Might be too complicated for no real gain tho... + +# Content pack (idea) + +Instead of using modules to hold the data, and have each mod adding their data to existing content, each mod data should be in a `ContentPack`. Vanilla, Ginger +Island, or anything that could be disabled would be in a content pack as well. + +Eventually, Vanilla content could even be disabled (a split would be required for items that are necessary to all content packs) to have a Ginger Island only +play through created without the heavy vanilla logic computation. + +## Unpacking + +Steps to unpack content follows the same steps has the world initialisation. Content pack however need to be unpacked in a specific order, based on their +dependencies. Vanilla would always be first, then anything that depends only on Vanilla, etc. + +1. In `generate_early`, content packs are selected. The logic builders are created and content packs are unpacked so all their content is in the proper + item/npc/weapon lists. + - `ContentPack` instances are shared across players. However, some mods need to modify content of other packs. In that case, an instance of the content is + created specifically for that player (For instance, SVE changes the Wizard). This probably does not happen enough to require sharing those instances. If + necessary, a FlyWeight design pattern could be used. +2. In `create_regions`, AP regions and entrances are unpacked, and randomized if needed. +3. In `create_items`, AP items are unpacked, and randomized. +4. In `set_rules`, the rules are applied to the AP entrances and locations. Each content pack have to apply the proper rules for their entrances and locations. + - (idea) To begin this step, sphere 0 could be simplified instantly as sphere 0 regions and items are already known. +5. Nothing to do in `generate_basic`. diff --git a/worlds/stardew_valley/logic/mine_logic.py b/worlds/stardew_valley/logic/mine_logic.py new file mode 100644 index 000000000000..2c2eaabfd8ee --- /dev/null +++ b/worlds/stardew_valley/logic/mine_logic.py @@ -0,0 +1,86 @@ +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .combat_logic import CombatLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .skill_logic import SkillLogicMixin +from .tool_logic import ToolLogicMixin +from .. import options +from ..options import ToolProgression +from ..stardew_rule import StardewRule, And, True_ +from ..strings.performance_names import Performance +from ..strings.region_names import Region +from ..strings.skill_names import Skill +from ..strings.tool_names import Tool, ToolMaterial + + +class MineLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.mine = MineLogic(*args, **kwargs) + + +class MineLogic(BaseLogic[Union[MineLogicMixin, RegionLogicMixin, ReceivedLogicMixin, CombatLogicMixin, ToolLogicMixin, SkillLogicMixin]]): + # Regions + def can_mine_in_the_mines_floor_1_40(self) -> StardewRule: + return self.logic.region.can_reach(Region.mines_floor_5) + + def can_mine_in_the_mines_floor_41_80(self) -> StardewRule: + return self.logic.region.can_reach(Region.mines_floor_45) + + def can_mine_in_the_mines_floor_81_120(self) -> StardewRule: + return self.logic.region.can_reach(Region.mines_floor_85) + + def can_mine_in_the_skull_cavern(self) -> StardewRule: + return (self.logic.mine.can_progress_in_the_mines_from_floor(120) & + self.logic.region.can_reach(Region.skull_cavern)) + + @cache_self1 + def get_weapon_rule_for_floor_tier(self, tier: int): + if tier >= 4: + return self.logic.combat.can_fight_at_level(Performance.galaxy) + if tier >= 3: + return self.logic.combat.can_fight_at_level(Performance.great) + if tier >= 2: + return self.logic.combat.can_fight_at_level(Performance.good) + if tier >= 1: + return self.logic.combat.can_fight_at_level(Performance.decent) + return self.logic.combat.can_fight_at_level(Performance.basic) + + @cache_self1 + def can_progress_in_the_mines_from_floor(self, floor: int) -> StardewRule: + tier = floor // 40 + rules = [] + weapon_rule = self.logic.mine.get_weapon_rule_for_floor_tier(tier) + rules.append(weapon_rule) + if self.options.tool_progression & ToolProgression.option_progressive: + rules.append(self.logic.tool.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier])) + if self.options.skill_progression == options.SkillProgression.option_progressive: + skill_tier = min(10, max(0, tier * 2)) + rules.append(self.logic.skill.has_level(Skill.combat, skill_tier)) + rules.append(self.logic.skill.has_level(Skill.mining, skill_tier)) + return And(*rules) + + @cache_self1 + def has_mine_elevator_to_floor(self, floor: int) -> StardewRule: + if floor < 0: + floor = 0 + if self.options.elevator_progression != options.ElevatorProgression.option_vanilla: + return self.logic.received("Progressive Mine Elevator", floor // 5) + return True_() + + @cache_self1 + def can_progress_in_the_skull_cavern_from_floor(self, floor: int) -> StardewRule: + tier = floor // 50 + rules = [] + weapon_rule = self.logic.combat.has_great_weapon + rules.append(weapon_rule) + if self.options.tool_progression & ToolProgression.option_progressive: + rules.append(self.logic.received("Progressive Pickaxe", min(4, max(0, tier + 2)))) + if self.options.skill_progression == options.SkillProgression.option_progressive: + skill_tier = min(10, max(0, tier * 2 + 6)) + rules.extend({self.logic.skill.has_level(Skill.combat, skill_tier), + self.logic.skill.has_level(Skill.mining, skill_tier)}) + return And(*rules) diff --git a/worlds/stardew_valley/logic/money_logic.py b/worlds/stardew_valley/logic/money_logic.py new file mode 100644 index 000000000000..92945a3636a8 --- /dev/null +++ b/worlds/stardew_valley/logic/money_logic.py @@ -0,0 +1,99 @@ +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .buff_logic import BuffLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .time_logic import TimeLogicMixin +from ..options import SpecialOrderLocations +from ..stardew_rule import StardewRule, True_, HasProgressionPercent, False_ +from ..strings.ap_names.event_names import Event +from ..strings.currency_names import Currency +from ..strings.region_names import Region + +qi_gem_rewards = ("100 Qi Gems", "50 Qi Gems", "40 Qi Gems", "35 Qi Gems", "25 Qi Gems", + "20 Qi Gems", "15 Qi Gems", "10 Qi Gems") + + +class MoneyLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.money = MoneyLogic(*args, **kwargs) + + +class MoneyLogic(BaseLogic[Union[RegionLogicMixin, MoneyLogicMixin, TimeLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin, BuffLogicMixin]]): + + @cache_self1 + def can_have_earned_total(self, amount: int) -> StardewRule: + if amount < 1000: + return True_() + + pierre_rule = self.logic.region.can_reach_all((Region.pierre_store, Region.forest)) + willy_rule = self.logic.region.can_reach_all((Region.fish_shop, Region.fishing)) + clint_rule = self.logic.region.can_reach_all((Region.blacksmith, Region.mines_floor_5)) + robin_rule = self.logic.region.can_reach_all((Region.carpenter, Region.secret_woods)) + shipping_rule = self.logic.received(Event.can_ship_items) + + if amount < 2000: + selling_any_rule = pierre_rule | willy_rule | clint_rule | robin_rule | shipping_rule + return selling_any_rule + + if amount < 5000: + selling_all_rule = (pierre_rule & willy_rule & clint_rule & robin_rule) | shipping_rule + return selling_all_rule + + if amount < 10000: + return shipping_rule + + seed_rules = self.logic.received(Event.can_shop_at_pierre) + if amount < 40000: + return shipping_rule & seed_rules + + percent_progression_items_needed = min(90, amount // 20000) + return shipping_rule & seed_rules & HasProgressionPercent(self.player, percent_progression_items_needed) + + @cache_self1 + def can_spend(self, amount: int) -> StardewRule: + if self.options.starting_money == -1: + return True_() + return self.logic.money.can_have_earned_total(amount * 5) + + # Should be cached + def can_spend_at(self, region: str, amount: int) -> StardewRule: + return self.logic.region.can_reach(region) & self.logic.money.can_spend(amount) + + # Should be cached + def can_trade(self, currency: str, amount: int) -> StardewRule: + if amount == 0: + return True_() + if currency == Currency.money: + return self.can_spend(amount) + if currency == Currency.star_token: + return self.logic.region.can_reach(Region.fair) + if currency == Currency.qi_coin: + return self.logic.region.can_reach(Region.casino) & self.logic.buff.has_max_luck() + if currency == Currency.qi_gem: + if self.options.special_order_locations == SpecialOrderLocations.option_board_qi: + number_rewards = min(len(qi_gem_rewards), max(1, (amount // 10))) + return self.logic.received_n(*qi_gem_rewards, count=number_rewards) + number_rewards = 2 + return self.logic.received_n(*qi_gem_rewards, count=number_rewards) & self.logic.region.can_reach(Region.qi_walnut_room) & \ + self.logic.region.can_reach(Region.saloon) & self.can_have_earned_total(5000) + if currency == Currency.golden_walnut: + return self.can_spend_walnut(amount) + + return self.logic.has(currency) & self.logic.time.has_lived_months(amount) + + # Should be cached + def can_trade_at(self, region: str, currency: str, amount: int) -> StardewRule: + if amount == 0: + return True_() + if currency == Currency.money: + return self.logic.money.can_spend_at(region, amount) + + return self.logic.region.can_reach(region) & self.can_trade(currency, amount) + + def can_spend_walnut(self, amount: int) -> StardewRule: + return False_() diff --git a/worlds/stardew_valley/logic/monster_logic.py b/worlds/stardew_valley/logic/monster_logic.py new file mode 100644 index 000000000000..790f492347e6 --- /dev/null +++ b/worlds/stardew_valley/logic/monster_logic.py @@ -0,0 +1,69 @@ +from functools import cached_property +from typing import Iterable, Union, Hashable + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .combat_logic import CombatLogicMixin +from .region_logic import RegionLogicMixin +from .time_logic import TimeLogicMixin, MAX_MONTHS +from .. import options +from ..data import monster_data +from ..stardew_rule import StardewRule, Or, And +from ..strings.region_names import Region + + +class MonsterLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.monster = MonsterLogic(*args, **kwargs) + + +class MonsterLogic(BaseLogic[Union[MonsterLogicMixin, RegionLogicMixin, CombatLogicMixin, TimeLogicMixin]]): + + @cached_property + def all_monsters_by_name(self): + return monster_data.all_monsters_by_name_given_mods(self.options.mods.value) + + @cached_property + def all_monsters_by_category(self): + return monster_data.all_monsters_by_category_given_mods(self.options.mods.value) + + def can_kill(self, monster: Union[str, monster_data.StardewMonster], amount_tier: int = 0) -> StardewRule: + if isinstance(monster, str): + monster = self.all_monsters_by_name[monster] + region_rule = self.logic.region.can_reach_any(monster.locations) + combat_rule = self.logic.combat.can_fight_at_level(monster.difficulty) + if amount_tier <= 0: + amount_tier = 0 + time_rule = self.logic.time.has_lived_months(amount_tier) + return region_rule & combat_rule & time_rule + + @cache_self1 + def can_kill_many(self, monster: monster_data.StardewMonster) -> StardewRule: + return self.logic.monster.can_kill(monster, MAX_MONTHS / 3) + + @cache_self1 + def can_kill_max(self, monster: monster_data.StardewMonster) -> StardewRule: + return self.logic.monster.can_kill(monster, MAX_MONTHS) + + # Should be cached + def can_kill_any(self, monsters: (Iterable[monster_data.StardewMonster], Hashable), amount_tier: int = 0) -> StardewRule: + rules = [self.logic.monster.can_kill(monster, amount_tier) for monster in monsters] + return Or(*rules) + + # Should be cached + def can_kill_all(self, monsters: (Iterable[monster_data.StardewMonster], Hashable), amount_tier: int = 0) -> StardewRule: + rules = [self.logic.monster.can_kill(monster, amount_tier) for monster in monsters] + return And(*rules) + + def can_complete_all_monster_slaying_goals(self) -> StardewRule: + rules = [self.logic.time.has_lived_max_months] + exclude_island = self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_true + island_regions = [Region.volcano_floor_5, Region.volcano_floor_10, Region.island_west, Region.dangerous_skull_cavern] + for category in self.all_monsters_by_category: + if exclude_island and all(all(location in island_regions for location in monster.locations) + for monster in self.all_monsters_by_category[category]): + continue + rules.append(self.logic.monster.can_kill_any(self.all_monsters_by_category[category])) + + return And(*rules) diff --git a/worlds/stardew_valley/logic/museum_logic.py b/worlds/stardew_valley/logic/museum_logic.py new file mode 100644 index 000000000000..59ef0f6499c1 --- /dev/null +++ b/worlds/stardew_valley/logic/museum_logic.py @@ -0,0 +1,80 @@ +from typing import Union + +from Utils import cache_self1 +from .action_logic import ActionLogicMixin +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .. import options +from ..data.museum_data import MuseumItem, all_museum_items, all_museum_artifacts, all_museum_minerals +from ..stardew_rule import StardewRule, And, False_ +from ..strings.region_names import Region + + +class MuseumLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.museum = MuseumLogic(*args, **kwargs) + + +class MuseumLogic(BaseLogic[Union[ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, ActionLogicMixin, MuseumLogicMixin]]): + + def can_donate_museum_items(self, number: int) -> StardewRule: + return self.logic.region.can_reach(Region.museum) & self.logic.museum.can_find_museum_items(number) + + def can_donate_museum_artifacts(self, number: int) -> StardewRule: + return self.logic.region.can_reach(Region.museum) & self.logic.museum.can_find_museum_artifacts(number) + + @cache_self1 + def can_find_museum_item(self, item: MuseumItem) -> StardewRule: + if item.locations: + region_rule = self.logic.region.can_reach_all_except_one(item.locations) + else: + region_rule = False_() + if item.geodes: + geodes_rule = And(*(self.logic.action.can_open_geode(geode) for geode in item.geodes)) + else: + geodes_rule = False_() + # monster_rule = self.can_farm_monster(item.monsters) + # extra_rule = True_() + pan_rule = False_() + if item.item_name == "Earth Crystal" or item.item_name == "Fire Quartz" or item.item_name == "Frozen Tear": + pan_rule = self.logic.action.can_pan() + return pan_rule | region_rule | geodes_rule # & monster_rule & extra_rule + + def can_find_museum_artifacts(self, number: int) -> StardewRule: + rules = [] + for artifact in all_museum_artifacts: + rules.append(self.logic.museum.can_find_museum_item(artifact)) + + return self.logic.count(number, *rules) + + def can_find_museum_minerals(self, number: int) -> StardewRule: + rules = [] + for mineral in all_museum_minerals: + rules.append(self.logic.museum.can_find_museum_item(mineral)) + + return self.logic.count(number, *rules) + + def can_find_museum_items(self, number: int) -> StardewRule: + rules = [] + for donation in all_museum_items: + rules.append(self.logic.museum.can_find_museum_item(donation)) + + return self.logic.count(number, *rules) + + def can_complete_museum(self) -> StardewRule: + rules = [self.logic.region.can_reach(Region.museum)] + + if self.options.museumsanity == options.Museumsanity.option_none: + rules.append(self.logic.received("Traveling Merchant Metal Detector", 2)) + else: + rules.append(self.logic.received("Traveling Merchant Metal Detector", 3)) + + for donation in all_museum_items: + rules.append(self.logic.museum.can_find_museum_item(donation)) + return And(*rules) & self.logic.region.can_reach(Region.museum) + + def can_donate(self, item: str) -> StardewRule: + return self.logic.has(item) & self.logic.region.can_reach(Region.museum) diff --git a/worlds/stardew_valley/logic/pet_logic.py b/worlds/stardew_valley/logic/pet_logic.py new file mode 100644 index 000000000000..5d7d79a358ca --- /dev/null +++ b/worlds/stardew_valley/logic/pet_logic.py @@ -0,0 +1,50 @@ +import math +from typing import Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .time_logic import TimeLogicMixin +from .tool_logic import ToolLogicMixin +from ..data.villagers_data import Villager +from ..options import Friendsanity +from ..stardew_rule import StardewRule, True_ +from ..strings.region_names import Region +from ..strings.villager_names import NPC + + +class PetLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.pet = PetLogic(*args, **kwargs) + + +class PetLogic(BaseLogic[Union[RegionLogicMixin, ReceivedLogicMixin, TimeLogicMixin, ToolLogicMixin]]): + def has_hearts(self, hearts: int = 1) -> StardewRule: + if hearts <= 0: + return True_() + if self.options.friendsanity == Friendsanity.option_none or self.options.friendsanity == Friendsanity.option_bachelors: + return self.can_befriend_pet(hearts) + return self.received_hearts(NPC.pet, hearts) + + def received_hearts(self, npc: Union[str, Villager], hearts: int) -> StardewRule: + if isinstance(npc, Villager): + return self.received_hearts(npc.name, hearts) + return self.logic.received(self.heart(npc), math.ceil(hearts / self.options.friendsanity_heart_size)) + + def can_befriend_pet(self, hearts: int) -> StardewRule: + if hearts <= 0: + return True_() + points = hearts * 200 + points_per_month = 12 * 14 + points_per_water_month = 18 * 14 + farm_rule = self.logic.region.can_reach(Region.farm) + time_with_water_rule = self.logic.tool.can_water(0) & self.logic.time.has_lived_months(points // points_per_water_month) + time_without_water_rule = self.logic.time.has_lived_months(points // points_per_month) + time_rule = time_with_water_rule | time_without_water_rule + return farm_rule & time_rule + + def heart(self, npc: Union[str, Villager]) -> str: + if isinstance(npc, str): + return f"{npc} <3" + return self.heart(npc.name) diff --git a/worlds/stardew_valley/logic/quest_logic.py b/worlds/stardew_valley/logic/quest_logic.py new file mode 100644 index 000000000000..bc1f731429c6 --- /dev/null +++ b/worlds/stardew_valley/logic/quest_logic.py @@ -0,0 +1,128 @@ +from typing import Dict, Union + +from .base_logic import BaseLogicMixin, BaseLogic +from .building_logic import BuildingLogicMixin +from .combat_logic import CombatLogicMixin +from .cooking_logic import CookingLogicMixin +from .fishing_logic import FishingLogicMixin +from .has_logic import HasLogicMixin +from .mine_logic import MineLogicMixin +from .money_logic import MoneyLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .relationship_logic import RelationshipLogicMixin +from .season_logic import SeasonLogicMixin +from .skill_logic import SkillLogicMixin +from .time_logic import TimeLogicMixin +from .tool_logic import ToolLogicMixin +from .wallet_logic import WalletLogicMixin +from ..stardew_rule import StardewRule, Has, True_ +from ..strings.artisan_good_names import ArtisanGood +from ..strings.building_names import Building +from ..strings.craftable_names import Craftable +from ..strings.crop_names import Fruit, Vegetable +from ..strings.fish_names import Fish +from ..strings.food_names import Meal +from ..strings.forageable_names import Forageable +from ..strings.machine_names import Machine +from ..strings.material_names import Material +from ..strings.metal_names import MetalBar, Ore, Mineral +from ..strings.monster_drop_names import Loot +from ..strings.quest_names import Quest +from ..strings.region_names import Region +from ..strings.season_names import Season +from ..strings.tool_names import Tool +from ..strings.villager_names import NPC +from ..strings.wallet_item_names import Wallet + + +class QuestLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.quest = QuestLogic(*args, **kwargs) + + +class QuestLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, MoneyLogicMixin, MineLogicMixin, RegionLogicMixin, RelationshipLogicMixin, ToolLogicMixin, +FishingLogicMixin, CookingLogicMixin, CombatLogicMixin, SeasonLogicMixin, SkillLogicMixin, WalletLogicMixin, QuestLogicMixin, BuildingLogicMixin, TimeLogicMixin]]): + + def initialize_rules(self): + self.update_rules({ + Quest.introductions: True_(), + Quest.how_to_win_friends: self.logic.quest.can_complete_quest(Quest.introductions), + Quest.getting_started: self.logic.has(Vegetable.parsnip), + Quest.to_the_beach: self.logic.region.can_reach(Region.beach), + Quest.raising_animals: self.logic.quest.can_complete_quest(Quest.getting_started) & self.logic.building.has_building(Building.coop), + Quest.advancement: self.logic.quest.can_complete_quest(Quest.getting_started) & self.logic.has(Craftable.scarecrow), + Quest.archaeology: self.logic.tool.has_tool(Tool.hoe) | self.logic.mine.can_mine_in_the_mines_floor_1_40() | self.logic.skill.can_fish(), + Quest.rat_problem: self.logic.region.can_reach_all((Region.town, Region.community_center)), + Quest.meet_the_wizard: self.logic.quest.can_complete_quest(Quest.rat_problem), + Quest.forging_ahead: self.logic.has(Ore.copper) & self.logic.has(Machine.furnace), + Quest.smelting: self.logic.has(MetalBar.copper), + Quest.initiation: self.logic.mine.can_mine_in_the_mines_floor_1_40(), + Quest.robins_lost_axe: self.logic.season.has(Season.spring) & self.logic.relationship.can_meet(NPC.robin), + Quest.jodis_request: self.logic.season.has(Season.spring) & self.logic.has(Vegetable.cauliflower) & self.logic.relationship.can_meet(NPC.jodi), + Quest.mayors_shorts: self.logic.season.has(Season.summer) & self.logic.relationship.has_hearts(NPC.marnie, 2) & + self.logic.relationship.can_meet(NPC.lewis), + Quest.blackberry_basket: self.logic.season.has(Season.fall) & self.logic.relationship.can_meet(NPC.linus), + Quest.marnies_request: self.logic.relationship.has_hearts(NPC.marnie, 3) & self.logic.has(Forageable.cave_carrot), + Quest.pam_is_thirsty: self.logic.season.has(Season.summer) & self.logic.has(ArtisanGood.pale_ale) & self.logic.relationship.can_meet(NPC.pam), + Quest.a_dark_reagent: self.logic.season.has(Season.winter) & self.logic.has(Loot.void_essence) & self.logic.relationship.can_meet(NPC.wizard), + Quest.cows_delight: self.logic.season.has(Season.fall) & self.logic.has(Vegetable.amaranth) & self.logic.relationship.can_meet(NPC.marnie), + Quest.the_skull_key: self.logic.received(Wallet.skull_key), + Quest.crop_research: self.logic.season.has(Season.summer) & self.logic.has(Fruit.melon) & self.logic.relationship.can_meet(NPC.demetrius), + Quest.knee_therapy: self.logic.season.has(Season.summer) & self.logic.has(Fruit.hot_pepper) & self.logic.relationship.can_meet(NPC.george), + Quest.robins_request: self.logic.season.has(Season.winter) & self.logic.has(Material.hardwood) & self.logic.relationship.can_meet(NPC.robin), + Quest.qis_challenge: True_(), # The skull cavern floor 25 already has rules + Quest.the_mysterious_qi: (self.logic.region.can_reach_all((Region.bus_tunnel, Region.railroad, Region.mayor_house)) & + self.logic.has_all(ArtisanGood.battery_pack, Forageable.rainbow_shell, Vegetable.beet, Loot.solar_essence)), + Quest.carving_pumpkins: self.logic.season.has(Season.fall) & self.logic.has(Vegetable.pumpkin) & self.logic.relationship.can_meet(NPC.caroline), + Quest.a_winter_mystery: self.logic.season.has(Season.winter), + Quest.strange_note: self.logic.has(Forageable.secret_note) & self.logic.has(ArtisanGood.maple_syrup), + Quest.cryptic_note: self.logic.has(Forageable.secret_note), + Quest.fresh_fruit: self.logic.season.has(Season.spring) & self.logic.has(Fruit.apricot) & self.logic.relationship.can_meet(NPC.emily), + Quest.aquatic_research: self.logic.season.has(Season.summer) & self.logic.has(Fish.pufferfish) & self.logic.relationship.can_meet(NPC.demetrius), + Quest.a_soldiers_star: (self.logic.season.has(Season.summer) & self.logic.time.has_year_two & self.logic.has(Fruit.starfruit) & + self.logic.relationship.can_meet(NPC.kent)), + Quest.mayors_need: self.logic.season.has(Season.summer) & self.logic.has(ArtisanGood.truffle_oil) & self.logic.relationship.can_meet(NPC.lewis), + Quest.wanted_lobster: (self.logic.season.has(Season.fall) & self.logic.season.has(Season.fall) & self.logic.has(Fish.lobster) & + self.logic.relationship.can_meet(NPC.gus)), + Quest.pam_needs_juice: self.logic.season.has(Season.fall) & self.logic.has(ArtisanGood.battery_pack) & self.logic.relationship.can_meet(NPC.pam), + Quest.fish_casserole: self.logic.relationship.has_hearts(NPC.jodi, 4) & self.logic.has(Fish.largemouth_bass), + Quest.catch_a_squid: self.logic.season.has(Season.winter) & self.logic.has(Fish.squid) & self.logic.relationship.can_meet(NPC.willy), + Quest.fish_stew: self.logic.season.has(Season.winter) & self.logic.has(Fish.albacore) & self.logic.relationship.can_meet(NPC.gus), + Quest.pierres_notice: self.logic.season.has(Season.spring) & self.logic.has(Meal.sashimi) & self.logic.relationship.can_meet(NPC.pierre), + Quest.clints_attempt: self.logic.season.has(Season.winter) & self.logic.has(Mineral.amethyst) & self.logic.relationship.can_meet(NPC.emily), + Quest.a_favor_for_clint: self.logic.season.has(Season.winter) & self.logic.has(MetalBar.iron) & self.logic.relationship.can_meet(NPC.clint), + Quest.staff_of_power: self.logic.season.has(Season.winter) & self.logic.has(MetalBar.iridium) & self.logic.relationship.can_meet(NPC.wizard), + Quest.grannys_gift: self.logic.season.has(Season.spring) & self.logic.has(Forageable.leek) & self.logic.relationship.can_meet(NPC.evelyn), + Quest.exotic_spirits: self.logic.season.has(Season.winter) & self.logic.has(Forageable.coconut) & self.logic.relationship.can_meet(NPC.gus), + Quest.catch_a_lingcod: self.logic.season.has(Season.winter) & self.logic.has(Fish.lingcod) & self.logic.relationship.can_meet(NPC.willy), + Quest.dark_talisman: self.logic.region.can_reach(Region.railroad) & self.logic.wallet.has_rusty_key() & self.logic.relationship.can_meet( + NPC.krobus), + Quest.goblin_problem: self.logic.region.can_reach(Region.witch_swamp), + Quest.magic_ink: self.logic.relationship.can_meet(NPC.wizard), + Quest.the_pirates_wife: self.logic.relationship.can_meet(NPC.kent) & self.logic.relationship.can_meet(NPC.gus) & + self.logic.relationship.can_meet(NPC.sandy) & self.logic.relationship.can_meet(NPC.george) & + self.logic.relationship.can_meet(NPC.wizard) & self.logic.relationship.can_meet(NPC.willy), + }) + + def update_rules(self, new_rules: Dict[str, StardewRule]): + self.registry.quest_rules.update(new_rules) + + def can_complete_quest(self, quest: str) -> StardewRule: + return Has(quest, self.registry.quest_rules) + + def has_club_card(self) -> StardewRule: + if self.options.quest_locations < 0: + return self.logic.quest.can_complete_quest(Quest.the_mysterious_qi) + return self.logic.received(Wallet.club_card) + + def has_magnifying_glass(self) -> StardewRule: + if self.options.quest_locations < 0: + return self.logic.quest.can_complete_quest(Quest.a_winter_mystery) + return self.logic.received(Wallet.magnifying_glass) + + def has_dark_talisman(self) -> StardewRule: + if self.options.quest_locations < 0: + return self.logic.quest.can_complete_quest(Quest.dark_talisman) + return self.logic.received(Wallet.dark_talisman) diff --git a/worlds/stardew_valley/logic/received_logic.py b/worlds/stardew_valley/logic/received_logic.py new file mode 100644 index 000000000000..66dc078ad46f --- /dev/null +++ b/worlds/stardew_valley/logic/received_logic.py @@ -0,0 +1,35 @@ +from typing import Optional + +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from ..stardew_rule import StardewRule, Received, And, Or, TotalReceived + + +class ReceivedLogicMixin(BaseLogic[HasLogicMixin], BaseLogicMixin): + # Should be cached + def received(self, item: str, count: Optional[int] = 1) -> StardewRule: + assert count >= 0, "Can't receive a negative amount of item." + + return Received(item, self.player, count) + + def received_all(self, *items: str): + assert items, "Can't receive all of no items." + + return And(*(self.received(item) for item in items)) + + def received_any(self, *items: str): + assert items, "Can't receive any of no items." + + return Or(*(self.received(item) for item in items)) + + def received_once(self, *items: str, count: int): + assert items, "Can't receive once of no items." + assert count >= 0, "Can't receive a negative amount of item." + + return self.logic.count(count, *(self.received(item) for item in items)) + + def received_n(self, *items: str, count: int): + assert items, "Can't receive n of no items." + assert count >= 0, "Can't receive a negative amount of item." + + return TotalReceived(count, items, self.player) diff --git a/worlds/stardew_valley/logic/region_logic.py b/worlds/stardew_valley/logic/region_logic.py new file mode 100644 index 000000000000..81dabf45aac5 --- /dev/null +++ b/worlds/stardew_valley/logic/region_logic.py @@ -0,0 +1,65 @@ +from typing import Tuple, Union + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .has_logic import HasLogicMixin +from ..options import EntranceRandomization +from ..stardew_rule import StardewRule, And, Or, Reach, false_, true_ +from ..strings.region_names import Region + +main_outside_area = {Region.menu, Region.stardew_valley, Region.farm_house, Region.farm, Region.town, Region.beach, Region.mountain, Region.forest, + Region.bus_stop, Region.backwoods, Region.bus_tunnel, Region.tunnel_entrance} +always_accessible_regions_without_er = {*main_outside_area, Region.community_center, Region.pantry, Region.crafts_room, Region.fish_tank, Region.boiler_room, + Region.vault, Region.bulletin_board, Region.mines, Region.hospital, Region.carpenter, Region.alex_house, + Region.elliott_house, Region.ranch, Region.farm_cave, Region.wizard_tower, Region.tent, Region.pierre_store, + Region.saloon, Region.blacksmith, Region.trailer, Region.museum, Region.mayor_house, Region.haley_house, + Region.sam_house, Region.jojamart, Region.fish_shop} + +always_regions_by_setting = {EntranceRandomization.option_disabled: always_accessible_regions_without_er, + EntranceRandomization.option_pelican_town: always_accessible_regions_without_er, + EntranceRandomization.option_non_progression: always_accessible_regions_without_er, + EntranceRandomization.option_buildings: main_outside_area, + EntranceRandomization.option_chaos: always_accessible_regions_without_er} + + +class RegionLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.region = RegionLogic(*args, **kwargs) + + +class RegionLogic(BaseLogic[Union[RegionLogicMixin, HasLogicMixin]]): + + @cache_self1 + def can_reach(self, region_name: str) -> StardewRule: + if region_name in always_regions_by_setting[self.options.entrance_randomization]: + return true_ + + if region_name not in self.regions: + return false_ + + return Reach(region_name, "Region", self.player) + + @cache_self1 + def can_reach_any(self, region_names: Tuple[str, ...]) -> StardewRule: + return Or(*(self.logic.region.can_reach(spot) for spot in region_names)) + + @cache_self1 + def can_reach_all(self, region_names: Tuple[str, ...]) -> StardewRule: + return And(*(self.logic.region.can_reach(spot) for spot in region_names)) + + @cache_self1 + def can_reach_all_except_one(self, region_names: Tuple[str, ...]) -> StardewRule: + region_names = list(region_names) + num_required = len(region_names) - 1 + if num_required <= 0: + num_required = len(region_names) + return self.logic.count(num_required, *(self.logic.region.can_reach(spot) for spot in region_names)) + + @cache_self1 + def can_reach_location(self, location_name: str) -> StardewRule: + return Reach(location_name, "Location", self.player) + + # @cache_self1 + # def can_reach_entrance(self, entrance_name: str) -> StardewRule: + # return Reach(entrance_name, "Entrance", self.player) diff --git a/worlds/stardew_valley/logic/relationship_logic.py b/worlds/stardew_valley/logic/relationship_logic.py new file mode 100644 index 000000000000..fb0267bddb1a --- /dev/null +++ b/worlds/stardew_valley/logic/relationship_logic.py @@ -0,0 +1,185 @@ +import math +from functools import cached_property +from typing import Union, List + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .building_logic import BuildingLogicMixin +from .gift_logic import GiftLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .season_logic import SeasonLogicMixin +from .time_logic import TimeLogicMixin +from ..data.villagers_data import all_villagers_by_name, Villager, get_villagers_for_mods +from ..options import Friendsanity +from ..stardew_rule import StardewRule, True_, And, Or +from ..strings.ap_names.mods.mod_items import SVEQuestItem +from ..strings.crop_names import Fruit +from ..strings.generic_names import Generic +from ..strings.gift_names import Gift +from ..strings.region_names import Region +from ..strings.season_names import Season +from ..strings.villager_names import NPC, ModNPC + +possible_kids = ("Cute Baby", "Ugly Baby") + + +def heart_item_name(npc: Union[str, Villager]) -> str: + if isinstance(npc, Villager): + npc = npc.name + + return f"{npc} <3" + + +class RelationshipLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.relationship = RelationshipLogic(*args, **kwargs) + + +class RelationshipLogic(BaseLogic[Union[ + RelationshipLogicMixin, BuildingLogicMixin, SeasonLogicMixin, TimeLogicMixin, GiftLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin]]): + + @cached_property + def all_villagers_given_mods(self) -> List[Villager]: + return get_villagers_for_mods(self.options.mods.value) + + def can_date(self, npc: str) -> StardewRule: + return self.logic.relationship.has_hearts(npc, 8) & self.logic.has(Gift.bouquet) + + def can_marry(self, npc: str) -> StardewRule: + return self.logic.relationship.has_hearts(npc, 10) & self.logic.has(Gift.mermaid_pendant) + + def can_get_married(self) -> StardewRule: + return self.logic.relationship.has_hearts(Generic.bachelor, 10) & self.logic.has(Gift.mermaid_pendant) + + def has_children(self, number_children: int) -> StardewRule: + if number_children <= 0: + return True_() + if self.options.friendsanity == Friendsanity.option_none: + return self.logic.relationship.can_reproduce(number_children) + return self.logic.received_n(*possible_kids, count=number_children) & self.logic.building.has_house(2) + + def can_reproduce(self, number_children: int = 1) -> StardewRule: + if number_children <= 0: + return True_() + baby_rules = [self.logic.relationship.can_get_married(), self.logic.building.has_house(2), self.logic.relationship.has_hearts(Generic.bachelor, 12), + self.logic.relationship.has_children(number_children - 1)] + return And(*baby_rules) + + # Should be cached + def has_hearts(self, npc: str, hearts: int = 1) -> StardewRule: + if hearts <= 0: + return True_() + if self.options.friendsanity == Friendsanity.option_none: + return self.logic.relationship.can_earn_relationship(npc, hearts) + if npc not in all_villagers_by_name: + if npc == Generic.any or npc == Generic.bachelor: + possible_friends = [] + for name in all_villagers_by_name: + if not self.npc_is_in_current_slot(name): + continue + if npc == Generic.any or all_villagers_by_name[name].bachelor: + possible_friends.append(self.logic.relationship.has_hearts(name, hearts)) + return Or(*possible_friends) + if npc == Generic.all: + mandatory_friends = [] + for name in all_villagers_by_name: + if not self.npc_is_in_current_slot(name): + continue + mandatory_friends.append(self.logic.relationship.has_hearts(name, hearts)) + return And(*mandatory_friends) + if npc.isnumeric(): + possible_friends = [] + for name in all_villagers_by_name: + if not self.npc_is_in_current_slot(name): + continue + possible_friends.append(self.logic.relationship.has_hearts(name, hearts)) + return self.logic.count(int(npc), *possible_friends) + return self.can_earn_relationship(npc, hearts) + + if not self.npc_is_in_current_slot(npc): + return True_() + villager = all_villagers_by_name[npc] + if self.options.friendsanity == Friendsanity.option_bachelors and not villager.bachelor: + return self.logic.relationship.can_earn_relationship(npc, hearts) + if self.options.friendsanity == Friendsanity.option_starting_npcs and not villager.available: + return self.logic.relationship.can_earn_relationship(npc, hearts) + is_capped_at_8 = villager.bachelor and self.options.friendsanity != Friendsanity.option_all_with_marriage + if is_capped_at_8 and hearts > 8: + return self.logic.relationship.received_hearts(villager.name, 8) & self.logic.relationship.can_earn_relationship(npc, hearts) + return self.logic.relationship.received_hearts(villager.name, hearts) + + # Should be cached + def received_hearts(self, npc: str, hearts: int) -> StardewRule: + heart_item = heart_item_name(npc) + number_required = math.ceil(hearts / self.options.friendsanity_heart_size) + return self.logic.received(heart_item, number_required) + + @cache_self1 + def can_meet(self, npc: str) -> StardewRule: + if npc not in all_villagers_by_name or not self.npc_is_in_current_slot(npc): + return True_() + villager = all_villagers_by_name[npc] + rules = [self.logic.region.can_reach_any(villager.locations)] + if npc == NPC.kent: + rules.append(self.logic.time.has_year_two) + elif npc == NPC.leo: + rules.append(self.logic.received("Island West Turtle")) + elif npc == ModNPC.lance: + rules.append(self.logic.region.can_reach(Region.volcano_floor_10)) + elif npc == ModNPC.apples: + rules.append(self.logic.has(Fruit.starfruit)) + elif npc == ModNPC.scarlett: + scarlett_job = self.logic.received(SVEQuestItem.scarlett_job_offer) + scarlett_spring = self.logic.season.has(Season.spring) & self.can_meet(ModNPC.andy) + scarlett_summer = self.logic.season.has(Season.summer) & self.can_meet(ModNPC.susan) + scarlett_fall = self.logic.season.has(Season.fall) & self.can_meet(ModNPC.sophia) + rules.append(scarlett_job & (scarlett_spring | scarlett_summer | scarlett_fall)) + elif npc == ModNPC.morgan: + rules.append(self.logic.received(SVEQuestItem.morgan_schooling)) + elif npc == ModNPC.goblin: + rules.append(self.logic.region.can_reach_all((Region.witch_hut, Region.wizard_tower))) + + return And(*rules) + + def can_give_loved_gifts_to_everyone(self) -> StardewRule: + rules = [] + for npc in all_villagers_by_name: + if not self.npc_is_in_current_slot(npc): + continue + meet_rule = self.logic.relationship.can_meet(npc) + rules.append(meet_rule) + rules.append(self.logic.gifts.has_any_universal_love) + return And(*rules) + + # Should be cached + def can_earn_relationship(self, npc: str, hearts: int = 0) -> StardewRule: + if hearts <= 0: + return True_() + + previous_heart = hearts - self.options.friendsanity_heart_size + previous_heart_rule = self.logic.relationship.has_hearts(npc, previous_heart) + + if npc not in all_villagers_by_name or not self.npc_is_in_current_slot(npc): + return previous_heart_rule + + rules = [previous_heart_rule, self.logic.relationship.can_meet(npc)] + villager = all_villagers_by_name[npc] + if hearts > 2 or hearts > self.options.friendsanity_heart_size: + rules.append(self.logic.season.has(villager.birthday)) + if villager.birthday == Generic.any: + rules.append(self.logic.season.has_all() | self.logic.time.has_year_three) # push logic back for any birthday-less villager + if villager.bachelor: + if hearts > 8: + rules.append(self.logic.relationship.can_date(npc)) + if hearts > 10: + rules.append(self.logic.relationship.can_marry(npc)) + + return And(*rules) + + @cache_self1 + def npc_is_in_current_slot(self, name: str) -> bool: + npc = all_villagers_by_name[name] + return npc in self.all_villagers_given_mods diff --git a/worlds/stardew_valley/logic/season_logic.py b/worlds/stardew_valley/logic/season_logic.py new file mode 100644 index 000000000000..1953502099b4 --- /dev/null +++ b/worlds/stardew_valley/logic/season_logic.py @@ -0,0 +1,44 @@ +from typing import Iterable, Union + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .received_logic import ReceivedLogicMixin +from .time_logic import TimeLogicMixin +from ..options import SeasonRandomization +from ..stardew_rule import StardewRule, True_, Or, And +from ..strings.generic_names import Generic +from ..strings.season_names import Season + + +class SeasonLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.season = SeasonLogic(*args, **kwargs) + + +class SeasonLogic(BaseLogic[Union[SeasonLogicMixin, TimeLogicMixin, ReceivedLogicMixin]]): + + @cache_self1 + def has(self, season: str) -> StardewRule: + if season == Generic.any: + return True_() + seasons_order = [Season.spring, Season.summer, Season.fall, Season.winter] + if self.options.season_randomization == SeasonRandomization.option_progressive: + return self.logic.received(Season.progressive, seasons_order.index(season)) + if self.options.season_randomization == SeasonRandomization.option_disabled: + if season == Season.spring: + return True_() + return self.logic.time.has_lived_months(1) + return self.logic.received(season) + + def has_any(self, seasons: Iterable[str]): + if not seasons: + return True_() + return Or(*(self.logic.season.has(season) for season in seasons)) + + def has_any_not_winter(self): + return self.logic.season.has_any([Season.spring, Season.summer, Season.fall]) + + def has_all(self): + seasons = [Season.spring, Season.summer, Season.fall, Season.winter] + return And(*(self.logic.season.has(season) for season in seasons)) diff --git a/worlds/stardew_valley/logic/shipping_logic.py b/worlds/stardew_valley/logic/shipping_logic.py new file mode 100644 index 000000000000..52c97561b326 --- /dev/null +++ b/worlds/stardew_valley/logic/shipping_logic.py @@ -0,0 +1,60 @@ +from functools import cached_property +from typing import Union, List + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .building_logic import BuildingLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from ..locations import LocationTags, locations_by_tag +from ..options import ExcludeGingerIsland, Shipsanity +from ..options import SpecialOrderLocations +from ..stardew_rule import StardewRule, And +from ..strings.ap_names.event_names import Event +from ..strings.building_names import Building + + +class ShippingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.shipping = ShippingLogic(*args, **kwargs) + + +class ShippingLogic(BaseLogic[Union[ReceivedLogicMixin, ShippingLogicMixin, BuildingLogicMixin, RegionLogicMixin, HasLogicMixin]]): + + @cached_property + def can_use_shipping_bin(self) -> StardewRule: + return self.logic.building.has_building(Building.shipping_bin) + + @cache_self1 + def can_ship(self, item: str) -> StardewRule: + return self.logic.received(Event.can_ship_items) & self.logic.has(item) + + def can_ship_everything(self) -> StardewRule: + shipsanity_prefix = "Shipsanity: " + all_items_to_ship = [] + exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true + exclude_qi = self.options.special_order_locations != SpecialOrderLocations.option_board_qi + mod_list = self.options.mods.value + for location in locations_by_tag[LocationTags.SHIPSANITY_FULL_SHIPMENT]: + if exclude_island and LocationTags.GINGER_ISLAND in location.tags: + continue + if exclude_qi and LocationTags.REQUIRES_QI_ORDERS in location.tags: + continue + if location.mod_name and location.mod_name not in mod_list: + continue + all_items_to_ship.append(location.name[len(shipsanity_prefix):]) + return self.logic.building.has_building(Building.shipping_bin) & self.logic.has_all(*all_items_to_ship) + + def can_ship_everything_in_slot(self, all_location_names_in_slot: List[str]) -> StardewRule: + if self.options.shipsanity == Shipsanity.option_none: + return self.can_ship_everything() + + rules = [self.logic.building.has_building(Building.shipping_bin)] + + for shipsanity_location in locations_by_tag[LocationTags.SHIPSANITY]: + if shipsanity_location.name not in all_location_names_in_slot: + continue + rules.append(self.logic.region.can_reach_location(shipsanity_location.name)) + return And(*rules) diff --git a/worlds/stardew_valley/logic/skill_logic.py b/worlds/stardew_valley/logic/skill_logic.py new file mode 100644 index 000000000000..9134dfae40bf --- /dev/null +++ b/worlds/stardew_valley/logic/skill_logic.py @@ -0,0 +1,172 @@ +from functools import cached_property +from typing import Union, Tuple + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .combat_logic import CombatLogicMixin +from .crop_logic import CropLogicMixin +from .has_logic import HasLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .season_logic import SeasonLogicMixin +from .time_logic import TimeLogicMixin +from .tool_logic import ToolLogicMixin +from .. import options +from ..data import all_crops +from ..mods.logic.magic_logic import MagicLogicMixin +from ..mods.logic.mod_skills_levels import get_mod_skill_levels +from ..stardew_rule import StardewRule, True_, Or, False_ +from ..strings.craftable_names import Fishing +from ..strings.machine_names import Machine +from ..strings.performance_names import Performance +from ..strings.quality_names import ForageQuality +from ..strings.region_names import Region +from ..strings.skill_names import Skill, all_mod_skills +from ..strings.tool_names import ToolMaterial, Tool + +fishing_regions = (Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west) + + +class SkillLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.skill = SkillLogic(*args, **kwargs) + + +class SkillLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, TimeLogicMixin, ToolLogicMixin, SkillLogicMixin, +CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]): + # Should be cached + def can_earn_level(self, skill: str, level: int) -> StardewRule: + if level <= 0: + return True_() + + tool_level = (level - 1) // 2 + tool_material = ToolMaterial.tiers[tool_level] + months = max(1, level - 1) + months_rule = self.logic.time.has_lived_months(months) + previous_level_rule = self.logic.skill.has_level(skill, level - 1) + + if skill == Skill.fishing: + xp_rule = self.logic.tool.has_tool(Tool.fishing_rod, ToolMaterial.tiers[max(tool_level, 3)]) + elif skill == Skill.farming: + xp_rule = self.logic.tool.has_tool(Tool.hoe, tool_material) & self.logic.tool.can_water(tool_level) + elif skill == Skill.foraging: + xp_rule = self.logic.tool.has_tool(Tool.axe, tool_material) | self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level) + elif skill == Skill.mining: + xp_rule = self.logic.tool.has_tool(Tool.pickaxe, tool_material) | \ + self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level) + xp_rule = xp_rule & self.logic.region.can_reach(Region.mines_floor_5) + elif skill == Skill.combat: + combat_tier = Performance.tiers[tool_level] + xp_rule = self.logic.combat.can_fight_at_level(combat_tier) + xp_rule = xp_rule & self.logic.region.can_reach(Region.mines_floor_5) + elif skill in all_mod_skills: + # Ideal solution would be to add a logic registry, but I'm too lazy. + return self.logic.mod.skill.can_earn_mod_skill_level(skill, level) + else: + raise Exception(f"Unknown skill: {skill}") + + return previous_level_rule & months_rule & xp_rule + + # Should be cached + def has_level(self, skill: str, level: int) -> StardewRule: + if level <= 0: + return True_() + + if self.options.skill_progression == options.SkillProgression.option_progressive: + return self.logic.received(f"{skill} Level", level) + + return self.logic.skill.can_earn_level(skill, level) + + @cache_self1 + def has_farming_level(self, level: int) -> StardewRule: + return self.logic.skill.has_level(Skill.farming, level) + + # Should be cached + def has_total_level(self, level: int, allow_modded_skills: bool = False) -> StardewRule: + if level <= 0: + return True_() + + if self.options.skill_progression == options.SkillProgression.option_progressive: + skills_items = ("Farming Level", "Mining Level", "Foraging Level", "Fishing Level", "Combat Level") + if allow_modded_skills: + skills_items += get_mod_skill_levels(self.options.mods) + return self.logic.received_n(*skills_items, count=level) + + months_with_4_skills = max(1, (level // 4) - 1) + months_with_5_skills = max(1, (level // 5) - 1) + rule_with_fishing = self.logic.time.has_lived_months(months_with_5_skills) & self.logic.skill.can_get_fishing_xp + if level > 40: + return rule_with_fishing + return self.logic.time.has_lived_months(months_with_4_skills) | rule_with_fishing + + @cached_property + def can_get_farming_xp(self) -> StardewRule: + crop_rules = [] + for crop in all_crops: + crop_rules.append(self.logic.crop.can_grow(crop)) + return Or(*crop_rules) + + @cached_property + def can_get_foraging_xp(self) -> StardewRule: + tool_rule = self.logic.tool.has_tool(Tool.axe) + tree_rule = self.logic.region.can_reach(Region.forest) & self.logic.season.has_any_not_winter() + stump_rule = self.logic.region.can_reach(Region.secret_woods) & self.logic.tool.has_tool(Tool.axe, ToolMaterial.copper) + return tool_rule & (tree_rule | stump_rule) + + @cached_property + def can_get_mining_xp(self) -> StardewRule: + tool_rule = self.logic.tool.has_tool(Tool.pickaxe) + stone_rule = self.logic.region.can_reach_any((Region.mines_floor_5, Region.quarry, Region.skull_cavern_25, Region.volcano_floor_5)) + return tool_rule & stone_rule + + @cached_property + def can_get_combat_xp(self) -> StardewRule: + tool_rule = self.logic.combat.has_any_weapon() + enemy_rule = self.logic.region.can_reach_any((Region.mines_floor_5, Region.skull_cavern_25, Region.volcano_floor_5)) + return tool_rule & enemy_rule + + @cached_property + def can_get_fishing_xp(self) -> StardewRule: + if self.options.skill_progression == options.SkillProgression.option_progressive: + return self.logic.skill.can_fish() | self.logic.skill.can_crab_pot + + return self.logic.skill.can_fish() + + # Should be cached + def can_fish(self, regions: Union[str, Tuple[str, ...]] = None, difficulty: int = 0) -> StardewRule: + if isinstance(regions, str): + regions = regions, + if regions is None or len(regions) == 0: + regions = fishing_regions + skill_required = min(10, max(0, int((difficulty / 10) - 1))) + if difficulty <= 40: + skill_required = 0 + skill_rule = self.logic.skill.has_level(Skill.fishing, skill_required) + region_rule = self.logic.region.can_reach_any(regions) + number_fishing_rod_required = 1 if difficulty < 50 else (2 if difficulty < 80 else 4) + return self.logic.tool.has_fishing_rod(number_fishing_rod_required) & skill_rule & region_rule + + @cache_self1 + def can_crab_pot_at(self, region: str) -> StardewRule: + return self.logic.skill.can_crab_pot & self.logic.region.can_reach(region) + + @cached_property + def can_crab_pot(self) -> StardewRule: + crab_pot_rule = self.logic.has(Fishing.bait) + if self.options.skill_progression == options.SkillProgression.option_progressive: + crab_pot_rule = crab_pot_rule & self.logic.has(Machine.crab_pot) + else: + crab_pot_rule = crab_pot_rule & self.logic.skill.can_get_fishing_xp + + water_region_rules = self.logic.region.can_reach_any(fishing_regions) + return crab_pot_rule & water_region_rules + + def can_forage_quality(self, quality: str) -> StardewRule: + if quality == ForageQuality.basic: + return True_() + if quality == ForageQuality.silver: + return self.has_level(Skill.foraging, 5) + if quality == ForageQuality.gold: + return self.has_level(Skill.foraging, 9) + return False_() diff --git a/worlds/stardew_valley/logic/special_order_logic.py b/worlds/stardew_valley/logic/special_order_logic.py new file mode 100644 index 000000000000..e0b1a7e2fb27 --- /dev/null +++ b/worlds/stardew_valley/logic/special_order_logic.py @@ -0,0 +1,111 @@ +from typing import Dict, Union + +from .ability_logic import AbilityLogicMixin +from .arcade_logic import ArcadeLogicMixin +from .artisan_logic import ArtisanLogicMixin +from .base_logic import BaseLogicMixin, BaseLogic +from .buff_logic import BuffLogicMixin +from .cooking_logic import CookingLogicMixin +from .has_logic import HasLogicMixin +from .mine_logic import MineLogicMixin +from .money_logic import MoneyLogicMixin +from .monster_logic import MonsterLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .relationship_logic import RelationshipLogicMixin +from .season_logic import SeasonLogicMixin +from .shipping_logic import ShippingLogicMixin +from .skill_logic import SkillLogicMixin +from .time_logic import TimeLogicMixin +from .tool_logic import ToolLogicMixin +from ..stardew_rule import StardewRule, Has +from ..strings.animal_product_names import AnimalProduct +from ..strings.ap_names.event_names import Event +from ..strings.ap_names.transport_names import Transportation +from ..strings.artisan_good_names import ArtisanGood +from ..strings.crop_names import Vegetable, Fruit +from ..strings.fertilizer_names import Fertilizer +from ..strings.fish_names import Fish +from ..strings.forageable_names import Forageable +from ..strings.machine_names import Machine +from ..strings.material_names import Material +from ..strings.metal_names import Mineral +from ..strings.monster_drop_names import Loot +from ..strings.monster_names import Monster +from ..strings.region_names import Region +from ..strings.season_names import Season +from ..strings.special_order_names import SpecialOrder +from ..strings.tool_names import Tool +from ..strings.villager_names import NPC + + +class SpecialOrderLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.special_order = SpecialOrderLogic(*args, **kwargs) + + +class SpecialOrderLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, TimeLogicMixin, MoneyLogicMixin, +ShippingLogicMixin, ArcadeLogicMixin, ArtisanLogicMixin, RelationshipLogicMixin, ToolLogicMixin, SkillLogicMixin, +MineLogicMixin, CookingLogicMixin, BuffLogicMixin, +AbilityLogicMixin, SpecialOrderLogicMixin, MonsterLogicMixin]]): + + def initialize_rules(self): + self.update_rules({ + SpecialOrder.island_ingredients: self.logic.relationship.can_meet(NPC.caroline) & self.logic.special_order.has_island_transport() & + self.logic.ability.can_farm_perfectly() & self.logic.shipping.can_ship(Vegetable.taro_root) & + self.logic.shipping.can_ship(Fruit.pineapple) & self.logic.shipping.can_ship(Forageable.ginger), + SpecialOrder.cave_patrol: self.logic.relationship.can_meet(NPC.clint), + SpecialOrder.aquatic_overpopulation: self.logic.relationship.can_meet(NPC.demetrius) & self.logic.ability.can_fish_perfectly(), + SpecialOrder.biome_balance: self.logic.relationship.can_meet(NPC.demetrius) & self.logic.ability.can_fish_perfectly(), + SpecialOrder.rock_rejuivenation: (self.logic.relationship.has_hearts(NPC.emily, 4) & + self.logic.has_all(Mineral.ruby, Mineral.topaz, Mineral.emerald, Mineral.jade, Mineral.amethyst, + ArtisanGood.cloth)), + SpecialOrder.gifts_for_george: self.logic.season.has(Season.spring) & self.logic.has(Forageable.leek), + SpecialOrder.fragments_of_the_past: self.logic.monster.can_kill(Monster.skeleton), + SpecialOrder.gus_famous_omelet: self.logic.has(AnimalProduct.any_egg), + SpecialOrder.crop_order: self.logic.ability.can_farm_perfectly() & self.logic.received(Event.can_ship_items), + SpecialOrder.community_cleanup: self.logic.skill.can_crab_pot, + SpecialOrder.the_strong_stuff: self.logic.artisan.can_keg(Vegetable.potato), + SpecialOrder.pierres_prime_produce: self.logic.ability.can_farm_perfectly(), + SpecialOrder.robins_project: self.logic.relationship.can_meet(NPC.robin) & self.logic.ability.can_chop_perfectly() & + self.logic.has(Material.hardwood), + SpecialOrder.robins_resource_rush: self.logic.relationship.can_meet(NPC.robin) & self.logic.ability.can_chop_perfectly() & + self.logic.has(Fertilizer.tree) & self.logic.ability.can_mine_perfectly(), + SpecialOrder.juicy_bugs_wanted: self.logic.has(Loot.bug_meat), + SpecialOrder.tropical_fish: self.logic.relationship.can_meet(NPC.willy) & self.logic.received("Island Resort") & + self.logic.special_order.has_island_transport() & + self.logic.has(Fish.stingray) & self.logic.has(Fish.blue_discus) & self.logic.has(Fish.lionfish), + SpecialOrder.a_curious_substance: self.logic.region.can_reach(Region.wizard_tower), + SpecialOrder.prismatic_jelly: self.logic.region.can_reach(Region.wizard_tower), + SpecialOrder.qis_crop: self.logic.ability.can_farm_perfectly() & self.logic.region.can_reach(Region.greenhouse) & + self.logic.region.can_reach(Region.island_west) & self.logic.skill.has_total_level(50) & + self.logic.has(Machine.seed_maker) & self.logic.received(Event.can_ship_items), + SpecialOrder.lets_play_a_game: self.logic.arcade.has_junimo_kart_max_level(), + SpecialOrder.four_precious_stones: self.logic.time.has_lived_max_months & self.logic.has("Prismatic Shard") & + self.logic.ability.can_mine_perfectly_in_the_skull_cavern(), + SpecialOrder.qis_hungry_challenge: self.logic.ability.can_mine_perfectly_in_the_skull_cavern() & self.logic.buff.has_max_buffs(), + SpecialOrder.qis_cuisine: self.logic.cooking.can_cook() & self.logic.received(Event.can_ship_items) & + (self.logic.money.can_spend_at(Region.saloon, 205000) | self.logic.money.can_spend_at(Region.pierre_store, 170000)), + SpecialOrder.qis_kindness: self.logic.relationship.can_give_loved_gifts_to_everyone(), + SpecialOrder.extended_family: self.logic.ability.can_fish_perfectly() & self.logic.has(Fish.angler) & self.logic.has(Fish.glacierfish) & + self.logic.has(Fish.crimsonfish) & self.logic.has(Fish.mutant_carp) & self.logic.has(Fish.legend), + SpecialOrder.danger_in_the_deep: self.logic.ability.can_mine_perfectly() & self.logic.mine.has_mine_elevator_to_floor(120), + SpecialOrder.skull_cavern_invasion: self.logic.ability.can_mine_perfectly_in_the_skull_cavern() & self.logic.buff.has_max_buffs(), + SpecialOrder.qis_prismatic_grange: self.logic.has(Loot.bug_meat) & # 100 Bug Meat + self.logic.money.can_spend_at(Region.saloon, 24000) & # 100 Spaghetti + self.logic.money.can_spend_at(Region.blacksmith, 15000) & # 100 Copper Ore + self.logic.money.can_spend_at(Region.ranch, 5000) & # 100 Hay + self.logic.money.can_spend_at(Region.saloon, 22000) & # 100 Salads + self.logic.money.can_spend_at(Region.saloon, 7500) & # 100 Joja Cola + self.logic.money.can_spend(80000), # I need this extra rule because money rules aren't additive... + }) + + def update_rules(self, new_rules: Dict[str, StardewRule]): + self.registry.special_order_rules.update(new_rules) + + def can_complete_special_order(self, special_order: str) -> StardewRule: + return Has(special_order, self.registry.special_order_rules) + + def has_island_transport(self) -> StardewRule: + return self.logic.received(Transportation.island_obelisk) | self.logic.received(Transportation.boat_repair) diff --git a/worlds/stardew_valley/logic/time_logic.py b/worlds/stardew_valley/logic/time_logic.py new file mode 100644 index 000000000000..9dcebfe82a4f --- /dev/null +++ b/worlds/stardew_valley/logic/time_logic.py @@ -0,0 +1,38 @@ +from functools import cached_property +from typing import Union + +from Utils import cache_self1 +from .base_logic import BaseLogic, BaseLogicMixin +from .received_logic import ReceivedLogicMixin +from ..stardew_rule import StardewRule, HasProgressionPercent, True_ + +MAX_MONTHS = 12 +MONTH_COEFFICIENT = 24 // MAX_MONTHS + + +class TimeLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.time = TimeLogic(*args, **kwargs) + + +class TimeLogic(BaseLogic[Union[TimeLogicMixin, ReceivedLogicMixin]]): + + @cache_self1 + def has_lived_months(self, number: int) -> StardewRule: + if number <= 0: + return True_() + number = min(number, MAX_MONTHS) + return HasProgressionPercent(self.player, number * MONTH_COEFFICIENT) + + @cached_property + def has_lived_max_months(self) -> StardewRule: + return self.logic.time.has_lived_months(MAX_MONTHS) + + @cached_property + def has_year_two(self) -> StardewRule: + return self.logic.time.has_lived_months(4) + + @cached_property + def has_year_three(self) -> StardewRule: + return self.logic.time.has_lived_months(8) diff --git a/worlds/stardew_valley/logic/tool_logic.py b/worlds/stardew_valley/logic/tool_logic.py new file mode 100644 index 000000000000..def02b35dab6 --- /dev/null +++ b/worlds/stardew_valley/logic/tool_logic.py @@ -0,0 +1,81 @@ +from typing import Union, Iterable + +from Utils import cache_self1 +from .base_logic import BaseLogicMixin, BaseLogic +from .has_logic import HasLogicMixin +from .money_logic import MoneyLogicMixin +from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin +from .season_logic import SeasonLogicMixin +from ..mods.logic.magic_logic import MagicLogicMixin +from ..options import ToolProgression +from ..stardew_rule import StardewRule, True_, False_ +from ..strings.ap_names.skill_level_names import ModSkillLevel +from ..strings.region_names import Region +from ..strings.skill_names import ModSkill +from ..strings.spells import MagicSpell +from ..strings.tool_names import ToolMaterial, Tool + +tool_materials = { + ToolMaterial.copper: 1, + ToolMaterial.iron: 2, + ToolMaterial.gold: 3, + ToolMaterial.iridium: 4 +} + +tool_upgrade_prices = { + ToolMaterial.copper: 2000, + ToolMaterial.iron: 5000, + ToolMaterial.gold: 10000, + ToolMaterial.iridium: 25000 +} + + +class ToolLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.tool = ToolLogic(*args, **kwargs) + + +class ToolLogic(BaseLogic[Union[ToolLogicMixin, HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, MoneyLogicMixin, MagicLogicMixin]]): + # Should be cached + def has_tool(self, tool: str, material: str = ToolMaterial.basic) -> StardewRule: + if material == ToolMaterial.basic or tool == Tool.scythe: + return True_() + + if self.options.tool_progression & ToolProgression.option_progressive: + return self.logic.received(f"Progressive {tool}", tool_materials[material]) + + return self.logic.has(f"{material} Bar") & self.logic.money.can_spend(tool_upgrade_prices[material]) + + def can_use_tool_at(self, tool: str, material: str, region: str) -> StardewRule: + return self.has_tool(tool, material) & self.logic.region.can_reach(region) + + @cache_self1 + def has_fishing_rod(self, level: int) -> StardewRule: + if self.options.tool_progression & ToolProgression.option_progressive: + return self.logic.received(f"Progressive {Tool.fishing_rod}", level) + + if level <= 1: + return self.logic.region.can_reach(Region.beach) + prices = {2: 500, 3: 1800, 4: 7500} + level = min(level, 4) + return self.logic.money.can_spend_at(Region.fish_shop, prices[level]) + + # Should be cached + def can_forage(self, season: Union[str, Iterable[str]], region: str = Region.forest, need_hoe: bool = False) -> StardewRule: + season_rule = False_() + if isinstance(season, str): + season_rule = self.logic.season.has(season) + elif isinstance(season, Iterable): + season_rule = self.logic.season.has_any(season) + region_rule = self.logic.region.can_reach(region) + if need_hoe: + return season_rule & region_rule & self.logic.tool.has_tool(Tool.hoe) + return season_rule & region_rule + + @cache_self1 + def can_water(self, level: int) -> StardewRule: + tool_rule = self.logic.tool.has_tool(Tool.watering_can, ToolMaterial.tiers[level]) + spell_rule = self.logic.received(MagicSpell.water) & self.logic.magic.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, level) + return tool_rule | spell_rule diff --git a/worlds/stardew_valley/logic/traveling_merchant_logic.py b/worlds/stardew_valley/logic/traveling_merchant_logic.py new file mode 100644 index 000000000000..4123ded5bf24 --- /dev/null +++ b/worlds/stardew_valley/logic/traveling_merchant_logic.py @@ -0,0 +1,26 @@ +from typing import Union + +from .base_logic import BaseLogic, BaseLogicMixin +from .received_logic import ReceivedLogicMixin +from ..stardew_rule import True_ +from ..strings.calendar_names import Weekday + + +class TravelingMerchantLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.traveling_merchant = TravelingMerchantLogic(*args, **kwargs) + + +class TravelingMerchantLogic(BaseLogic[Union[TravelingMerchantLogicMixin, ReceivedLogicMixin]]): + + def has_days(self, number_days: int = 1): + if number_days <= 0: + return True_() + + traveling_merchant_days = tuple(f"Traveling Merchant: {day}" for day in Weekday.all_days) + if number_days == 1: + return self.logic.received_any(*traveling_merchant_days) + + tier = min(7, max(1, number_days)) + return self.logic.received_n(*traveling_merchant_days, count=tier) diff --git a/worlds/stardew_valley/logic/wallet_logic.py b/worlds/stardew_valley/logic/wallet_logic.py new file mode 100644 index 000000000000..3a6d12640028 --- /dev/null +++ b/worlds/stardew_valley/logic/wallet_logic.py @@ -0,0 +1,19 @@ +from .base_logic import BaseLogic, BaseLogicMixin +from .received_logic import ReceivedLogicMixin +from ..stardew_rule import StardewRule +from ..strings.wallet_item_names import Wallet + + +class WalletLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.wallet = WalletLogic(*args, **kwargs) + + +class WalletLogic(BaseLogic[ReceivedLogicMixin]): + + def can_speak_dwarf(self) -> StardewRule: + return self.logic.received(Wallet.dwarvish_translation_guide) + + def has_rusty_key(self) -> StardewRule: + return self.logic.received(Wallet.rusty_key) diff --git a/worlds/stardew_valley/mods/logic/buildings.py b/worlds/stardew_valley/mods/logic/buildings.py deleted file mode 100644 index 5ca4bf32d785..000000000000 --- a/worlds/stardew_valley/mods/logic/buildings.py +++ /dev/null @@ -1,16 +0,0 @@ -from typing import Union - -from ...strings.artisan_good_names import ArtisanGood -from ...strings.building_names import ModBuilding -from ..mod_data import ModNames -from ...strings.metal_names import MetalBar -from ...strings.region_names import Region - - -def get_modded_building_rules(vanilla_logic, active_mods): - buildings = {} - if ModNames.tractor in active_mods: - buildings.update({ - ModBuilding.tractor_garage: vanilla_logic.can_spend_money_at(Region.carpenter, 150000) & vanilla_logic.has(MetalBar.iron) & - vanilla_logic.has(MetalBar.iridium) & vanilla_logic.has(ArtisanGood.battery_pack)}) - return buildings diff --git a/worlds/stardew_valley/mods/logic/buildings_logic.py b/worlds/stardew_valley/mods/logic/buildings_logic.py new file mode 100644 index 000000000000..388204a47614 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/buildings_logic.py @@ -0,0 +1,28 @@ +from typing import Dict, Union + +from ..mod_data import ModNames +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.has_logic import HasLogicMixin +from ...logic.money_logic import MoneyLogicMixin +from ...stardew_rule import StardewRule +from ...strings.artisan_good_names import ArtisanGood +from ...strings.building_names import ModBuilding +from ...strings.metal_names import MetalBar +from ...strings.region_names import Region + + +class ModBuildingLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.building = ModBuildingLogic(*args, **kwargs) + + +class ModBuildingLogic(BaseLogic[Union[MoneyLogicMixin, HasLogicMixin]]): + + def get_modded_building_rules(self) -> Dict[str, StardewRule]: + buildings = dict() + if ModNames.tractor in self.options.mods: + tractor_rule = (self.logic.money.can_spend_at(Region.carpenter, 150000) & + self.logic.has_all(MetalBar.iron, MetalBar.iridium, ArtisanGood.battery_pack)) + buildings.update({ModBuilding.tractor_garage: tractor_rule}) + return buildings diff --git a/worlds/stardew_valley/mods/logic/deepwoods.py b/worlds/stardew_valley/mods/logic/deepwoods.py deleted file mode 100644 index 2aa90e5b76b6..000000000000 --- a/worlds/stardew_valley/mods/logic/deepwoods.py +++ /dev/null @@ -1,35 +0,0 @@ -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)) diff --git a/worlds/stardew_valley/mods/logic/deepwoods_logic.py b/worlds/stardew_valley/mods/logic/deepwoods_logic.py new file mode 100644 index 000000000000..7699521542a7 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/deepwoods_logic.py @@ -0,0 +1,73 @@ +from typing import Union + +from ... import options +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.combat_logic import CombatLogicMixin +from ...logic.cooking_logic import CookingLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.skill_logic import SkillLogicMixin +from ...logic.tool_logic import ToolLogicMixin +from ...mods.mod_data import ModNames +from ...options import ElevatorProgression +from ...stardew_rule import StardewRule, True_, And, true_ +from ...strings.ap_names.mods.mod_items import DeepWoodsItem, SkillLevel +from ...strings.ap_names.transport_names import ModTransportation +from ...strings.craftable_names import Bomb +from ...strings.food_names import Meal +from ...strings.performance_names import Performance +from ...strings.skill_names import Skill +from ...strings.tool_names import Tool, ToolMaterial + + +class DeepWoodsLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.deepwoods = DeepWoodsLogic(*args, **kwargs) + + +class DeepWoodsLogic(BaseLogic[Union[SkillLogicMixin, ReceivedLogicMixin, HasLogicMixin, CombatLogicMixin, ToolLogicMixin, SkillLogicMixin, +CookingLogicMixin]]): + + def can_reach_woods_depth(self, depth: int) -> StardewRule: + # Assuming you can always do the 10 first floor + if depth <= 10: + return true_ + + rules = [] + + if depth > 10: + rules.append(self.logic.has(Bomb.bomb) | self.logic.tool.has_tool(Tool.axe, ToolMaterial.iridium)) + if depth > 30: + rules.append(self.logic.received(ModTransportation.woods_obelisk)) + if depth > 50: + rules.append(self.logic.combat.can_fight_at_level(Performance.great) & self.logic.cooking.can_cook() & + self.logic.received(ModTransportation.woods_obelisk)) + + tier = int(depth / 25) + 1 + if self.options.skill_progression == options.SkillProgression.option_progressive: + combat_tier = min(10, max(0, tier + 5)) + rules.append(self.logic.skill.has_level(Skill.combat, combat_tier)) + + return And(*rules) + + def has_woods_rune_to_depth(self, floor: int) -> StardewRule: + if self.options.elevator_progression == ElevatorProgression.option_vanilla: + return True_() + return self.logic.received(DeepWoodsItem.obelisk_sigil, int(floor / 10)) + + def can_chop_to_depth(self, floor: int) -> StardewRule: + previous_elevator = max(floor - 10, 0) + return (self.has_woods_rune_to_depth(previous_elevator) & + self.can_reach_woods_depth(previous_elevator)) + + def can_pull_sword(self) -> StardewRule: + rules = [self.logic.received(DeepWoodsItem.pendant_depths) & self.logic.received(DeepWoodsItem.pendant_community) & + self.logic.received(DeepWoodsItem.pendant_elder), + self.logic.skill.has_total_level(40)] + if ModNames.luck_skill in self.options.mods: + rules.append(self.logic.received(SkillLevel.luck, 7)) + else: + rules.append( + self.logic.has(Meal.magic_rock_candy)) # You need more luck than this, but it'll push the logic down a ways; you can get the rest there. + return And(*rules) diff --git a/worlds/stardew_valley/mods/logic/elevator_logic.py b/worlds/stardew_valley/mods/logic/elevator_logic.py new file mode 100644 index 000000000000..f1d12bcb1c37 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/elevator_logic.py @@ -0,0 +1,18 @@ +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.received_logic import ReceivedLogicMixin +from ...mods.mod_data import ModNames +from ...options import ElevatorProgression +from ...stardew_rule import StardewRule, True_ + + +class ModElevatorLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.elevator = ModElevatorLogic(*args, **kwargs) + + +class ModElevatorLogic(BaseLogic[ReceivedLogicMixin]): + def has_skull_cavern_elevator_to_floor(self, floor: int) -> StardewRule: + if self.options.elevator_progression != ElevatorProgression.option_vanilla and ModNames.skull_cavern_elevator in self.options.mods: + return self.logic.received("Progressive Skull Cavern Elevator", floor // 25) + return True_() diff --git a/worlds/stardew_valley/mods/logic/item_logic.py b/worlds/stardew_valley/mods/logic/item_logic.py new file mode 100644 index 000000000000..8f5e676d8c2d --- /dev/null +++ b/worlds/stardew_valley/mods/logic/item_logic.py @@ -0,0 +1,289 @@ +from typing import Dict, Union + +from ..mod_data import ModNames +from ... import options +from ...data.craftable_data import all_crafting_recipes_by_name +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.combat_logic import CombatLogicMixin +from ...logic.cooking_logic import CookingLogicMixin +from ...logic.crafting_logic import CraftingLogicMixin +from ...logic.crop_logic import CropLogicMixin +from ...logic.fishing_logic import FishingLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.money_logic import MoneyLogicMixin +from ...logic.museum_logic import MuseumLogicMixin +from ...logic.quest_logic import QuestLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...logic.relationship_logic import RelationshipLogicMixin +from ...logic.season_logic import SeasonLogicMixin +from ...logic.skill_logic import SkillLogicMixin +from ...logic.time_logic import TimeLogicMixin +from ...logic.tool_logic import ToolLogicMixin +from ...options import Cropsanity +from ...stardew_rule import StardewRule, True_ +from ...strings.artisan_good_names import ModArtisanGood +from ...strings.craftable_names import ModCraftable, ModEdible, ModMachine +from ...strings.crop_names import SVEVegetable, SVEFruit, DistantLandsCrop, Fruit +from ...strings.fish_names import WaterItem +from ...strings.flower_names import Flower +from ...strings.food_names import SVEMeal, SVEBeverage +from ...strings.forageable_names import SVEForage, DistantLandsForageable, Forageable +from ...strings.gift_names import SVEGift +from ...strings.ingredient_names import Ingredient +from ...strings.material_names import Material +from ...strings.metal_names import all_fossils, all_artifacts, Ore, ModFossil +from ...strings.monster_drop_names import ModLoot, Loot +from ...strings.performance_names import Performance +from ...strings.quest_names import ModQuest +from ...strings.region_names import Region, SVERegion, DeepWoodsRegion, BoardingHouseRegion +from ...strings.season_names import Season +from ...strings.seed_names import SVESeed, DistantLandsSeed +from ...strings.skill_names import Skill +from ...strings.tool_names import Tool, ToolMaterial +from ...strings.villager_names import ModNPC + +display_types = [ModCraftable.wooden_display, ModCraftable.hardwood_display] +display_items = all_artifacts + all_fossils + + +class ModItemLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.item = ModItemLogic(*args, **kwargs) + + +class ModItemLogic(BaseLogic[Union[CombatLogicMixin, ReceivedLogicMixin, CropLogicMixin, CookingLogicMixin, FishingLogicMixin, HasLogicMixin, MoneyLogicMixin, +RegionLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MuseumLogicMixin, ToolLogicMixin, CraftingLogicMixin, SkillLogicMixin, TimeLogicMixin, QuestLogicMixin]]): + + def get_modded_item_rules(self) -> Dict[str, StardewRule]: + items = dict() + if ModNames.sve in self.options.mods: + items.update(self.get_sve_item_rules()) + if ModNames.archaeology in self.options.mods: + items.update(self.get_archaeology_item_rules()) + if ModNames.distant_lands in self.options.mods: + items.update(self.get_distant_lands_item_rules()) + if ModNames.boarding_house in self.options.mods: + items.update(self.get_boarding_house_item_rules()) + return items + + def modify_vanilla_item_rules_with_mod_additions(self, item_rule: Dict[str, StardewRule]): + if ModNames.sve in self.options.mods: + item_rule.update(self.get_modified_item_rules_for_sve(item_rule)) + if ModNames.deepwoods in self.options.mods: + item_rule.update(self.get_modified_item_rules_for_deep_woods(item_rule)) + return item_rule + + def get_sve_item_rules(self): + return {SVEGift.aged_blue_moon_wine: self.logic.money.can_spend_at(SVERegion.sophias_house, 28000), + SVEGift.blue_moon_wine: self.logic.money.can_spend_at(SVERegion.sophias_house, 3000), + SVESeed.fungus_seed: self.logic.region.can_reach(SVERegion.highlands_cavern) & self.logic.combat.has_good_weapon, + ModLoot.green_mushroom: self.logic.region.can_reach(SVERegion.highlands_outside) & + self.logic.tool.has_tool(Tool.axe, ToolMaterial.iron) & self.logic.season.has_any_not_winter(), + SVEFruit.monster_fruit: self.logic.season.has(Season.summer) & self.logic.has(SVESeed.stalk_seed), + SVEVegetable.monster_mushroom: self.logic.season.has(Season.fall) & self.logic.has(SVESeed.fungus_seed), + SVEForage.ornate_treasure_chest: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_galaxy_weapon & + self.logic.tool.has_tool(Tool.axe, ToolMaterial.iron), + SVEFruit.slime_berry: self.logic.season.has(Season.spring) & self.logic.has(SVESeed.slime_seed), + SVESeed.slime_seed: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_good_weapon, + SVESeed.stalk_seed: self.logic.region.can_reach(SVERegion.highlands_outside) & self.logic.combat.has_good_weapon, + SVEForage.swirl_stone: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon, + SVEVegetable.void_root: self.logic.season.has(Season.winter) & self.logic.has(SVESeed.void_seed), + SVESeed.void_seed: self.logic.region.can_reach(SVERegion.highlands_cavern) & self.logic.combat.has_good_weapon, + SVEForage.void_soul: self.logic.region.can_reach( + SVERegion.crimson_badlands) & self.logic.combat.has_good_weapon & self.logic.cooking.can_cook(), + SVEForage.winter_star_rose: self.logic.region.can_reach(SVERegion.summit) & self.logic.season.has(Season.winter), + SVEForage.bearberrys: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has(Season.winter), + SVEForage.poison_mushroom: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has_any([Season.summer, Season.fall]), + SVEForage.red_baneberry: self.logic.region.can_reach(Region.secret_woods) & self.logic.season.has(Season.summer), + SVEForage.ferngill_primrose: self.logic.region.can_reach(SVERegion.summit) & self.logic.season.has(Season.spring), + SVEForage.goldenrod: self.logic.region.can_reach(SVERegion.summit) & ( + self.logic.season.has(Season.summer) | self.logic.season.has(Season.fall)), + SVESeed.shrub_seed: self.logic.region.can_reach(Region.secret_woods) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic), + SVEFruit.salal_berry: self.logic.crop.can_plant_and_grow_item([Season.spring, Season.summer]) & self.logic.has(SVESeed.shrub_seed), + ModEdible.aegis_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 28000), + ModEdible.lightning_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 12000), + ModEdible.barbarian_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 22000), + ModEdible.gravity_elixir: self.logic.money.can_spend_at(SVERegion.galmoran_outpost, 4000), + SVESeed.ancient_ferns_seed: self.logic.region.can_reach(Region.secret_woods) & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic), + SVEVegetable.ancient_fiber: self.logic.crop.can_plant_and_grow_item(Season.summer) & self.logic.has(SVESeed.ancient_ferns_seed), + SVEForage.big_conch: self.logic.region.can_reach_any((Region.beach, SVERegion.fable_reef)), + SVEForage.dewdrop_berry: self.logic.region.can_reach(SVERegion.enchanted_grove), + SVEForage.dried_sand_dollar: self.logic.region.can_reach(SVERegion.fable_reef) | (self.logic.region.can_reach(Region.beach) & + self.logic.season.has_any([Season.summer, Season.fall])), + SVEForage.golden_ocean_flower: self.logic.region.can_reach(SVERegion.fable_reef), + SVEMeal.grampleton_orange_chicken: self.logic.money.can_spend_at(Region.saloon, 650) & self.logic.relationship.has_hearts(ModNPC.sophia, 6), + ModEdible.hero_elixir: self.logic.money.can_spend_at(SVERegion.isaac_shop, 8000), + SVEForage.lucky_four_leaf_clover: self.logic.region.can_reach_any((Region.secret_woods, SVERegion.forest_west)) & + self.logic.season.has_any([Season.spring, Season.summer]), + SVEForage.mushroom_colony: self.logic.region.can_reach_any((Region.secret_woods, SVERegion.junimo_woods, SVERegion.forest_west)) & + self.logic.season.has(Season.fall), + SVEForage.rusty_blade: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon, + SVEForage.smelly_rafflesia: self.logic.region.can_reach(Region.secret_woods), + SVEBeverage.sports_drink: self.logic.money.can_spend_at(Region.hospital, 750), + "Stamina Capsule": self.logic.money.can_spend_at(Region.hospital, 4000), + SVEForage.thistle: self.logic.region.can_reach(SVERegion.summit), + SVEForage.void_pebble: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_great_weapon, + ModLoot.void_shard: self.logic.region.can_reach(SVERegion.crimson_badlands) & self.logic.combat.has_galaxy_weapon & + self.logic.skill.has_level(Skill.combat, 10) & self.logic.region.can_reach(Region.saloon) & self.logic.time.has_year_three + } + # @formatter:on + + def get_modified_item_rules_for_sve(self, items: Dict[str, StardewRule]): + return { + Loot.void_essence: items[Loot.void_essence] | self.logic.region.can_reach(SVERegion.highlands_cavern) | self.logic.region.can_reach( + SVERegion.crimson_badlands), + Loot.solar_essence: items[Loot.solar_essence] | self.logic.region.can_reach(SVERegion.crimson_badlands), + Flower.tulip: items[Flower.tulip] | self.logic.tool.can_forage(Season.spring, SVERegion.sprite_spring), + Flower.blue_jazz: items[Flower.blue_jazz] | self.logic.tool.can_forage(Season.spring, SVERegion.sprite_spring), + Flower.summer_spangle: items[Flower.summer_spangle] | self.logic.tool.can_forage(Season.summer, SVERegion.sprite_spring), + Flower.sunflower: items[Flower.sunflower] | self.logic.tool.can_forage((Season.summer, Season.fall), SVERegion.sprite_spring), + Flower.fairy_rose: items[Flower.fairy_rose] | self.logic.tool.can_forage(Season.fall, SVERegion.sprite_spring), + Fruit.ancient_fruit: items[Fruit.ancient_fruit] | ( + self.logic.tool.can_forage((Season.spring, Season.summer, Season.fall), SVERegion.sprite_spring) & + self.logic.time.has_year_three) | self.logic.region.can_reach(SVERegion.sprite_spring_cave), + Fruit.sweet_gem_berry: items[Fruit.sweet_gem_berry] | ( + self.logic.tool.can_forage((Season.spring, Season.summer, Season.fall), SVERegion.sprite_spring) & + self.logic.time.has_year_three), + WaterItem.coral: items[WaterItem.coral] | self.logic.region.can_reach(SVERegion.fable_reef), + Forageable.rainbow_shell: items[Forageable.rainbow_shell] | self.logic.region.can_reach(SVERegion.fable_reef), + WaterItem.sea_urchin: items[WaterItem.sea_urchin] | self.logic.region.can_reach(SVERegion.fable_reef), + Forageable.red_mushroom: items[Forageable.red_mushroom] | self.logic.tool.can_forage((Season.summer, Season.fall), SVERegion.forest_west) | + self.logic.region.can_reach(SVERegion.sprite_spring_cave), + Forageable.purple_mushroom: items[Forageable.purple_mushroom] | self.logic.tool.can_forage(Season.fall, SVERegion.forest_west) | + self.logic.region.can_reach(SVERegion.sprite_spring_cave), + Forageable.morel: items[Forageable.morel] | self.logic.tool.can_forage(Season.fall, SVERegion.forest_west), + Forageable.chanterelle: items[Forageable.chanterelle] | self.logic.tool.can_forage(Season.fall, SVERegion.forest_west) | + self.logic.region.can_reach(SVERegion.sprite_spring_cave), + Ore.copper: items[Ore.copper] | (self.logic.tool.can_use_tool_at(Tool.pickaxe, ToolMaterial.basic, SVERegion.highlands_cavern) & + self.logic.combat.can_fight_at_level(Performance.great)), + Ore.iron: items[Ore.iron] | (self.logic.tool.can_use_tool_at(Tool.pickaxe, ToolMaterial.basic, SVERegion.highlands_cavern) & + self.logic.combat.can_fight_at_level(Performance.great)), + Ore.iridium: items[Ore.iridium] | (self.logic.tool.can_use_tool_at(Tool.pickaxe, ToolMaterial.basic, SVERegion.crimson_badlands) & + self.logic.combat.can_fight_at_level(Performance.maximum)), + } + + def get_modified_item_rules_for_deep_woods(self, items: Dict[str, StardewRule]): + options_to_update = { + Fruit.apple: items[Fruit.apple] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), # Deep enough to have seen such a tree at least once + Fruit.apricot: items[Fruit.apricot] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Fruit.cherry: items[Fruit.cherry] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Fruit.orange: items[Fruit.orange] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Fruit.peach: items[Fruit.peach] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Fruit.pomegranate: items[Fruit.pomegranate] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Fruit.mango: items[Fruit.mango] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Flower.tulip: items[Flower.tulip] | self.logic.tool.can_forage(Season.not_winter, DeepWoodsRegion.floor_10), + Flower.blue_jazz: items[Flower.blue_jazz] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Flower.summer_spangle: items[Flower.summer_spangle] | self.logic.tool.can_forage(Season.not_winter, DeepWoodsRegion.floor_10), + Flower.poppy: items[Flower.poppy] | self.logic.tool.can_forage(Season.not_winter, DeepWoodsRegion.floor_10), + Flower.fairy_rose: items[Flower.fairy_rose] | self.logic.region.can_reach(DeepWoodsRegion.floor_10), + Material.hardwood: items[Material.hardwood] | self.logic.tool.can_use_tool_at(Tool.axe, ToolMaterial.iron, DeepWoodsRegion.floor_10), + Ingredient.sugar: items[Ingredient.sugar] | self.logic.tool.can_use_tool_at(Tool.axe, ToolMaterial.gold, DeepWoodsRegion.floor_50), + # Gingerbread House + Ingredient.wheat_flour: items[Ingredient.wheat_flour] | self.logic.tool.can_use_tool_at(Tool.axe, ToolMaterial.gold, DeepWoodsRegion.floor_50), + # Gingerbread House + } + + if self.options.tool_progression & options.ToolProgression.option_progressive: + options_to_update.update({ + Ore.iridium: items[Ore.iridium] | self.logic.tool.can_use_tool_at(Tool.axe, ToolMaterial.iridium, DeepWoodsRegion.floor_50), # Iridium Tree + }) + + return options_to_update + + def get_archaeology_item_rules(self): + archaeology_item_rules = {} + preservation_chamber_rule = self.logic.has(ModMachine.preservation_chamber) + hardwood_preservation_chamber_rule = self.logic.has(ModMachine.hardwood_preservation_chamber) + for item in display_items: + for display_type in display_types: + if item == "Trilobite": + location_name = f"{display_type}: Trilobite Fossil" + else: + location_name = f"{display_type}: {item}" + display_item_rule = self.logic.crafting.can_craft(all_crafting_recipes_by_name[display_type]) & self.logic.has(item) + if "Wooden" in display_type: + archaeology_item_rules[location_name] = display_item_rule & preservation_chamber_rule + else: + archaeology_item_rules[location_name] = display_item_rule & hardwood_preservation_chamber_rule + return archaeology_item_rules + + def get_distant_lands_item_rules(self): + return { + DistantLandsForageable.swamp_herb: self.logic.region.can_reach(Region.witch_swamp), + DistantLandsForageable.brown_amanita: self.logic.region.can_reach(Region.witch_swamp), + DistantLandsSeed.vile_ancient_fruit: self.logic.quest.can_complete_quest(ModQuest.WitchOrder) | self.logic.quest.can_complete_quest( + ModQuest.CorruptedCropsTask), + DistantLandsSeed.void_mint: self.logic.quest.can_complete_quest(ModQuest.WitchOrder) | self.logic.quest.can_complete_quest( + ModQuest.CorruptedCropsTask), + DistantLandsCrop.void_mint: self.logic.season.has_any_not_winter() & self.logic.has(DistantLandsSeed.void_mint), + DistantLandsCrop.vile_ancient_fruit: self.logic.season.has_any_not_winter() & self.logic.has(DistantLandsSeed.vile_ancient_fruit), + } + + def get_boarding_house_item_rules(self): + return { + # Mob Drops from lost valley enemies + ModArtisanGood.pterodactyl_egg: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_claw: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_vertebra: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_phalange: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_l_wing_bone: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.pterodactyl_r_wing_bone: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_tooth: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_femur: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_pelvis: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_vertebra: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.dinosaur_claw: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.good), + ModFossil.neanderthal_skull: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.great), + ModFossil.neanderthal_ribs: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.great), + ModFossil.neanderthal_pelvis: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.great), + ModFossil.neanderthal_limb_bones: self.logic.region.can_reach_any((BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, + BoardingHouseRegion.lost_valley_house_2,)) & self.logic.combat.can_fight_at_level( + Performance.great), + } + + def has_seed_unlocked(self, seed_name: str): + if self.options.cropsanity == Cropsanity.option_disabled: + return True_() + return self.logic.received(seed_name) diff --git a/worlds/stardew_valley/mods/logic/magic.py b/worlds/stardew_valley/mods/logic/magic.py deleted file mode 100644 index 709376399c87..000000000000 --- a/worlds/stardew_valley/mods/logic/magic.py +++ /dev/null @@ -1,80 +0,0 @@ -from ...strings.region_names import MagicRegion -from ...mods.mod_data import ModNames -from ...strings.spells import MagicSpell -from ...strings.ap_names.skill_level_names import ModSkillLevel -from ...stardew_rule import Count, StardewRule, False_ -from ... import options - - -def can_use_clear_debris_instead_of_tool_level(vanilla_logic, level: int) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - return vanilla_logic.received(MagicSpell.clear_debris) & can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, level) - - -def can_use_altar(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - return vanilla_logic.can_reach_region(MagicRegion.altar) - - -def has_any_spell(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - return can_use_altar(vanilla_logic) - - -def has_attack_spell_count(vanilla_logic, count: int) -> StardewRule: - attack_spell_rule = [vanilla_logic.received(MagicSpell.fireball), vanilla_logic.received( - MagicSpell.frostbite), vanilla_logic.received(MagicSpell.shockwave), vanilla_logic.received(MagicSpell.spirit), - vanilla_logic.received(MagicSpell.meteor) - ] - return Count(count, attack_spell_rule) - - -def has_support_spell_count(vanilla_logic, count: int) -> StardewRule: - support_spell_rule = [can_use_altar(vanilla_logic), vanilla_logic.received(ModSkillLevel.magic_level, 2), - vanilla_logic.received(MagicSpell.descend), vanilla_logic.received(MagicSpell.heal), - vanilla_logic.received(MagicSpell.tendrils)] - return Count(count, support_spell_rule) - - -def has_decent_spells(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 2) - magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 1) - return magic_resource_rule & magic_attack_options_rule - - -def has_good_spells(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 4) - magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 2) - magic_support_options_rule = has_support_spell_count(vanilla_logic, 1) - return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule - - -def has_great_spells(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 6) - magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 3) - magic_support_options_rule = has_support_spell_count(vanilla_logic, 1) - return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule - - -def has_amazing_spells(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 8) - magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 4) - magic_support_options_rule = has_support_spell_count(vanilla_logic, 2) - return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule - - -def can_blink(vanilla_logic) -> StardewRule: - if ModNames.magic not in vanilla_logic.options.mods: - return False_() - return vanilla_logic.received(MagicSpell.blink) & can_use_altar(vanilla_logic) diff --git a/worlds/stardew_valley/mods/logic/magic_logic.py b/worlds/stardew_valley/mods/logic/magic_logic.py new file mode 100644 index 000000000000..99482b063056 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/magic_logic.py @@ -0,0 +1,82 @@ +from typing import Union + +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.has_logic import HasLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...mods.mod_data import ModNames +from ...stardew_rule import StardewRule, False_ +from ...strings.ap_names.skill_level_names import ModSkillLevel +from ...strings.region_names import MagicRegion +from ...strings.spells import MagicSpell + + +class MagicLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.magic = MagicLogic(*args, **kwargs) + + +# TODO add logic.mods.magic for altar +class MagicLogic(BaseLogic[Union[RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin]]): + def can_use_clear_debris_instead_of_tool_level(self, level: int) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + return self.logic.received(MagicSpell.clear_debris) & self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, level) + + def can_use_altar(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + return self.logic.region.can_reach(MagicRegion.altar) + + def has_any_spell(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + return self.can_use_altar() + + def has_attack_spell_count(self, count: int) -> StardewRule: + attack_spell_rule = [self.logic.received(MagicSpell.fireball), self.logic.received(MagicSpell.frostbite), self.logic.received(MagicSpell.shockwave), + self.logic.received(MagicSpell.spirit), self.logic.received(MagicSpell.meteor)] + return self.logic.count(count, *attack_spell_rule) + + def has_support_spell_count(self, count: int) -> StardewRule: + support_spell_rule = [self.can_use_altar(), self.logic.received(ModSkillLevel.magic_level, 2), + self.logic.received(MagicSpell.descend), self.logic.received(MagicSpell.heal), + self.logic.received(MagicSpell.tendrils)] + return self.logic.count(count, *support_spell_rule) + + def has_decent_spells(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 2) + magic_attack_options_rule = self.has_attack_spell_count(1) + return magic_resource_rule & magic_attack_options_rule + + def has_good_spells(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 4) + magic_attack_options_rule = self.has_attack_spell_count(2) + magic_support_options_rule = self.has_support_spell_count(1) + return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule + + def has_great_spells(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 6) + magic_attack_options_rule = self.has_attack_spell_count(3) + magic_support_options_rule = self.has_support_spell_count(1) + return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule + + def has_amazing_spells(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + magic_resource_rule = self.can_use_altar() & self.logic.received(ModSkillLevel.magic_level, 8) + magic_attack_options_rule = self.has_attack_spell_count(4) + magic_support_options_rule = self.has_support_spell_count(2) + return magic_resource_rule & magic_attack_options_rule & magic_support_options_rule + + def can_blink(self) -> StardewRule: + if ModNames.magic not in self.options.mods: + return False_() + return self.logic.received(MagicSpell.blink) & self.can_use_altar() diff --git a/worlds/stardew_valley/mods/logic/mod_logic.py b/worlds/stardew_valley/mods/logic/mod_logic.py new file mode 100644 index 000000000000..37c17183dbb0 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/mod_logic.py @@ -0,0 +1,21 @@ +from .buildings_logic import ModBuildingLogicMixin +from .deepwoods_logic import DeepWoodsLogicMixin +from .elevator_logic import ModElevatorLogicMixin +from .item_logic import ModItemLogicMixin +from .magic_logic import MagicLogicMixin +from .quests_logic import ModQuestLogicMixin +from .skills_logic import ModSkillLogicMixin +from .special_orders_logic import ModSpecialOrderLogicMixin +from .sve_logic import SVELogicMixin +from ...logic.base_logic import BaseLogicMixin + + +class ModLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.mod = ModLogic(*args, **kwargs) + + +class ModLogic(ModElevatorLogicMixin, MagicLogicMixin, ModSkillLogicMixin, ModItemLogicMixin, ModQuestLogicMixin, ModBuildingLogicMixin, + ModSpecialOrderLogicMixin, DeepWoodsLogicMixin, SVELogicMixin): + pass diff --git a/worlds/stardew_valley/mods/logic/mod_skills_levels.py b/worlds/stardew_valley/mods/logic/mod_skills_levels.py new file mode 100644 index 000000000000..18402283857b --- /dev/null +++ b/worlds/stardew_valley/mods/logic/mod_skills_levels.py @@ -0,0 +1,21 @@ +from typing import Tuple + +from ...mods.mod_data import ModNames +from ...options import Mods + + +def get_mod_skill_levels(mods: Mods) -> Tuple[str]: + skills_items = [] + if ModNames.luck_skill in mods: + skills_items.append("Luck Level") + if ModNames.socializing_skill in mods: + skills_items.append("Socializing Level") + if ModNames.magic in mods: + skills_items.append("Magic Level") + if ModNames.archaeology in mods: + skills_items.append("Archaeology Level") + if ModNames.binning_skill in mods: + skills_items.append("Binning Level") + if ModNames.cooking_skill in mods: + skills_items.append("Cooking Level") + return tuple(skills_items) diff --git a/worlds/stardew_valley/mods/logic/quests.py b/worlds/stardew_valley/mods/logic/quests.py deleted file mode 100644 index bf185754b2be..000000000000 --- a/worlds/stardew_valley/mods/logic/quests.py +++ /dev/null @@ -1,31 +0,0 @@ -from typing import Union -from ...strings.quest_names import ModQuest -from ..mod_data import ModNames -from ...strings.food_names import Meal, Beverage -from ...strings.monster_drop_names import Loot -from ...strings.villager_names import ModNPC -from ...strings.season_names import Season -from ...strings.region_names import Region - - -def get_modded_quest_rules(vanilla_logic, active_mods): - quests = {} - if ModNames.juna in active_mods: - quests.update({ - ModQuest.JunaCola: vanilla_logic.has_relationship(ModNPC.juna, 3) & vanilla_logic.has(Beverage.joja_cola), - ModQuest.JunaSpaghetti: vanilla_logic.has_relationship(ModNPC.juna, 6) & vanilla_logic.has(Meal.spaghetti) - }) - - if ModNames.ginger in active_mods: - quests.update({ - ModQuest.MrGinger: vanilla_logic.has_relationship(ModNPC.mr_ginger, 6) & vanilla_logic.has(Loot.void_essence) - }) - - if ModNames.ayeisha in active_mods: - quests.update({ - ModQuest.AyeishaEnvelope: (vanilla_logic.has_season(Season.spring) | vanilla_logic.has_season(Season.fall)) & - vanilla_logic.can_reach_region(Region.mountain), - ModQuest.AyeishaRing: vanilla_logic.has_season(Season.winter) & vanilla_logic.can_reach_region(Region.forest) - }) - - return quests diff --git a/worlds/stardew_valley/mods/logic/quests_logic.py b/worlds/stardew_valley/mods/logic/quests_logic.py new file mode 100644 index 000000000000..40b5545ee39f --- /dev/null +++ b/worlds/stardew_valley/mods/logic/quests_logic.py @@ -0,0 +1,128 @@ +from typing import Dict, Union + +from ..mod_data import ModNames +from ...logic.base_logic import BaseLogic, BaseLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.quest_logic import QuestLogicMixin +from ...logic.monster_logic import MonsterLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...logic.relationship_logic import RelationshipLogicMixin +from ...logic.season_logic import SeasonLogicMixin +from ...logic.time_logic import TimeLogicMixin +from ...stardew_rule import StardewRule +from ...strings.animal_product_names import AnimalProduct +from ...strings.artisan_good_names import ArtisanGood +from ...strings.crop_names import Fruit, SVEFruit, SVEVegetable, Vegetable +from ...strings.fertilizer_names import Fertilizer +from ...strings.food_names import Meal, Beverage +from ...strings.forageable_names import SVEForage +from ...strings.material_names import Material +from ...strings.metal_names import Ore, MetalBar +from ...strings.monster_drop_names import Loot +from ...strings.monster_names import Monster +from ...strings.quest_names import Quest, ModQuest +from ...strings.region_names import Region, SVERegion, BoardingHouseRegion +from ...strings.season_names import Season +from ...strings.villager_names import ModNPC, NPC +from ...strings.wallet_item_names import Wallet + + +class ModQuestLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.quest = ModQuestLogic(*args, **kwargs) + + +class ModQuestLogic(BaseLogic[Union[HasLogicMixin, QuestLogicMixin, ReceivedLogicMixin, RegionLogicMixin, + TimeLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MonsterLogicMixin]]): + def get_modded_quest_rules(self) -> Dict[str, StardewRule]: + quests = dict() + quests.update(self._get_juna_quest_rules()) + quests.update(self._get_mr_ginger_quest_rules()) + quests.update(self._get_ayeisha_quest_rules()) + quests.update(self._get_sve_quest_rules()) + quests.update(self._get_distant_lands_quest_rules()) + quests.update(self._get_boarding_house_quest_rules()) + quests.update((self._get_hat_mouse_quest_rules())) + return quests + + def _get_juna_quest_rules(self): + if ModNames.juna not in self.options.mods: + return {} + + return { + ModQuest.JunaCola: self.logic.relationship.has_hearts(ModNPC.juna, 3) & self.logic.has(Beverage.joja_cola), + ModQuest.JunaSpaghetti: self.logic.relationship.has_hearts(ModNPC.juna, 6) & self.logic.has(Meal.spaghetti) + } + + def _get_mr_ginger_quest_rules(self): + if ModNames.ginger not in self.options.mods: + return {} + + return { + ModQuest.MrGinger: self.logic.relationship.has_hearts(ModNPC.mr_ginger, 6) & self.logic.has(Loot.void_essence) + } + + def _get_ayeisha_quest_rules(self): + if ModNames.ayeisha not in self.options.mods: + return {} + + return { + ModQuest.AyeishaEnvelope: (self.logic.season.has(Season.spring) | self.logic.season.has(Season.fall)), + ModQuest.AyeishaRing: self.logic.season.has(Season.winter) + } + + def _get_sve_quest_rules(self): + if ModNames.sve not in self.options.mods: + return {} + + return { + ModQuest.RailroadBoulder: self.logic.received(Wallet.skull_key) & self.logic.has_all(*(Ore.iridium, Material.coal)) & + self.logic.region.can_reach(Region.blacksmith) & self.logic.region.can_reach(Region.railroad), + ModQuest.GrandpasShed: self.logic.has_all(*(Material.hardwood, MetalBar.iron, ArtisanGood.battery_pack, Material.stone)) & + self.logic.region.can_reach(SVERegion.grandpas_shed), + ModQuest.MarlonsBoat: self.logic.has_all(*(Loot.void_essence, Loot.solar_essence, Loot.slime, Loot.bat_wing, Loot.bug_meat)) & + self.logic.relationship.can_meet(ModNPC.lance) & self.logic.region.can_reach(SVERegion.guild_summit), + ModQuest.AuroraVineyard: self.logic.has(Fruit.starfruit) & self.logic.region.can_reach(SVERegion.aurora_vineyard), + ModQuest.MonsterCrops: self.logic.has_all(*(SVEVegetable.monster_mushroom, SVEFruit.slime_berry, SVEFruit.monster_fruit, SVEVegetable.void_root)), + ModQuest.VoidSoul: self.logic.has(SVEForage.void_soul) & self.logic.region.can_reach(Region.farm) & + self.logic.season.has_any_not_winter() & self.logic.region.can_reach(SVERegion.badlands_entrance) & + self.logic.relationship.has_hearts(NPC.krobus, 10) & self.logic.quest.can_complete_quest(ModQuest.MonsterCrops) & + self.logic.monster.can_kill_any((Monster.shadow_brute, Monster.shadow_shaman, Monster.shadow_sniper)), + } + + def _get_distant_lands_quest_rules(self): + if ModNames.distant_lands not in self.options.mods: + return {} + + return { + ModQuest.CorruptedCropsTask: self.logic.region.can_reach(Region.wizard_tower) & self.logic.has(Fertilizer.deluxe) & + self.logic.quest.can_complete_quest(Quest.magic_ink), + ModQuest.WitchOrder: self.logic.region.can_reach(Region.witch_swamp) & self.logic.has(Fertilizer.deluxe) & + self.logic.quest.can_complete_quest(Quest.magic_ink), + ModQuest.ANewPot: self.logic.region.can_reach(Region.saloon) & + self.logic.region.can_reach(Region.sam_house) & self.logic.region.can_reach(Region.pierre_store) & + self.logic.region.can_reach(Region.blacksmith) & self.logic.has(MetalBar.iron) & self.logic.relationship.has_hearts(ModNPC.goblin, + 6), + ModQuest.FancyBlanketTask: self.logic.region.can_reach(Region.haley_house) & self.logic.has(AnimalProduct.wool) & + self.logic.has(ArtisanGood.cloth) & self.logic.relationship.has_hearts(ModNPC.goblin, 10) & + self.logic.relationship.has_hearts(NPC.emily, 8) & self.logic.season.has(Season.winter) + + } + + def _get_boarding_house_quest_rules(self): + if ModNames.boarding_house not in self.options.mods: + return {} + + return { + ModQuest.PumpkinSoup: self.logic.region.can_reach(BoardingHouseRegion.boarding_house_first) & self.logic.has(Vegetable.pumpkin) + } + + def _get_hat_mouse_quest_rules(self): + if ModNames.lacey not in self.options.mods: + return {} + + return { + ModQuest.HatMouseHat: self.logic.relationship.has_hearts(ModNPC.lacey, 2) & self.logic.time.has_lived_months(4) + } diff --git a/worlds/stardew_valley/mods/logic/skills.py b/worlds/stardew_valley/mods/logic/skills.py deleted file mode 100644 index 24402a088b16..000000000000 --- a/worlds/stardew_valley/mods/logic/skills.py +++ /dev/null @@ -1,94 +0,0 @@ -from typing import List, Union -from . import magic -from ...strings.building_names import Building -from ...strings.geode_names import Geode -from ...strings.region_names import Region -from ...strings.skill_names import ModSkill -from ...strings.spells import MagicSpell -from ...strings.machine_names import Machine -from ...strings.tool_names import Tool, ToolMaterial -from ...mods.mod_data import ModNames -from ...data.villagers_data import all_villagers -from ...stardew_rule import Count, StardewRule, False_ -from ... import options - - -def append_mod_skill_level(skills_items: List[str], active_mods): - if ModNames.luck_skill in active_mods: - skills_items.append("Luck Level") - if ModNames.socializing_skill in active_mods: - skills_items.append("Socializing Level") - if ModNames.magic in active_mods: - skills_items.append("Magic Level") - if ModNames.archaeology in active_mods: - skills_items.append("Archaeology Level") - if ModNames.binning_skill in active_mods: - skills_items.append("Binning Level") - if ModNames.cooking_skill in active_mods: - skills_items.append("Cooking Level") - - -def can_earn_mod_skill_level(logic, skill: str, level: int) -> StardewRule: - if ModNames.luck_skill in logic.options.mods and skill == ModSkill.luck: - return can_earn_luck_skill_level(logic, level) - if ModNames.magic in logic.options.mods and skill == ModSkill.magic: - return can_earn_magic_skill_level(logic, level) - if ModNames.socializing_skill in logic.options.mods and skill == ModSkill.socializing: - return can_earn_socializing_skill_level(logic, level) - if ModNames.archaeology in logic.options.mods and skill == ModSkill.archaeology: - return can_earn_archaeology_skill_level(logic, level) - if ModNames.cooking_skill in logic.options.mods and skill == ModSkill.cooking: - return can_earn_cooking_skill_level(logic, level) - if ModNames.binning_skill in logic.options.mods and skill == ModSkill.binning: - return can_earn_binning_skill_level(logic, level) - return False_() - - -def can_earn_luck_skill_level(vanilla_logic, level: int) -> StardewRule: - if level >= 6: - return vanilla_logic.can_fish_chests() | vanilla_logic.can_open_geode(Geode.magma) - else: - return vanilla_logic.can_fish_chests() | vanilla_logic.can_open_geode(Geode.geode) - - -def can_earn_magic_skill_level(vanilla_logic, level: int) -> StardewRule: - spell_count = [vanilla_logic.received(MagicSpell.clear_debris), vanilla_logic.received(MagicSpell.water), - vanilla_logic.received(MagicSpell.blink), vanilla_logic.received(MagicSpell.fireball), - vanilla_logic.received(MagicSpell.frostbite), - vanilla_logic.received(MagicSpell.descend), vanilla_logic.received(MagicSpell.tendrils), - vanilla_logic.received(MagicSpell.shockwave), - vanilla_logic.received(MagicSpell.meteor), - vanilla_logic.received(MagicSpell.spirit)] - return magic.can_use_altar(vanilla_logic) & Count(level, spell_count) - - -def can_earn_socializing_skill_level(vanilla_logic, level: int) -> StardewRule: - villager_count = [] - for villager in all_villagers: - if villager.mod_name in vanilla_logic.options.mods or villager.mod_name is None: - villager_count.append(vanilla_logic.can_earn_relationship(villager.name, level)) - return Count(level * 2, villager_count) - - -def can_earn_archaeology_skill_level(vanilla_logic, level: int) -> StardewRule: - if level >= 6: - return vanilla_logic.can_do_panning() | vanilla_logic.has_tool(Tool.hoe, ToolMaterial.gold) - else: - return vanilla_logic.can_do_panning() | vanilla_logic.has_tool(Tool.hoe, ToolMaterial.basic) - - -def can_earn_cooking_skill_level(vanilla_logic, level: int) -> StardewRule: - if level >= 6: - return vanilla_logic.can_cook() & vanilla_logic.can_fish() & vanilla_logic.can_reach_region(Region.saloon) & \ - vanilla_logic.has_building(Building.coop) & vanilla_logic.has_building(Building.barn) - else: - return vanilla_logic.can_cook() - - -def can_earn_binning_skill_level(vanilla_logic, level: int) -> StardewRule: - if level >= 6: - return vanilla_logic.can_reach_region(Region.town) & vanilla_logic.has(Machine.recycling_machine) & \ - (vanilla_logic.can_fish() | vanilla_logic.can_crab_pot()) - else: - return vanilla_logic.can_reach_region(Region.town) | (vanilla_logic.has(Machine.recycling_machine) & - (vanilla_logic.can_fish() | vanilla_logic.can_crab_pot())) diff --git a/worlds/stardew_valley/mods/logic/skills_logic.py b/worlds/stardew_valley/mods/logic/skills_logic.py new file mode 100644 index 000000000000..ce8bebbffef5 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/skills_logic.py @@ -0,0 +1,110 @@ +from typing import Union + +from .magic_logic import MagicLogicMixin +from ...data.villagers_data import all_villagers +from ...logic.action_logic import ActionLogicMixin +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.building_logic import BuildingLogicMixin +from ...logic.cooking_logic import CookingLogicMixin +from ...logic.fishing_logic import FishingLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...logic.relationship_logic import RelationshipLogicMixin +from ...logic.tool_logic import ToolLogicMixin +from ...mods.mod_data import ModNames +from ...options import SkillProgression +from ...stardew_rule import StardewRule, False_, True_ +from ...strings.ap_names.mods.mod_items import SkillLevel +from ...strings.craftable_names import ModCraftable, ModMachine +from ...strings.building_names import Building +from ...strings.geode_names import Geode +from ...strings.machine_names import Machine +from ...strings.region_names import Region +from ...strings.skill_names import ModSkill +from ...strings.spells import MagicSpell +from ...strings.tool_names import Tool, ToolMaterial + + +class ModSkillLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.skill = ModSkillLogic(*args, **kwargs) + + +class ModSkillLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, ActionLogicMixin, RelationshipLogicMixin, BuildingLogicMixin, +ToolLogicMixin, FishingLogicMixin, CookingLogicMixin, MagicLogicMixin]]): + def has_mod_level(self, skill: str, level: int) -> StardewRule: + if level <= 0: + return True_() + + if self.options.skill_progression == SkillProgression.option_progressive: + return self.logic.received(f"{skill} Level", level) + + return self.can_earn_mod_skill_level(skill, level) + + def can_earn_mod_skill_level(self, skill: str, level: int) -> StardewRule: + if ModNames.luck_skill in self.options.mods and skill == ModSkill.luck: + return self.can_earn_luck_skill_level(level) + if ModNames.magic in self.options.mods and skill == ModSkill.magic: + return self.can_earn_magic_skill_level(level) + if ModNames.socializing_skill in self.options.mods and skill == ModSkill.socializing: + return self.can_earn_socializing_skill_level(level) + if ModNames.archaeology in self.options.mods and skill == ModSkill.archaeology: + return self.can_earn_archaeology_skill_level(level) + if ModNames.cooking_skill in self.options.mods and skill == ModSkill.cooking: + return self.can_earn_cooking_skill_level(level) + if ModNames.binning_skill in self.options.mods and skill == ModSkill.binning: + return self.can_earn_binning_skill_level(level) + return False_() + + def can_earn_luck_skill_level(self, level: int) -> StardewRule: + if level >= 6: + return self.logic.fishing.can_fish_chests() | self.logic.action.can_open_geode(Geode.magma) + if level >= 3: + return self.logic.fishing.can_fish_chests() | self.logic.action.can_open_geode(Geode.geode) + return True_() # You can literally wake up and or get them by opening starting chests. + + def can_earn_magic_skill_level(self, level: int) -> StardewRule: + spell_count = [self.logic.received(MagicSpell.clear_debris), self.logic.received(MagicSpell.water), + self.logic.received(MagicSpell.blink), self.logic.received(MagicSpell.fireball), + self.logic.received(MagicSpell.frostbite), + self.logic.received(MagicSpell.descend), self.logic.received(MagicSpell.tendrils), + self.logic.received(MagicSpell.shockwave), + self.logic.received(MagicSpell.meteor), + self.logic.received(MagicSpell.spirit)] + return self.logic.count(level, *spell_count) + + def can_earn_socializing_skill_level(self, level: int) -> StardewRule: + villager_count = [] + for villager in all_villagers: + if villager.mod_name in self.options.mods or villager.mod_name is None: + villager_count.append(self.logic.relationship.can_earn_relationship(villager.name, level)) + return self.logic.count(level * 2, *villager_count) + + def can_earn_archaeology_skill_level(self, level: int) -> StardewRule: + shifter_rule = True_() + preservation_rule = True_() + if self.options.skill_progression == self.options.skill_progression.option_progressive: + shifter_rule = self.logic.has(ModCraftable.water_shifter) + preservation_rule = self.logic.has(ModMachine.hardwood_preservation_chamber) + if level >= 8: + return (self.logic.action.can_pan() & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.gold)) & shifter_rule & preservation_rule + if level >= 5: + return (self.logic.action.can_pan() & self.logic.tool.has_tool(Tool.hoe, ToolMaterial.iron)) & shifter_rule + if level >= 3: + return self.logic.action.can_pan() | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.copper) + return self.logic.action.can_pan() | self.logic.tool.has_tool(Tool.hoe, ToolMaterial.basic) + + def can_earn_cooking_skill_level(self, level: int) -> StardewRule: + if level >= 6: + return self.logic.cooking.can_cook() & self.logic.region.can_reach(Region.saloon) & \ + self.logic.building.has_building(Building.coop) & self.logic.building.has_building(Building.barn) + else: + return self.logic.cooking.can_cook() + + def can_earn_binning_skill_level(self, level: int) -> StardewRule: + if level >= 6: + return self.logic.has(Machine.recycling_machine) + else: + return True_() # You can always earn levels 1-5 with trash cans diff --git a/worlds/stardew_valley/mods/logic/skullcavernelevator.py b/worlds/stardew_valley/mods/logic/skullcavernelevator.py deleted file mode 100644 index 9a5140ae39c9..000000000000 --- a/worlds/stardew_valley/mods/logic/skullcavernelevator.py +++ /dev/null @@ -1,10 +0,0 @@ -from ...stardew_rule import Count, StardewRule, True_ -from ...mods.mod_data import ModNames -from ... import options - - -def has_skull_cavern_elevator_to_floor(self, floor: int) -> StardewRule: - if self.options.elevator_progression != options.ElevatorProgression.option_vanilla and \ - ModNames.skull_cavern_elevator in self.options.mods: - return self.received("Progressive Skull Cavern Elevator", floor // 25) - return True_() diff --git a/worlds/stardew_valley/mods/logic/special_orders.py b/worlds/stardew_valley/mods/logic/special_orders.py deleted file mode 100644 index 45d5d572dc05..000000000000 --- a/worlds/stardew_valley/mods/logic/special_orders.py +++ /dev/null @@ -1,24 +0,0 @@ -from typing import Union -from ...strings.craftable_names import Craftable -from ...strings.food_names import Meal -from ...strings.material_names import Material -from ...strings.monster_drop_names import Loot -from ...strings.region_names import Region -from ...strings.special_order_names import SpecialOrder, ModSpecialOrder -from ...strings.villager_names import ModNPC -from ..mod_data import ModNames - - -def get_modded_special_orders_rules(vanilla_logic, active_mods): - special_orders = {} - if ModNames.juna in active_mods: - special_orders.update({ - ModSpecialOrder.junas_monster_mash: vanilla_logic.has_relationship(ModNPC.juna, 4) & - vanilla_logic.can_complete_special_order(SpecialOrder.a_curious_substance) & - vanilla_logic.has_rusty_key() & - vanilla_logic.can_reach_region(Region.forest) & vanilla_logic.has(Craftable.monster_musk) & - vanilla_logic.has("Energy Tonic") & vanilla_logic.has(Material.sap) & vanilla_logic.has(Loot.bug_meat) & - vanilla_logic.has(Craftable.oil_of_garlic) & vanilla_logic.has(Meal.strange_bun) - }) - - return special_orders diff --git a/worlds/stardew_valley/mods/logic/special_orders_logic.py b/worlds/stardew_valley/mods/logic/special_orders_logic.py new file mode 100644 index 000000000000..e51a23d50254 --- /dev/null +++ b/worlds/stardew_valley/mods/logic/special_orders_logic.py @@ -0,0 +1,76 @@ +from typing import Union + +from ...data.craftable_data import all_crafting_recipes_by_name +from ..mod_data import ModNames +from ...logic.action_logic import ActionLogicMixin +from ...logic.artisan_logic import ArtisanLogicMixin +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.crafting_logic import CraftingLogicMixin +from ...logic.crop_logic import CropLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...logic.relationship_logic import RelationshipLogicMixin +from ...logic.season_logic import SeasonLogicMixin +from ...logic.wallet_logic import WalletLogicMixin +from ...strings.ap_names.community_upgrade_names import CommunityUpgrade +from ...strings.artisan_good_names import ArtisanGood +from ...strings.craftable_names import Consumable, Edible, Bomb +from ...strings.crop_names import Fruit +from ...strings.fertilizer_names import Fertilizer +from ...strings.food_names import Meal +from ...strings.geode_names import Geode +from ...strings.material_names import Material +from ...strings.metal_names import MetalBar, Artifact +from ...strings.monster_drop_names import Loot +from ...strings.region_names import Region, SVERegion +from ...strings.special_order_names import SpecialOrder, ModSpecialOrder +from ...strings.villager_names import ModNPC + + +class ModSpecialOrderLogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.special_order = ModSpecialOrderLogic(*args, **kwargs) + + +class ModSpecialOrderLogic(BaseLogic[Union[ActionLogicMixin, ArtisanLogicMixin, CraftingLogicMixin, CropLogicMixin, HasLogicMixin, RegionLogicMixin, +ReceivedLogicMixin, RelationshipLogicMixin, SeasonLogicMixin, WalletLogicMixin]]): + def get_modded_special_orders_rules(self): + special_orders = {} + if ModNames.juna in self.options.mods: + special_orders.update({ + ModSpecialOrder.junas_monster_mash: self.logic.relationship.has_hearts(ModNPC.juna, 4) & + self.registry.special_order_rules[SpecialOrder.a_curious_substance] & + self.logic.wallet.has_rusty_key() & + self.logic.region.can_reach(Region.forest) & self.logic.has(Consumable.monster_musk) & + self.logic.has("Energy Tonic") & self.logic.has(Material.sap) & self.logic.has(Loot.bug_meat) & + self.logic.has(Edible.oil_of_garlic) & self.logic.has(Meal.strange_bun) + }) + if ModNames.sve in self.options.mods: + special_orders.update({ + ModSpecialOrder.andys_cellar: self.logic.has(Material.stone) & self.logic.has(Material.wood) & self.logic.has(Material.hardwood) & + self.logic.has(MetalBar.iron) & self.logic.received(CommunityUpgrade.movie_theater, 1) & + self.logic.region.can_reach(SVERegion.fairhaven_farm), + ModSpecialOrder.a_mysterious_venture: self.logic.has(Bomb.cherry_bomb) & self.logic.has(Bomb.bomb) & self.logic.has(Bomb.mega_bomb) & + self.logic.region.can_reach(Region.adventurer_guild), + ModSpecialOrder.an_elegant_reception: self.logic.artisan.can_keg(Fruit.starfruit) & self.logic.has(ArtisanGood.cheese) & + self.logic.has(ArtisanGood.goat_cheese) & self.logic.season.has_any_not_winter() & + self.logic.region.can_reach(SVERegion.jenkins_cellar), + ModSpecialOrder.fairy_garden: self.logic.has(Consumable.fairy_dust) & + self.logic.region.can_reach(Region.island_south) & ( + self.logic.action.can_open_geode(Geode.frozen) | self.logic.action.can_open_geode(Geode.omni)) & + self.logic.region.can_reach(SVERegion.blue_moon_vineyard), + ModSpecialOrder.homemade_fertilizer: self.logic.crafting.can_craft(all_crafting_recipes_by_name[Fertilizer.quality]) & + self.logic.region.can_reach(SVERegion.susans_house) # quest requires you make the fertilizer + }) + + if ModNames.jasper in self.options.mods: + special_orders.update({ + ModSpecialOrder.dwarf_scroll: self.logic.has_all(*(Artifact.dwarf_scroll_i, Artifact.dwarf_scroll_ii, Artifact.dwarf_scroll_iii, + Artifact.dwarf_scroll_iv,)), + ModSpecialOrder.geode_order: self.logic.has_all(*(Geode.geode, Geode.frozen, Geode.magma, Geode.omni,)) & + self.logic.relationship.has_hearts(ModNPC.jasper, 8) + }) + + return special_orders diff --git a/worlds/stardew_valley/mods/logic/sve_logic.py b/worlds/stardew_valley/mods/logic/sve_logic.py new file mode 100644 index 000000000000..1254338fe2fc --- /dev/null +++ b/worlds/stardew_valley/mods/logic/sve_logic.py @@ -0,0 +1,55 @@ +from typing import Union + +from ..mod_regions import SVERegion +from ...logic.base_logic import BaseLogicMixin, BaseLogic +from ...logic.combat_logic import CombatLogicMixin +from ...logic.cooking_logic import CookingLogicMixin +from ...logic.has_logic import HasLogicMixin +from ...logic.money_logic import MoneyLogicMixin +from ...logic.quest_logic import QuestLogicMixin +from ...logic.received_logic import ReceivedLogicMixin +from ...logic.region_logic import RegionLogicMixin +from ...logic.relationship_logic import RelationshipLogicMixin +from ...logic.season_logic import SeasonLogicMixin +from ...logic.time_logic import TimeLogicMixin +from ...logic.tool_logic import ToolLogicMixin +from ...strings.ap_names.mods.mod_items import SVELocation, SVERunes, SVEQuestItem +from ...strings.quest_names import Quest +from ...strings.region_names import Region +from ...strings.tool_names import Tool, ToolMaterial +from ...strings.wallet_item_names import Wallet +from ...stardew_rule import Or +from ...strings.quest_names import ModQuest + + +class SVELogicMixin(BaseLogicMixin): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.sve = SVELogic(*args, **kwargs) + + +class SVELogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, QuestLogicMixin, RegionLogicMixin, RelationshipLogicMixin, TimeLogicMixin, ToolLogicMixin, + CookingLogicMixin, MoneyLogicMixin, CombatLogicMixin, SeasonLogicMixin, QuestLogicMixin]]): + def initialize_rules(self): + self.registry.sve_location_rules.update({ + SVELocation.tempered_galaxy_sword: self.logic.money.can_spend_at(SVERegion.alesia_shop, 350000), + SVELocation.tempered_galaxy_dagger: self.logic.money.can_spend_at(SVERegion.isaac_shop, 600000), + SVELocation.tempered_galaxy_hammer: self.logic.money.can_spend_at(SVERegion.isaac_shop, 400000), + }) + + def has_any_rune(self): + rune_list = SVERunes.nexus_items + return Or(*(self.logic.received(rune) for rune in rune_list)) + + def has_iridium_bomb(self): + if self.options.quest_locations < 0: + return self.logic.quest.can_complete_quest(ModQuest.RailroadBoulder) + return self.logic.received(SVEQuestItem.iridium_bomb) + + def can_buy_bear_recipe(self): + access_rule = (self.logic.quest.can_complete_quest(Quest.strange_note) & self.logic.tool.has_tool(Tool.axe, ToolMaterial.basic) & + self.logic.tool.has_tool(Tool.pickaxe, ToolMaterial.basic)) + forage_rule = self.logic.region.can_reach_any((Region.forest, Region.backwoods, Region.mountain)) + knowledge_rule = self.logic.received(Wallet.bears_knowledge) + return access_rule & forage_rule & knowledge_rule + diff --git a/worlds/stardew_valley/mods/mod_data.py b/worlds/stardew_valley/mods/mod_data.py index 30fe96c9d906..a4d3b9828aa6 100644 --- a/worlds/stardew_valley/mods/mod_data.py +++ b/worlds/stardew_valley/mods/mod_data.py @@ -21,6 +21,13 @@ class ModNames: ayeisha = "Ayeisha - The Postal Worker (Custom NPC)" riley = "Custom NPC - Riley" skull_cavern_elevator = "Skull Cavern Elevator" + sve = "Stardew Valley Expanded" + alecto = "Alecto the Witch" + distant_lands = "Distant Lands - Witch Swamp Overhaul" + lacey = "Hat Mouse Lacey" + boarding_house = "Boarding House and Bus Stop Extension" + + jasper_sve = jasper + "," + sve all_mods = frozenset({ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack, @@ -28,4 +35,5 @@ class ModNames: ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna, ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene, ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores, - ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator}) + ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator, ModNames.sve, ModNames.alecto, + ModNames.distant_lands, ModNames.lacey, ModNames.boarding_house}) diff --git a/worlds/stardew_valley/mods/mod_monster_locations.py b/worlds/stardew_valley/mods/mod_monster_locations.py new file mode 100644 index 000000000000..96ded1b2fc39 --- /dev/null +++ b/worlds/stardew_valley/mods/mod_monster_locations.py @@ -0,0 +1,40 @@ +from typing import Dict, Tuple + +from .mod_data import ModNames +from ..strings.monster_names import Monster +from ..strings.region_names import SVERegion, DeepWoodsRegion, BoardingHouseRegion + +sve_monsters_locations: Dict[str, Tuple[str, ...]] = { + Monster.shadow_brute_dangerous: (SVERegion.highlands_cavern,), + Monster.shadow_sniper: (SVERegion.highlands_cavern,), + Monster.shadow_shaman_dangerous: (SVERegion.highlands_cavern,), + Monster.mummy_dangerous: (SVERegion.crimson_badlands,), + Monster.royal_serpent: (SVERegion.crimson_badlands,), + Monster.skeleton_dangerous: (SVERegion.crimson_badlands,), + Monster.skeleton_mage: (SVERegion.crimson_badlands,), + Monster.dust_sprite_dangerous: (SVERegion.highlands_outside,), +} + +deepwoods_monsters_locations: Dict[str, Tuple[str, ...]] = { + Monster.shadow_brute: (DeepWoodsRegion.floor_10,), + Monster.cave_fly: (DeepWoodsRegion.floor_10,), + Monster.green_slime: (DeepWoodsRegion.floor_10,), +} + +boardinghouse_monsters_locations: Dict[str, Tuple[str, ...]] = { + Monster.shadow_brute: (BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, BoardingHouseRegion.lost_valley_house_2,), + Monster.pepper_rex: (BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_1, BoardingHouseRegion.lost_valley_house_2,), + Monster.iridium_bat: (BoardingHouseRegion.lost_valley_ruins, BoardingHouseRegion.lost_valley_house_2,), + Monster.grub: (BoardingHouseRegion.abandoned_mines_1a, BoardingHouseRegion.abandoned_mines_1b, BoardingHouseRegion.abandoned_mines_2a, + BoardingHouseRegion.abandoned_mines_2b,), + Monster.bug: (BoardingHouseRegion.abandoned_mines_1a, BoardingHouseRegion.abandoned_mines_1b,), + Monster.bat: (BoardingHouseRegion.abandoned_mines_2a, BoardingHouseRegion.abandoned_mines_2b,), + Monster.cave_fly: (BoardingHouseRegion.abandoned_mines_3, BoardingHouseRegion.abandoned_mines_4, BoardingHouseRegion.abandoned_mines_5,), + Monster.frost_bat: (BoardingHouseRegion.abandoned_mines_3, BoardingHouseRegion.abandoned_mines_4, BoardingHouseRegion.abandoned_mines_5,), +} + +modded_monsters_locations: Dict[str, Dict[str, Tuple[str, ...]]] = { + ModNames.sve: sve_monsters_locations, + ModNames.deepwoods: deepwoods_monsters_locations, + ModNames.boarding_house: boardinghouse_monsters_locations +} diff --git a/worlds/stardew_valley/mods/mod_regions.py b/worlds/stardew_valley/mods/mod_regions.py index b05bc9538dba..df0a12f6ef18 100644 --- a/worlds/stardew_valley/mods/mod_regions.py +++ b/worlds/stardew_valley/mods/mod_regions.py @@ -1,8 +1,10 @@ -from ..strings.entrance_names import DeepWoodsEntrance, EugeneEntrance, \ - JasperEntrance, AlecEntrance, YobaEntrance, JunaEntrance, MagicEntrance, AyeishaEntrance, RileyEntrance -from ..strings.region_names import Region, DeepWoodsRegion, EugeneRegion, JasperRegion, \ - AlecRegion, YobaRegion, JunaRegion, MagicRegion, AyeishaRegion, RileyRegion -from ..region_classes import RegionData, ConnectionData, RandomizationFlag, ModRegionData +from typing import Dict, List + +from ..strings.entrance_names import Entrance, DeepWoodsEntrance, EugeneEntrance, LaceyEntrance, BoardingHouseEntrance, \ + JasperEntrance, AlecEntrance, YobaEntrance, JunaEntrance, MagicEntrance, AyeishaEntrance, RileyEntrance, SVEEntrance, AlectoEntrance +from ..strings.region_names import Region, DeepWoodsRegion, EugeneRegion, JasperRegion, BoardingHouseRegion, \ + AlecRegion, YobaRegion, JunaRegion, MagicRegion, AyeishaRegion, RileyRegion, SVERegion, AlectoRegion, LaceyRegion +from ..region_classes import RegionData, ConnectionData, ModificationFlag, RandomizationFlag, ModRegionData from .mod_data import ModNames deep_woods_regions = [ @@ -131,6 +133,232 @@ flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA) ] +stardew_valley_expanded_regions = [ + RegionData(Region.backwoods, [SVEEntrance.backwoods_to_grove]), + RegionData(SVERegion.enchanted_grove, [SVEEntrance.grove_to_outpost_warp, SVEEntrance.grove_to_wizard_warp, + SVEEntrance.grove_to_farm_warp, SVEEntrance.grove_to_guild_warp, SVEEntrance.grove_to_junimo_warp, + SVEEntrance.grove_to_spring_warp, SVEEntrance.grove_to_aurora_warp]), + RegionData(SVERegion.grove_farm_warp, [SVEEntrance.farm_warp_to_farm]), + RegionData(SVERegion.grove_aurora_warp, [SVEEntrance.aurora_warp_to_aurora]), + RegionData(SVERegion.grove_guild_warp, [SVEEntrance.guild_warp_to_guild]), + RegionData(SVERegion.grove_junimo_warp, [SVEEntrance.junimo_warp_to_junimo]), + RegionData(SVERegion.grove_spring_warp, [SVEEntrance.spring_warp_to_spring]), + RegionData(SVERegion.grove_outpost_warp, [SVEEntrance.outpost_warp_to_outpost]), + RegionData(SVERegion.grove_wizard_warp, [SVEEntrance.wizard_warp_to_wizard]), + RegionData(SVERegion.galmoran_outpost, [SVEEntrance.outpost_to_badlands_entrance, SVEEntrance.use_alesia_shop, + SVEEntrance.use_isaac_shop]), + RegionData(SVERegion.badlands_entrance, [SVEEntrance.badlands_entrance_to_badlands]), + RegionData(SVERegion.crimson_badlands, [SVEEntrance.badlands_to_cave]), + RegionData(SVERegion.badlands_cave), + RegionData(Region.bus_stop, [SVEEntrance.bus_stop_to_shed]), + RegionData(SVERegion.grandpas_shed, [SVEEntrance.grandpa_shed_to_interior, SVEEntrance.grandpa_shed_to_town]), + RegionData(SVERegion.grandpas_shed_interior, [SVEEntrance.grandpa_interior_to_upstairs]), + RegionData(SVERegion.grandpas_shed_upstairs), + RegionData(Region.forest, + [SVEEntrance.forest_to_fairhaven, SVEEntrance.forest_to_west, SVEEntrance.forest_to_lost_woods, + SVEEntrance.forest_to_bmv, SVEEntrance.forest_to_marnie_shed]), + RegionData(SVERegion.marnies_shed), + RegionData(SVERegion.fairhaven_farm), + RegionData(Region.town, [SVEEntrance.town_to_bmv, SVEEntrance.town_to_jenkins, + SVEEntrance.town_to_bridge, SVEEntrance.town_to_plot]), + RegionData(SVERegion.blue_moon_vineyard, [SVEEntrance.bmv_to_sophia, SVEEntrance.bmv_to_beach]), + RegionData(SVERegion.sophias_house), + RegionData(SVERegion.jenkins_residence, [SVEEntrance.jenkins_to_cellar]), + RegionData(SVERegion.jenkins_cellar), + RegionData(SVERegion.unclaimed_plot, [SVEEntrance.plot_to_bridge]), + RegionData(SVERegion.shearwater), + RegionData(Region.museum, [SVEEntrance.museum_to_gunther_bedroom]), + RegionData(SVERegion.gunther_bedroom), + RegionData(Region.fish_shop, [SVEEntrance.fish_shop_to_willy_bedroom]), + RegionData(SVERegion.willy_bedroom), + RegionData(Region.mountain, [SVEEntrance.mountain_to_guild_summit]), + RegionData(SVERegion.guild_summit, [SVEEntrance.guild_to_interior, SVEEntrance.guild_to_mines, + SVEEntrance.summit_to_highlands]), + RegionData(Region.railroad, [SVEEntrance.to_susan_house, SVEEntrance.enter_summit, SVEEntrance.railroad_to_grampleton_station]), + RegionData(SVERegion.grampleton_station, [SVEEntrance.grampleton_station_to_grampleton_suburbs]), + RegionData(SVERegion.grampleton_suburbs, [SVEEntrance.grampleton_suburbs_to_scarlett_house]), + RegionData(SVERegion.scarlett_house), + RegionData(Region.wizard_basement, [SVEEntrance.wizard_to_fable_reef]), + RegionData(SVERegion.fable_reef, [SVEEntrance.fable_reef_to_guild]), + RegionData(SVERegion.first_slash_guild, [SVEEntrance.first_slash_guild_to_hallway]), + RegionData(SVERegion.first_slash_hallway, [SVEEntrance.first_slash_hallway_to_room]), + RegionData(SVERegion.first_slash_spare_room), + RegionData(SVERegion.highlands_outside, [SVEEntrance.highlands_to_lance, SVEEntrance.highlands_to_cave]), + RegionData(SVERegion.highlands_cavern, [SVEEntrance.to_dwarf_prison]), + RegionData(SVERegion.dwarf_prison), + RegionData(SVERegion.lances_house, [SVEEntrance.lance_to_ladder]), + RegionData(SVERegion.lances_ladder, [SVEEntrance.lance_ladder_to_highlands]), + RegionData(SVERegion.forest_west, [SVEEntrance.forest_west_to_spring, SVEEntrance.west_to_aurora, + SVEEntrance.use_bear_shop]), + RegionData(SVERegion.aurora_vineyard, [SVEEntrance.to_aurora_basement]), + RegionData(SVERegion.aurora_vineyard_basement), + RegionData(Region.secret_woods, [SVEEntrance.secret_woods_to_west]), + RegionData(SVERegion.bear_shop), + RegionData(SVERegion.sprite_spring, [SVEEntrance.sprite_spring_to_cave]), + RegionData(SVERegion.sprite_spring_cave), + RegionData(SVERegion.lost_woods, [SVEEntrance.lost_woods_to_junimo_woods]), + RegionData(SVERegion.junimo_woods, [SVEEntrance.use_purple_junimo]), + RegionData(SVERegion.purple_junimo_shop), + RegionData(SVERegion.alesia_shop), + RegionData(SVERegion.isaac_shop), + RegionData(SVERegion.summit), + RegionData(SVERegion.susans_house), + RegionData(Region.mountain, [Entrance.mountain_to_adventurer_guild, Entrance.mountain_to_the_mines], ModificationFlag.MODIFIED) + +] + +mandatory_sve_connections = [ + ConnectionData(SVEEntrance.town_to_jenkins, SVERegion.jenkins_residence, flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(SVEEntrance.jenkins_to_cellar, SVERegion.jenkins_cellar, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.forest_to_bmv, SVERegion.blue_moon_vineyard), + ConnectionData(SVEEntrance.bmv_to_beach, Region.beach), + ConnectionData(SVEEntrance.town_to_plot, SVERegion.unclaimed_plot), + ConnectionData(SVEEntrance.town_to_bmv, SVERegion.blue_moon_vineyard), + ConnectionData(SVEEntrance.town_to_bridge, SVERegion.shearwater), + ConnectionData(SVEEntrance.plot_to_bridge, SVERegion.shearwater), + ConnectionData(SVEEntrance.bus_stop_to_shed, SVERegion.grandpas_shed), + ConnectionData(SVEEntrance.grandpa_shed_to_interior, SVERegion.grandpas_shed_interior, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(SVEEntrance.grandpa_interior_to_upstairs, SVERegion.grandpas_shed_upstairs, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.grandpa_shed_to_town, Region.town), + ConnectionData(SVEEntrance.bmv_to_sophia, SVERegion.sophias_house, flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(SVEEntrance.summit_to_highlands, SVERegion.highlands_outside, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.guild_to_interior, Region.adventurer_guild, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.backwoods_to_grove, SVERegion.enchanted_grove, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(SVEEntrance.grove_to_outpost_warp, SVERegion.grove_outpost_warp), + ConnectionData(SVEEntrance.outpost_warp_to_outpost, SVERegion.galmoran_outpost, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.grove_to_wizard_warp, SVERegion.grove_wizard_warp), + ConnectionData(SVEEntrance.wizard_warp_to_wizard, Region.wizard_basement, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.grove_to_aurora_warp, SVERegion.grove_aurora_warp), + ConnectionData(SVEEntrance.aurora_warp_to_aurora, SVERegion.aurora_vineyard_basement, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.grove_to_farm_warp, SVERegion.grove_farm_warp), + ConnectionData(SVEEntrance.to_aurora_basement, SVERegion.aurora_vineyard_basement, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.farm_warp_to_farm, Region.farm), + ConnectionData(SVEEntrance.grove_to_guild_warp, SVERegion.grove_guild_warp), + ConnectionData(SVEEntrance.guild_warp_to_guild, Region.adventurer_guild, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.grove_to_junimo_warp, SVERegion.grove_junimo_warp), + ConnectionData(SVEEntrance.junimo_warp_to_junimo, SVERegion.junimo_woods, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.use_purple_junimo, SVERegion.purple_junimo_shop), + ConnectionData(SVEEntrance.grove_to_spring_warp, SVERegion.grove_spring_warp), + ConnectionData(SVEEntrance.spring_warp_to_spring, SVERegion.sprite_spring, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.wizard_to_fable_reef, SVERegion.fable_reef, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.fable_reef_to_guild, SVERegion.first_slash_guild, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.outpost_to_badlands_entrance, SVERegion.badlands_entrance, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.badlands_entrance_to_badlands, SVERegion.crimson_badlands, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.badlands_to_cave, SVERegion.badlands_cave, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.guild_to_mines, Region.mines, flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(SVEEntrance.mountain_to_guild_summit, SVERegion.guild_summit), + ConnectionData(SVEEntrance.forest_to_west, SVERegion.forest_west), + ConnectionData(SVEEntrance.secret_woods_to_west, SVERegion.forest_west), + ConnectionData(SVEEntrance.west_to_aurora, SVERegion.aurora_vineyard, flag=RandomizationFlag.NON_PROGRESSION), + ConnectionData(SVEEntrance.forest_to_lost_woods, SVERegion.lost_woods), + ConnectionData(SVEEntrance.lost_woods_to_junimo_woods, SVERegion.junimo_woods), + ConnectionData(SVEEntrance.forest_to_marnie_shed, SVERegion.marnies_shed, flag=RandomizationFlag.NON_PROGRESSION), + ConnectionData(SVEEntrance.forest_west_to_spring, SVERegion.sprite_spring, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.to_susan_house, SVERegion.susans_house, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.enter_summit, SVERegion.summit, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.forest_to_fairhaven, SVERegion.fairhaven_farm, flag=RandomizationFlag.NON_PROGRESSION), + ConnectionData(SVEEntrance.highlands_to_lance, SVERegion.lances_house, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.lance_to_ladder, SVERegion.lances_ladder, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.lance_ladder_to_highlands, SVERegion.highlands_outside, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.highlands_to_cave, SVERegion.highlands_cavern, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.use_bear_shop, SVERegion.bear_shop), + ConnectionData(SVEEntrance.use_purple_junimo, SVERegion.purple_junimo_shop), + ConnectionData(SVEEntrance.use_alesia_shop, SVERegion.alesia_shop), + ConnectionData(SVEEntrance.use_isaac_shop, SVERegion.isaac_shop), + ConnectionData(SVEEntrance.to_dwarf_prison, SVERegion.dwarf_prison, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.railroad_to_grampleton_station, SVERegion.grampleton_station), + ConnectionData(SVEEntrance.grampleton_station_to_grampleton_suburbs, SVERegion.grampleton_suburbs), + ConnectionData(SVEEntrance.grampleton_suburbs_to_scarlett_house, SVERegion.scarlett_house, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.first_slash_guild_to_hallway, SVERegion.first_slash_hallway, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.first_slash_hallway_to_room, SVERegion.first_slash_spare_room, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(SVEEntrance.sprite_spring_to_cave, SVERegion.sprite_spring_cave, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.fish_shop_to_willy_bedroom, SVERegion.willy_bedroom, flag=RandomizationFlag.BUILDINGS), + ConnectionData(SVEEntrance.museum_to_gunther_bedroom, SVERegion.gunther_bedroom, flag=RandomizationFlag.BUILDINGS), +] + +alecto_regions = [ + RegionData(Region.witch_hut, [AlectoEntrance.witch_hut_to_witch_attic]), + RegionData(AlectoRegion.witch_attic) +] + +alecto_entrances = [ + ConnectionData(AlectoEntrance.witch_hut_to_witch_attic, AlectoRegion.witch_attic, flag=RandomizationFlag.BUILDINGS) +] + +lacey_regions = [ + RegionData(Region.forest, [LaceyEntrance.forest_to_hat_house]), + RegionData(LaceyRegion.hat_house) +] + +lacey_entrances = [ + ConnectionData(LaceyEntrance.forest_to_hat_house, LaceyRegion.hat_house, flag=RandomizationFlag.BUILDINGS) +] + +boarding_house_regions = [ + RegionData(Region.bus_stop, [BoardingHouseEntrance.bus_stop_to_boarding_house_plateau]), + RegionData(BoardingHouseRegion.boarding_house_plateau, [BoardingHouseEntrance.boarding_house_plateau_to_boarding_house_first, + BoardingHouseEntrance.boarding_house_plateau_to_buffalo_ranch, + BoardingHouseEntrance.boarding_house_plateau_to_abandoned_mines_entrance]), + RegionData(BoardingHouseRegion.boarding_house_first, [BoardingHouseEntrance.boarding_house_first_to_boarding_house_second]), + RegionData(BoardingHouseRegion.boarding_house_second), + RegionData(BoardingHouseRegion.buffalo_ranch), + RegionData(BoardingHouseRegion.abandoned_mines_entrance, [BoardingHouseEntrance.abandoned_mines_entrance_to_abandoned_mines_1a, + BoardingHouseEntrance.abandoned_mines_entrance_to_the_lost_valley]), + RegionData(BoardingHouseRegion.abandoned_mines_1a, [BoardingHouseEntrance.abandoned_mines_1a_to_abandoned_mines_1b]), + RegionData(BoardingHouseRegion.abandoned_mines_1b, [BoardingHouseEntrance.abandoned_mines_1b_to_abandoned_mines_2a]), + RegionData(BoardingHouseRegion.abandoned_mines_2a, [BoardingHouseEntrance.abandoned_mines_2a_to_abandoned_mines_2b]), + RegionData(BoardingHouseRegion.abandoned_mines_2b, [BoardingHouseEntrance.abandoned_mines_2b_to_abandoned_mines_3]), + RegionData(BoardingHouseRegion.abandoned_mines_3, [BoardingHouseEntrance.abandoned_mines_3_to_abandoned_mines_4]), + RegionData(BoardingHouseRegion.abandoned_mines_4, [BoardingHouseEntrance.abandoned_mines_4_to_abandoned_mines_5]), + RegionData(BoardingHouseRegion.abandoned_mines_5, [BoardingHouseEntrance.abandoned_mines_5_to_the_lost_valley]), + RegionData(BoardingHouseRegion.the_lost_valley, [BoardingHouseEntrance.the_lost_valley_to_gregory_tent, + BoardingHouseEntrance.lost_valley_to_lost_valley_minecart, + BoardingHouseEntrance.the_lost_valley_to_lost_valley_ruins]), + RegionData(BoardingHouseRegion.gregory_tent), + RegionData(BoardingHouseRegion.lost_valley_ruins, [BoardingHouseEntrance.lost_valley_ruins_to_lost_valley_house_1, + BoardingHouseEntrance.lost_valley_ruins_to_lost_valley_house_2]), + RegionData(BoardingHouseRegion.lost_valley_minecart), + RegionData(BoardingHouseRegion.lost_valley_house_1), + RegionData(BoardingHouseRegion.lost_valley_house_2) +] + +boarding_house_entrances = [ + ConnectionData(BoardingHouseEntrance.bus_stop_to_boarding_house_plateau, BoardingHouseRegion.boarding_house_plateau), + ConnectionData(BoardingHouseEntrance.boarding_house_plateau_to_boarding_house_first, BoardingHouseRegion.boarding_house_first, + flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(BoardingHouseEntrance.boarding_house_first_to_boarding_house_second, BoardingHouseRegion.boarding_house_second, + flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.boarding_house_plateau_to_buffalo_ranch, BoardingHouseRegion.buffalo_ranch, + flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(BoardingHouseEntrance.boarding_house_plateau_to_abandoned_mines_entrance, BoardingHouseRegion.abandoned_mines_entrance, + flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(BoardingHouseEntrance.abandoned_mines_entrance_to_the_lost_valley, BoardingHouseRegion.lost_valley_minecart, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_entrance_to_abandoned_mines_1a, BoardingHouseRegion.abandoned_mines_1a, + flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_1a_to_abandoned_mines_1b, BoardingHouseRegion.abandoned_mines_1b, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_1b_to_abandoned_mines_2a, BoardingHouseRegion.abandoned_mines_2a, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_2a_to_abandoned_mines_2b, BoardingHouseRegion.abandoned_mines_2b, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_2b_to_abandoned_mines_3, BoardingHouseRegion.abandoned_mines_3, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_3_to_abandoned_mines_4, BoardingHouseRegion.abandoned_mines_4, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_4_to_abandoned_mines_5, BoardingHouseRegion.abandoned_mines_5, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.abandoned_mines_5_to_the_lost_valley, BoardingHouseRegion.the_lost_valley, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.the_lost_valley_to_gregory_tent, BoardingHouseRegion.gregory_tent, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.lost_valley_to_lost_valley_minecart, BoardingHouseRegion.lost_valley_minecart), + ConnectionData(BoardingHouseEntrance.the_lost_valley_to_lost_valley_ruins, BoardingHouseRegion.lost_valley_ruins, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.lost_valley_ruins_to_lost_valley_house_1, BoardingHouseRegion.lost_valley_house_1, flag=RandomizationFlag.BUILDINGS), + ConnectionData(BoardingHouseEntrance.lost_valley_ruins_to_lost_valley_house_2, BoardingHouseRegion.lost_valley_house_2, flag=RandomizationFlag.BUILDINGS) + + +] + +vanilla_connections_to_remove_by_mod: Dict[str, List[ConnectionData]] = { + ModNames.sve: [ConnectionData(Entrance.mountain_to_the_mines, Region.mines, + flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(Entrance.mountain_to_adventurer_guild, Region.adventurer_guild, + flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), + ] +} + ModDataList = { ModNames.deepwoods: ModRegionData(ModNames.deepwoods, deep_woods_regions, deep_woods_entrances), ModNames.eugene: ModRegionData(ModNames.eugene, eugene_regions, eugene_entrances), @@ -141,4 +369,8 @@ ModNames.magic: ModRegionData(ModNames.magic, magic_regions, magic_entrances), ModNames.ayeisha: ModRegionData(ModNames.ayeisha, ayeisha_regions, ayeisha_entrances), ModNames.riley: ModRegionData(ModNames.riley, riley_regions, riley_entrances), + ModNames.sve: ModRegionData(ModNames.sve, stardew_valley_expanded_regions, mandatory_sve_connections), + ModNames.alecto: ModRegionData(ModNames.alecto, alecto_regions, alecto_entrances), + ModNames.lacey: ModRegionData(ModNames.lacey, lacey_regions, lacey_entrances), + ModNames.boarding_house: ModRegionData(ModNames.boarding_house, boarding_house_regions, boarding_house_entrances), } diff --git a/worlds/stardew_valley/options.py b/worlds/stardew_valley/options.py index 267ebd7a63de..c2d239d2749e 100644 --- a/worlds/stardew_valley/options.py +++ b/worlds/stardew_valley/options.py @@ -1,21 +1,32 @@ from dataclasses import dataclass -from typing import Dict +from typing import Protocol, ClassVar -from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink, Option +from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink from .mods.mod_data import ModNames +class StardewValleyOption(Protocol): + internal_name: ClassVar[str] + + class Goal(Choice): """What's your goal with this play-through? - Community Center: Complete the Community Center. - Grandpa's Evaluation: Succeed grandpa's evaluation with 4 lit candles. - Bottom of the Mines: Reach level 120 in the mineshaft. - Cryptic Note: Complete the quest "Cryptic Note" where Mr Qi asks you to reach floor 100 in the Skull Cavern. - Master Angler: Catch every fish in the game. Pairs well with Fishsanity. - Complete Collection: Complete the museum by donating every possible item. Pairs well with Museumsanity. - Full House: Get married and have two children. Pairs well with Friendsanity. + Community Center: Complete the Community Center + Grandpa's Evaluation: Succeed Grandpa's evaluation with 4 lit candles + Bottom of the Mines: Reach level 120 in the mineshaft + Cryptic Note: Complete the quest "Cryptic Note" where Mr Qi asks you to reach floor 100 in the Skull Cavern + Master Angler: Catch every fish. Adapts to chosen Fishsanity option + Complete Collection: Complete the museum by donating every possible item. Pairs well with Museumsanity + Full House: Get married and have two children. Pairs well with Friendsanity Greatest Walnut Hunter: Find all 130 Golden Walnuts - Perfection: Attain Perfection, based on the vanilla definition. + Protector of the Valley: Complete all the monster slayer goals. Adapts to Monstersanity + Full Shipment: Ship every item in the collection tab. Adapts to Shipsanity + Gourmet Chef: Cook every recipe. Adapts to Cooksanity + Craft Master: Craft every item. + Legend: Earn 10 000 000g + Mystery of the Stardrops: Find every stardrop + Allsanity: Complete every check in your slot + Perfection: Attain Perfection, based on the vanilla definition """ internal_name = "goal" display_name = "Goal" @@ -28,16 +39,18 @@ class Goal(Choice): option_complete_collection = 5 option_full_house = 6 option_greatest_walnut_hunter = 7 + option_protector_of_the_valley = 8 + option_full_shipment = 9 + option_gourmet_chef = 10 + option_craft_master = 11 + option_legend = 12 + option_mystery_of_the_stardrops = 13 # option_junimo_kart = # option_prairie_king = # option_fector_challenge = - # option_craft_master = - # option_mystery_of_the_stardrops = - # option_protector_of_the_valley = - # option_full_shipment = - # option_legend = # option_beloved_farmer = # option_master_of_the_five_ways = + option_allsanity = 24 option_perfection = 25 @classmethod @@ -48,6 +61,20 @@ def get_option_name(cls, value) -> str: return super().get_option_name(value) +class FarmType(Choice): + """What farm to play on?""" + internal_name = "farm_type" + display_name = "Farm Type" + default = "random" + option_standard = 0 + option_riverland = 1 + option_forest = 2 + option_hill_top = 3 + option_wilderness = 4 + option_four_corners = 5 + option_beach = 6 + + class StartingMoney(NamedRange): """Amount of gold when arriving at the farm. Set to -1 or unlimited for infinite money""" @@ -90,28 +117,36 @@ class BundleRandomization(Choice): """What items are needed for the community center bundles? Vanilla: Standard bundles from the vanilla game Thematic: Every bundle will require random items compatible with their original theme + Remixed: Picks bundles at random from thematic, vanilla remixed and new custom ones Shuffled: Every bundle will require random items and follow no particular structure""" internal_name = "bundle_randomization" display_name = "Bundle Randomization" - default = 1 + default = 2 option_vanilla = 0 option_thematic = 1 - option_shuffled = 2 + option_remixed = 2 + option_shuffled = 3 class BundlePrice(Choice): """How many items are needed for the community center bundles? + Minimum: Every bundle will require only one item Very Cheap: Every bundle will require 2 items fewer than usual Cheap: Every bundle will require 1 item fewer than usual Normal: Every bundle will require the vanilla number of items - Expensive: Every bundle will require 1 extra item when applicable""" + Expensive: Every bundle will require 1 extra item + Very Expensive: Every bundle will require 2 extra items + Maximum: Every bundle will require many extra items""" internal_name = "bundle_price" display_name = "Bundle Price" - default = 2 - option_very_cheap = 0 - option_cheap = 1 - option_normal = 2 - option_expensive = 3 + default = 0 + option_minimum = -8 + option_very_cheap = -2 + option_cheap = -1 + option_normal = 0 + option_expensive = 1 + option_very_expensive = 2 + option_maximum = 8 class EntranceRandomization(Choice): @@ -189,12 +224,18 @@ class BackpackProgression(Choice): class ToolProgression(Choice): """Shuffle the tool upgrades? Vanilla: Clint will upgrade your tools with metal bars. - Progressive: You will randomly find Progressive Tool upgrades.""" + Progressive: You will randomly find Progressive Tool upgrades. + Cheap: Tool Upgrades will cost 2/5th as much + Very Cheap: Tool Upgrades will cost 1/5th as much""" internal_name = "tool_progression" display_name = "Tool Progression" default = 1 - option_vanilla = 0 - option_progressive = 1 + option_vanilla = 0b000 # 0 + option_progressive = 0b001 # 1 + option_vanilla_cheap = 0b010 # 2 + option_vanilla_very_cheap = 0b100 # 4 + option_progressive_cheap = 0b011 # 3 + option_progressive_very_cheap = 0b101 # 5 class ElevatorProgression(Choice): @@ -228,13 +269,18 @@ class BuildingProgression(Choice): Progressive: You will receive the buildings and will be able to build the first one of each type for free, once it is received. If you want more of the same building, it will cost the vanilla price. Progressive early shipping bin: Same as Progressive, but the shipping bin will be placed early in the multiworld. + Cheap: Buildings will cost half as much + Very Cheap: Buildings will cost 1/5th as much """ internal_name = "building_progression" display_name = "Building Progression" - default = 2 - option_vanilla = 0 - option_progressive = 1 - option_progressive_early_shipping_bin = 2 + default = 3 + option_vanilla = 0b000 # 0 + option_vanilla_cheap = 0b010 # 2 + option_vanilla_very_cheap = 0b100 # 4 + option_progressive = 0b001 # 1 + option_progressive_cheap = 0b011 # 3 + option_progressive_very_cheap = 0b101 # 5 class FestivalLocations(Choice): @@ -283,19 +329,23 @@ class SpecialOrderLocations(Choice): option_board_qi = 2 -class HelpWantedLocations(NamedRange): - """Include location checks for Help Wanted quests - Out of every 7 quests, 4 will be item deliveries, and then 1 of each for: Fishing, Gathering and Slaying Monsters. - Choosing a multiple of 7 is recommended.""" - internal_name = "help_wanted_locations" +class QuestLocations(NamedRange): + """Include location checks for quests + None: No quests are checks + Story: Only story quests are checks + Number: Story quests and help wanted quests are checks up to the specified amount. Multiple of 7 recommended + Out of every 7 help wanted quests, 4 will be item deliveries, and then 1 of each for: Fishing, Gathering and Slaying Monsters. + Extra Help wanted quests might be added if current settings don't have enough locations""" + internal_name = "quest_locations" default = 7 range_start = 0 range_end = 56 # step = 7 - display_name = "Number of Help Wanted locations" + display_name = "Quest Locations" special_range_names = { - "none": 0, + "none": -1, + "story": 0, "minimum": 7, "normal": 14, "lots": 28, @@ -344,6 +394,115 @@ class Museumsanity(Choice): option_all = 3 +class Monstersanity(Choice): + """Locations for slaying monsters? + None: There are no checks for slaying monsters + One per category: Every category visible at the adventure guild gives one check + One per Monster: Every unique monster gives one check + Monster Eradication Goals: The Monster Eradication Goals each contain one check + Short Monster Eradication Goals: The Monster Eradication Goals each contain one check, but are reduced by 60% + Very Short Monster Eradication Goals: The Monster Eradication Goals each contain one check, but are reduced by 90% + Progressive Eradication Goals: The Monster Eradication Goals each contain 5 checks, each 20% of the way + Split Eradication Goals: The Monster Eradication Goals are split by monsters, each monster has one check + """ + internal_name = "monstersanity" + display_name = "Monstersanity" + default = 1 + option_none = 0 + option_one_per_category = 1 + option_one_per_monster = 2 + option_goals = 3 + option_short_goals = 4 + option_very_short_goals = 5 + option_progressive_goals = 6 + option_split_goals = 7 + + +class Shipsanity(Choice): + """Locations for shipping items? + None: There are no checks for shipping items + Crops: Every crop and forageable being shipped is a check + Fish: Every fish being shipped is a check except legendaries + Full Shipment: Every item in the Collections page is a check + Full Shipment With Fish: Every item in the Collections page and every fish is a check + Everything: Every item in the game that can be shipped is a check + """ + internal_name = "shipsanity" + display_name = "Shipsanity" + default = 0 + option_none = 0 + option_crops = 1 + # option_quality_crops = 2 + option_fish = 3 + # option_quality_fish = 4 + option_full_shipment = 5 + # option_quality_full_shipment = 6 + option_full_shipment_with_fish = 7 + # option_quality_full_shipment_with_fish = 8 + option_everything = 9 + # option_quality_everything = 10 + + +class Cooksanity(Choice): + """Locations for cooking food? + None: There are no checks for cooking + Queen of Sauce: Every Queen of Sauce Recipe can be cooked for a check + All: Every cooking recipe can be cooked for a check + """ + internal_name = "cooksanity" + display_name = "Cooksanity" + default = 0 + option_none = 0 + option_queen_of_sauce = 1 + option_all = 2 + + +class Chefsanity(NamedRange): + """Locations for leaning cooking recipes? + Vanilla: All cooking recipes are learned normally + Queen of Sauce: Every Queen of sauce episode is a check, all queen of sauce recipes are items + Purchases: Every purchasable recipe is a check + Friendship: Recipes obtained from friendship are checks + Skills: Recipes obtained from skills are checks + All: Learning every cooking recipe is a check + """ + internal_name = "chefsanity" + display_name = "Chefsanity" + default = 0 + range_start = 0 + range_end = 15 + + option_none = 0b0000 # 0 + option_queen_of_sauce = 0b0001 # 1 + option_purchases = 0b0010 # 2 + option_qos_and_purchases = 0b0011 # 3 + option_skills = 0b0100 # 4 + option_friendship = 0b1000 # 8 + option_all = 0b1111 # 15 + + special_range_names = { + "none": 0b0000, # 0 + "queen_of_sauce": 0b0001, # 1 + "purchases": 0b0010, # 2 + "qos_and_purchases": 0b0011, # 3 + "skills": 0b0100, # 4 + "friendship": 0b1000, # 8 + "all": 0b1111, # 15 + } + + +class Craftsanity(Choice): + """Checks for crafting items? + If enabled, all recipes purchased in shops will be checks as well. + Recipes obtained from other sources will depend on related archipelago settings + """ + internal_name = "craftsanity" + display_name = "Craftsanity" + default = 0 + option_none = 0 + option_all = 1 + + class Friendsanity(Choice): """Shuffle Friendships? None: Friendship hearts are earned normally @@ -530,13 +689,15 @@ class Mods(OptionSet): ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna, ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene, ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores, - ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator + ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator, ModNames.sve, ModNames.distant_lands, + ModNames.alecto, ModNames.lacey, ModNames.boarding_house } @dataclass class StardewValleyOptions(PerGameCommonOptions): goal: Goal + farm_type: FarmType starting_money: StartingMoney profit_margin: ProfitMargin bundle_randomization: BundleRandomization @@ -552,9 +713,14 @@ class StardewValleyOptions(PerGameCommonOptions): elevator_progression: ElevatorProgression arcade_machine_locations: ArcadeMachineLocations special_order_locations: SpecialOrderLocations - help_wanted_locations: HelpWantedLocations + quest_locations: QuestLocations fishsanity: Fishsanity museumsanity: Museumsanity + monstersanity: Monstersanity + shipsanity: Shipsanity + cooksanity: Cooksanity + chefsanity: Chefsanity + craftsanity: Craftsanity friendsanity: Friendsanity friendsanity_heart_size: FriendsanityHeartSize movement_buff_number: NumberOfMovementBuffs diff --git a/worlds/stardew_valley/presets.py b/worlds/stardew_valley/presets.py index 8823c52e5b20..020b3f49277f 100644 --- a/worlds/stardew_valley/presets.py +++ b/worlds/stardew_valley/presets.py @@ -3,14 +3,15 @@ from Options import Accessibility, ProgressionBalancing, DeathLink from .options import Goal, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice, EntranceRandomization, SeasonRandomization, Cropsanity, \ BackpackProgression, ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations, ArcadeMachineLocations, \ - SpecialOrderLocations, HelpWantedLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize, NumberOfMovementBuffs, NumberOfLuckBuffs, \ + SpecialOrderLocations, QuestLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize, NumberOfMovementBuffs, NumberOfLuckBuffs, \ ExcludeGingerIsland, TrapItems, MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier, FriendshipMultiplier, DebrisMultiplier, QuickStart, \ - Gifting + Gifting, FarmType, Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity all_random_settings = { "progression_balancing": "random", "accessibility": "random", Goal.internal_name: "random", + FarmType.internal_name: "random", StartingMoney.internal_name: "random", ProfitMargin.internal_name: "random", BundleRandomization.internal_name: "random", @@ -26,9 +27,14 @@ FestivalLocations.internal_name: "random", ArcadeMachineLocations.internal_name: "random", SpecialOrderLocations.internal_name: "random", - HelpWantedLocations.internal_name: "random", + QuestLocations.internal_name: "random", Fishsanity.internal_name: "random", Museumsanity.internal_name: "random", + Monstersanity.internal_name: "random", + Shipsanity.internal_name: "random", + Cooksanity.internal_name: "random", + Chefsanity.internal_name: "random", + Craftsanity.internal_name: "random", Friendsanity.internal_name: "random", FriendsanityHeartSize.internal_name: "random", NumberOfMovementBuffs.internal_name: "random", @@ -49,6 +55,7 @@ "progression_balancing": ProgressionBalancing.default, "accessibility": Accessibility.option_items, Goal.internal_name: Goal.option_community_center, + FarmType.internal_name: "random", StartingMoney.internal_name: "very rich", ProfitMargin.internal_name: "double", BundleRandomization.internal_name: BundleRandomization.option_thematic, @@ -60,13 +67,18 @@ ToolProgression.internal_name: ToolProgression.option_progressive, ElevatorProgression.internal_name: ElevatorProgression.option_progressive, SkillProgression.internal_name: SkillProgression.option_progressive, - BuildingProgression.internal_name: BuildingProgression.option_progressive_early_shipping_bin, + BuildingProgression.internal_name: BuildingProgression.option_progressive_very_cheap, FestivalLocations.internal_name: FestivalLocations.option_easy, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled, - HelpWantedLocations.internal_name: "minimum", + QuestLocations.internal_name: "minimum", Fishsanity.internal_name: Fishsanity.option_only_easy_fish, Museumsanity.internal_name: Museumsanity.option_milestones, + Monstersanity.internal_name: Monstersanity.option_one_per_category, + Shipsanity.internal_name: Shipsanity.option_none, + Cooksanity.internal_name: Cooksanity.option_none, + Chefsanity.internal_name: Chefsanity.option_none, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_none, FriendsanityHeartSize.internal_name: 4, NumberOfMovementBuffs.internal_name: 8, @@ -87,6 +99,7 @@ "progression_balancing": 25, "accessibility": Accessibility.option_locations, Goal.internal_name: Goal.option_community_center, + FarmType.internal_name: "random", StartingMoney.internal_name: "rich", ProfitMargin.internal_name: 150, BundleRandomization.internal_name: BundleRandomization.option_thematic, @@ -98,13 +111,18 @@ ToolProgression.internal_name: ToolProgression.option_progressive, ElevatorProgression.internal_name: ElevatorProgression.option_progressive_from_previous_floor, SkillProgression.internal_name: SkillProgression.option_progressive, - BuildingProgression.internal_name: BuildingProgression.option_progressive_early_shipping_bin, + BuildingProgression.internal_name: BuildingProgression.option_progressive_cheap, FestivalLocations.internal_name: FestivalLocations.option_hard, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_victories_easy, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_only, - HelpWantedLocations.internal_name: "normal", + QuestLocations.internal_name: "normal", Fishsanity.internal_name: Fishsanity.option_exclude_legendaries, Museumsanity.internal_name: Museumsanity.option_milestones, + Monstersanity.internal_name: Monstersanity.option_one_per_monster, + Shipsanity.internal_name: Shipsanity.option_none, + Cooksanity.internal_name: Cooksanity.option_none, + Chefsanity.internal_name: Chefsanity.option_queen_of_sauce, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_starting_npcs, FriendsanityHeartSize.internal_name: 4, NumberOfMovementBuffs.internal_name: 6, @@ -125,6 +143,7 @@ "progression_balancing": 0, "accessibility": Accessibility.option_locations, Goal.internal_name: Goal.option_grandpa_evaluation, + FarmType.internal_name: "random", StartingMoney.internal_name: "extra", ProfitMargin.internal_name: "normal", BundleRandomization.internal_name: BundleRandomization.option_thematic, @@ -140,9 +159,14 @@ FestivalLocations.internal_name: FestivalLocations.option_hard, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, - HelpWantedLocations.internal_name: "lots", + QuestLocations.internal_name: "lots", Fishsanity.internal_name: Fishsanity.option_all, Museumsanity.internal_name: Museumsanity.option_all, + Monstersanity.internal_name: Monstersanity.option_progressive_goals, + Shipsanity.internal_name: Shipsanity.option_crops, + Cooksanity.internal_name: Cooksanity.option_queen_of_sauce, + Chefsanity.internal_name: Chefsanity.option_qos_and_purchases, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_all, FriendsanityHeartSize.internal_name: 4, NumberOfMovementBuffs.internal_name: 4, @@ -163,6 +187,7 @@ "progression_balancing": 0, "accessibility": Accessibility.option_locations, Goal.internal_name: Goal.option_community_center, + FarmType.internal_name: "random", StartingMoney.internal_name: "vanilla", ProfitMargin.internal_name: "half", BundleRandomization.internal_name: BundleRandomization.option_shuffled, @@ -178,9 +203,14 @@ FestivalLocations.internal_name: FestivalLocations.option_hard, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, - HelpWantedLocations.internal_name: "maximum", + QuestLocations.internal_name: "maximum", Fishsanity.internal_name: Fishsanity.option_special, Museumsanity.internal_name: Museumsanity.option_all, + Monstersanity.internal_name: Monstersanity.option_split_goals, + Shipsanity.internal_name: Shipsanity.option_full_shipment_with_fish, + Cooksanity.internal_name: Cooksanity.option_queen_of_sauce, + Chefsanity.internal_name: Chefsanity.option_qos_and_purchases, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_all_with_marriage, FriendsanityHeartSize.internal_name: 4, NumberOfMovementBuffs.internal_name: 2, @@ -201,6 +231,7 @@ "progression_balancing": ProgressionBalancing.default, "accessibility": Accessibility.option_items, Goal.internal_name: Goal.option_bottom_of_the_mines, + FarmType.internal_name: "random", StartingMoney.internal_name: "filthy rich", ProfitMargin.internal_name: "quadruple", BundleRandomization.internal_name: BundleRandomization.option_thematic, @@ -212,13 +243,18 @@ ToolProgression.internal_name: ToolProgression.option_progressive, ElevatorProgression.internal_name: ElevatorProgression.option_progressive_from_previous_floor, SkillProgression.internal_name: SkillProgression.option_progressive, - BuildingProgression.internal_name: BuildingProgression.option_progressive_early_shipping_bin, + BuildingProgression.internal_name: BuildingProgression.option_progressive_very_cheap, FestivalLocations.internal_name: FestivalLocations.option_disabled, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled, - HelpWantedLocations.internal_name: "none", + QuestLocations.internal_name: "none", Fishsanity.internal_name: Fishsanity.option_none, Museumsanity.internal_name: Museumsanity.option_none, + Monstersanity.internal_name: Monstersanity.option_none, + Shipsanity.internal_name: Shipsanity.option_none, + Cooksanity.internal_name: Cooksanity.option_none, + Chefsanity.internal_name: Chefsanity.option_none, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_none, FriendsanityHeartSize.internal_name: 4, NumberOfMovementBuffs.internal_name: 10, @@ -235,10 +271,11 @@ "death_link": "false", } -lowsanity_settings = { +minsanity_settings = { "progression_balancing": ProgressionBalancing.default, "accessibility": Accessibility.option_minimal, Goal.internal_name: Goal.default, + FarmType.internal_name: "random", StartingMoney.internal_name: StartingMoney.default, ProfitMargin.internal_name: ProfitMargin.default, BundleRandomization.internal_name: BundleRandomization.default, @@ -254,9 +291,14 @@ FestivalLocations.internal_name: FestivalLocations.option_disabled, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled, - HelpWantedLocations.internal_name: "none", + QuestLocations.internal_name: "none", Fishsanity.internal_name: Fishsanity.option_none, Museumsanity.internal_name: Museumsanity.option_none, + Monstersanity.internal_name: Monstersanity.option_none, + Shipsanity.internal_name: Shipsanity.option_none, + Cooksanity.internal_name: Cooksanity.option_none, + Chefsanity.internal_name: Chefsanity.option_none, + Craftsanity.internal_name: Craftsanity.option_none, Friendsanity.internal_name: Friendsanity.option_none, FriendsanityHeartSize.internal_name: FriendsanityHeartSize.default, NumberOfMovementBuffs.internal_name: NumberOfMovementBuffs.default, @@ -277,6 +319,7 @@ "progression_balancing": ProgressionBalancing.default, "accessibility": Accessibility.option_locations, Goal.internal_name: Goal.default, + FarmType.internal_name: "random", StartingMoney.internal_name: StartingMoney.default, ProfitMargin.internal_name: ProfitMargin.default, BundleRandomization.internal_name: BundleRandomization.default, @@ -288,13 +331,18 @@ ToolProgression.internal_name: ToolProgression.option_progressive, ElevatorProgression.internal_name: ElevatorProgression.option_progressive, SkillProgression.internal_name: SkillProgression.option_progressive, - BuildingProgression.internal_name: BuildingProgression.option_progressive_early_shipping_bin, + BuildingProgression.internal_name: BuildingProgression.option_progressive, FestivalLocations.internal_name: FestivalLocations.option_hard, ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling, SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, - HelpWantedLocations.internal_name: "maximum", + QuestLocations.internal_name: "maximum", Fishsanity.internal_name: Fishsanity.option_all, Museumsanity.internal_name: Museumsanity.option_all, + Monstersanity.internal_name: Monstersanity.option_progressive_goals, + Shipsanity.internal_name: Shipsanity.option_everything, + Cooksanity.internal_name: Cooksanity.option_all, + Chefsanity.internal_name: Chefsanity.option_all, + Craftsanity.internal_name: Craftsanity.option_all, Friendsanity.internal_name: Friendsanity.option_all, FriendsanityHeartSize.internal_name: 1, NumberOfMovementBuffs.internal_name: 12, @@ -318,6 +366,6 @@ "Hard": hard_settings, "Nightmare": nightmare_settings, "Short": short_settings, - "Lowsanity": lowsanity_settings, + "Minsanity": minsanity_settings, "Allsanity": allsanity_settings, } diff --git a/worlds/stardew_valley/region_classes.py b/worlds/stardew_valley/region_classes.py index 9db322416a4d..eaabcfa5fd36 100644 --- a/worlds/stardew_valley/region_classes.py +++ b/worlds/stardew_valley/region_classes.py @@ -5,6 +5,10 @@ connector_keyword = " to " +class ModificationFlag(IntFlag): + NOT_MODIFIED = 0 + MODIFIED = 1 + class RandomizationFlag(IntFlag): NOT_RANDOMIZED = 0b0 PELICAN_TOWN = 0b11111 @@ -20,6 +24,7 @@ class RandomizationFlag(IntFlag): class RegionData: name: str exits: List[str] = field(default_factory=list) + flag: ModificationFlag = ModificationFlag.NOT_MODIFIED def get_merged_with(self, exits: List[str]): merged_exits = [] @@ -29,6 +34,10 @@ def get_merged_with(self, exits: List[str]): merged_exits = list(set(merged_exits)) return RegionData(self.name, merged_exits) + def get_without_exit(self, exit_to_remove: str): + exits = [exit for exit in self.exits if exit != exit_to_remove] + return RegionData(self.name, exits) + def get_clone(self): return self.get_merged_with(None) diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py index d8e224841143..4284b438f806 100644 --- a/worlds/stardew_valley/regions.py +++ b/worlds/stardew_valley/regions.py @@ -2,11 +2,11 @@ from typing import Iterable, Dict, Protocol, List, Tuple, Set from BaseClasses import Region, Entrance -from .options import EntranceRandomization, ExcludeGingerIsland, Museumsanity +from .options import EntranceRandomization, ExcludeGingerIsland, Museumsanity, StardewValleyOptions from .strings.entrance_names import Entrance from .strings.region_names import Region -from .region_classes import RegionData, ConnectionData, RandomizationFlag -from .mods.mod_regions import ModDataList +from .region_classes import RegionData, ConnectionData, RandomizationFlag, ModificationFlag +from .mods.mod_regions import ModDataList, vanilla_connections_to_remove_by_mod class RegionFactory(Protocol): @@ -17,12 +17,18 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: vanilla_regions = [ RegionData(Region.menu, [Entrance.to_stardew_valley]), RegionData(Region.stardew_valley, [Entrance.to_farmhouse]), - RegionData(Region.farm_house, [Entrance.farmhouse_to_farm, Entrance.downstairs_to_cellar]), + RegionData(Region.farm_house, [Entrance.farmhouse_to_farm, Entrance.downstairs_to_cellar, Entrance.farmhouse_cooking, Entrance.watch_queen_of_sauce]), RegionData(Region.cellar), + RegionData(Region.kitchen), + RegionData(Region.queen_of_sauce), RegionData(Region.farm, [Entrance.farm_to_backwoods, Entrance.farm_to_bus_stop, Entrance.farm_to_forest, Entrance.farm_to_farmcave, Entrance.enter_greenhouse, - Entrance.use_desert_obelisk, Entrance.use_island_obelisk]), + Entrance.enter_coop, Entrance.enter_barn, + Entrance.enter_shed, Entrance.enter_slime_hutch, + Entrance.farming, Entrance.shipping]), + RegionData(Region.farming), + RegionData(Region.shipping), RegionData(Region.backwoods, [Entrance.backwoods_to_mountain]), RegionData(Region.bus_stop, [Entrance.bus_stop_to_town, Entrance.take_bus_to_desert, Entrance.bus_stop_to_tunnel_entrance]), @@ -30,8 +36,22 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: [Entrance.forest_to_town, Entrance.enter_secret_woods, Entrance.forest_to_wizard_tower, Entrance.forest_to_marnie_ranch, Entrance.forest_to_leah_cottage, Entrance.forest_to_sewer, - Entrance.buy_from_traveling_merchant]), - RegionData(Region.traveling_cart), + Entrance.buy_from_traveling_merchant, + Entrance.attend_flower_dance, Entrance.attend_festival_of_ice]), + RegionData(Region.traveling_cart, [Entrance.buy_from_traveling_merchant_sunday, + Entrance.buy_from_traveling_merchant_monday, + Entrance.buy_from_traveling_merchant_tuesday, + Entrance.buy_from_traveling_merchant_wednesday, + Entrance.buy_from_traveling_merchant_thursday, + Entrance.buy_from_traveling_merchant_friday, + Entrance.buy_from_traveling_merchant_saturday]), + RegionData(Region.traveling_cart_sunday), + RegionData(Region.traveling_cart_monday), + RegionData(Region.traveling_cart_tuesday), + RegionData(Region.traveling_cart_wednesday), + RegionData(Region.traveling_cart_thursday), + RegionData(Region.traveling_cart_friday), + RegionData(Region.traveling_cart_saturday), RegionData(Region.farm_cave), RegionData(Region.greenhouse), RegionData(Region.mountain, @@ -51,15 +71,19 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: Entrance.town_to_sam_house, Entrance.town_to_haley_house, Entrance.town_to_sewer, Entrance.town_to_clint_blacksmith, Entrance.town_to_museum, - Entrance.town_to_jojamart]), - RegionData(Region.beach, - [Entrance.beach_to_willy_fish_shop, Entrance.enter_elliott_house, Entrance.enter_tide_pools]), + Entrance.town_to_jojamart, Entrance.purchase_movie_ticket, + Entrance.attend_egg_festival, Entrance.attend_fair, Entrance.attend_spirit_eve, Entrance.attend_winter_star]), + RegionData(Region.beach, [Entrance.beach_to_willy_fish_shop, Entrance.enter_elliott_house, Entrance.enter_tide_pools, + Entrance.fishing, + Entrance.attend_luau, Entrance.attend_moonlight_jellies, Entrance.attend_night_market]), + RegionData(Region.fishing), RegionData(Region.railroad, [Entrance.enter_bathhouse_entrance, Entrance.enter_witch_warp_cave]), RegionData(Region.ranch), RegionData(Region.leah_house), RegionData(Region.sewer, [Entrance.enter_mutant_bug_lair]), RegionData(Region.mutant_bug_lair), - RegionData(Region.wizard_tower, [Entrance.enter_wizard_basement]), + RegionData(Region.wizard_tower, [Entrance.enter_wizard_basement, + Entrance.use_desert_obelisk, Entrance.use_island_obelisk]), RegionData(Region.wizard_basement), RegionData(Region.tent), RegionData(Region.carpenter, [Entrance.enter_sebastian_room]), @@ -79,14 +103,27 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: RegionData(Region.pierre_store, [Entrance.enter_sunroom]), RegionData(Region.sunroom), RegionData(Region.saloon, [Entrance.play_journey_of_the_prairie_king, Entrance.play_junimo_kart]), + RegionData(Region.jotpk_world_1, [Entrance.reach_jotpk_world_2]), + RegionData(Region.jotpk_world_2, [Entrance.reach_jotpk_world_3]), + RegionData(Region.jotpk_world_3), + RegionData(Region.junimo_kart_1, [Entrance.reach_junimo_kart_2]), + RegionData(Region.junimo_kart_2, [Entrance.reach_junimo_kart_3]), + RegionData(Region.junimo_kart_3), RegionData(Region.alex_house), RegionData(Region.trailer), RegionData(Region.mayor_house), RegionData(Region.sam_house), RegionData(Region.haley_house), - RegionData(Region.blacksmith), + RegionData(Region.blacksmith, [Entrance.blacksmith_copper]), + RegionData(Region.blacksmith_copper, [Entrance.blacksmith_iron]), + RegionData(Region.blacksmith_iron, [Entrance.blacksmith_gold]), + RegionData(Region.blacksmith_gold, [Entrance.blacksmith_iridium]), + RegionData(Region.blacksmith_iridium), RegionData(Region.museum), - RegionData(Region.jojamart), + RegionData(Region.jojamart, [Entrance.enter_abandoned_jojamart]), + RegionData(Region.abandoned_jojamart, [Entrance.enter_movie_theater]), + RegionData(Region.movie_ticket_stand), + RegionData(Region.movie_theater), RegionData(Region.fish_shop, [Entrance.fish_shop_to_boat_tunnel]), RegionData(Region.boat_tunnel, [Entrance.boat_to_ginger_island]), RegionData(Region.elliott_house), @@ -105,18 +142,16 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: RegionData(Region.oasis, [Entrance.enter_casino]), RegionData(Region.casino), RegionData(Region.skull_cavern_entrance, [Entrance.enter_skull_cavern]), - RegionData(Region.skull_cavern, [Entrance.mine_to_skull_cavern_floor_25, Entrance.mine_to_skull_cavern_floor_50, - Entrance.mine_to_skull_cavern_floor_75, Entrance.mine_to_skull_cavern_floor_100, - Entrance.mine_to_skull_cavern_floor_125, Entrance.mine_to_skull_cavern_floor_150, - Entrance.mine_to_skull_cavern_floor_175, Entrance.mine_to_skull_cavern_floor_200]), - RegionData(Region.skull_cavern_25), - RegionData(Region.skull_cavern_50), - RegionData(Region.skull_cavern_75), - RegionData(Region.skull_cavern_100), - RegionData(Region.skull_cavern_125), - RegionData(Region.skull_cavern_150), - RegionData(Region.skull_cavern_175), - RegionData(Region.skull_cavern_200), + RegionData(Region.skull_cavern, [Entrance.mine_to_skull_cavern_floor_25]), + RegionData(Region.skull_cavern_25, [Entrance.mine_to_skull_cavern_floor_50]), + RegionData(Region.skull_cavern_50, [Entrance.mine_to_skull_cavern_floor_75]), + RegionData(Region.skull_cavern_75, [Entrance.mine_to_skull_cavern_floor_100]), + RegionData(Region.skull_cavern_100, [Entrance.mine_to_skull_cavern_floor_125]), + RegionData(Region.skull_cavern_125, [Entrance.mine_to_skull_cavern_floor_150]), + RegionData(Region.skull_cavern_150, [Entrance.mine_to_skull_cavern_floor_175]), + RegionData(Region.skull_cavern_175, [Entrance.mine_to_skull_cavern_floor_200]), + RegionData(Region.skull_cavern_200, [Entrance.enter_dangerous_skull_cavern]), + RegionData(Region.dangerous_skull_cavern), RegionData(Region.island_south, [Entrance.island_south_to_west, Entrance.island_south_to_north, Entrance.island_south_to_east, Entrance.island_south_to_southeast, Entrance.use_island_resort, @@ -144,7 +179,7 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: RegionData(Region.volcano_dwarf_shop), RegionData(Region.volcano_floor_10), RegionData(Region.island_trader), - RegionData(Region.island_farmhouse), + RegionData(Region.island_farmhouse, [Entrance.island_cooking]), RegionData(Region.gourmand_frog_cave), RegionData(Region.colored_crystals_cave), RegionData(Region.shipwreck), @@ -156,50 +191,49 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: [Entrance.dig_site_to_professor_snail_cave, Entrance.parrot_express_dig_site_to_volcano, Entrance.parrot_express_dig_site_to_docks, Entrance.parrot_express_dig_site_to_jungle]), RegionData(Region.professor_snail_cave), - RegionData(Region.jotpk_world_1, [Entrance.reach_jotpk_world_2]), - RegionData(Region.jotpk_world_2, [Entrance.reach_jotpk_world_3]), - RegionData(Region.jotpk_world_3), - RegionData(Region.junimo_kart_1, [Entrance.reach_junimo_kart_2]), - RegionData(Region.junimo_kart_2, [Entrance.reach_junimo_kart_3]), - RegionData(Region.junimo_kart_3), RegionData(Region.mines, [Entrance.talk_to_mines_dwarf, - Entrance.dig_to_mines_floor_5, Entrance.dig_to_mines_floor_10, - Entrance.dig_to_mines_floor_15, Entrance.dig_to_mines_floor_20, - Entrance.dig_to_mines_floor_25, Entrance.dig_to_mines_floor_30, - Entrance.dig_to_mines_floor_35, Entrance.dig_to_mines_floor_40, - Entrance.dig_to_mines_floor_45, Entrance.dig_to_mines_floor_50, - Entrance.dig_to_mines_floor_55, Entrance.dig_to_mines_floor_60, - Entrance.dig_to_mines_floor_65, Entrance.dig_to_mines_floor_70, - Entrance.dig_to_mines_floor_75, Entrance.dig_to_mines_floor_80, - Entrance.dig_to_mines_floor_85, Entrance.dig_to_mines_floor_90, - Entrance.dig_to_mines_floor_95, Entrance.dig_to_mines_floor_100, - Entrance.dig_to_mines_floor_105, Entrance.dig_to_mines_floor_110, - Entrance.dig_to_mines_floor_115, Entrance.dig_to_mines_floor_120]), + Entrance.dig_to_mines_floor_5]), RegionData(Region.mines_dwarf_shop), - RegionData(Region.mines_floor_5), - RegionData(Region.mines_floor_10), - RegionData(Region.mines_floor_15), - RegionData(Region.mines_floor_20), - RegionData(Region.mines_floor_25), - RegionData(Region.mines_floor_30), - RegionData(Region.mines_floor_35), - RegionData(Region.mines_floor_40), - RegionData(Region.mines_floor_45), - RegionData(Region.mines_floor_50), - RegionData(Region.mines_floor_55), - RegionData(Region.mines_floor_60), - RegionData(Region.mines_floor_65), - RegionData(Region.mines_floor_70), - RegionData(Region.mines_floor_75), - RegionData(Region.mines_floor_80), - RegionData(Region.mines_floor_85), - RegionData(Region.mines_floor_90), - RegionData(Region.mines_floor_95), - RegionData(Region.mines_floor_100), - RegionData(Region.mines_floor_105), - RegionData(Region.mines_floor_110), - RegionData(Region.mines_floor_115), - RegionData(Region.mines_floor_120), + RegionData(Region.mines_floor_5, [Entrance.dig_to_mines_floor_10]), + RegionData(Region.mines_floor_10, [Entrance.dig_to_mines_floor_15]), + RegionData(Region.mines_floor_15, [Entrance.dig_to_mines_floor_20]), + RegionData(Region.mines_floor_20, [Entrance.dig_to_mines_floor_25]), + RegionData(Region.mines_floor_25, [Entrance.dig_to_mines_floor_30]), + RegionData(Region.mines_floor_30, [Entrance.dig_to_mines_floor_35]), + RegionData(Region.mines_floor_35, [Entrance.dig_to_mines_floor_40]), + RegionData(Region.mines_floor_40, [Entrance.dig_to_mines_floor_45]), + RegionData(Region.mines_floor_45, [Entrance.dig_to_mines_floor_50]), + RegionData(Region.mines_floor_50, [Entrance.dig_to_mines_floor_55]), + RegionData(Region.mines_floor_55, [Entrance.dig_to_mines_floor_60]), + RegionData(Region.mines_floor_60, [Entrance.dig_to_mines_floor_65]), + RegionData(Region.mines_floor_65, [Entrance.dig_to_mines_floor_70]), + RegionData(Region.mines_floor_70, [Entrance.dig_to_mines_floor_75]), + RegionData(Region.mines_floor_75, [Entrance.dig_to_mines_floor_80]), + RegionData(Region.mines_floor_80, [Entrance.dig_to_mines_floor_85]), + RegionData(Region.mines_floor_85, [Entrance.dig_to_mines_floor_90]), + RegionData(Region.mines_floor_90, [Entrance.dig_to_mines_floor_95]), + RegionData(Region.mines_floor_95, [Entrance.dig_to_mines_floor_100]), + RegionData(Region.mines_floor_100, [Entrance.dig_to_mines_floor_105]), + RegionData(Region.mines_floor_105, [Entrance.dig_to_mines_floor_110]), + RegionData(Region.mines_floor_110, [Entrance.dig_to_mines_floor_115]), + RegionData(Region.mines_floor_115, [Entrance.dig_to_mines_floor_120]), + RegionData(Region.mines_floor_120, [Entrance.dig_to_dangerous_mines_20, Entrance.dig_to_dangerous_mines_60, Entrance.dig_to_dangerous_mines_100]), + RegionData(Region.dangerous_mines_20), + RegionData(Region.dangerous_mines_60), + RegionData(Region.dangerous_mines_100), + RegionData(Region.coop), + RegionData(Region.barn), + RegionData(Region.shed), + RegionData(Region.slime_hutch), + RegionData(Region.egg_festival), + RegionData(Region.flower_dance), + RegionData(Region.luau), + RegionData(Region.moonlight_jellies), + RegionData(Region.fair), + RegionData(Region.spirit_eve), + RegionData(Region.festival_of_ice), + RegionData(Region.night_market), + RegionData(Region.winter_star), ] # Exists and where they lead @@ -208,13 +242,21 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.to_farmhouse, Region.farm_house), ConnectionData(Entrance.farmhouse_to_farm, Region.farm), ConnectionData(Entrance.downstairs_to_cellar, Region.cellar), + ConnectionData(Entrance.farmhouse_cooking, Region.kitchen), + ConnectionData(Entrance.watch_queen_of_sauce, Region.queen_of_sauce), ConnectionData(Entrance.farm_to_backwoods, Region.backwoods), ConnectionData(Entrance.farm_to_bus_stop, Region.bus_stop), ConnectionData(Entrance.farm_to_forest, Region.forest), ConnectionData(Entrance.farm_to_farmcave, Region.farm_cave, flag=RandomizationFlag.NON_PROGRESSION), + ConnectionData(Entrance.farming, Region.farming), ConnectionData(Entrance.enter_greenhouse, Region.greenhouse), + ConnectionData(Entrance.enter_coop, Region.coop), + ConnectionData(Entrance.enter_barn, Region.barn), + ConnectionData(Entrance.enter_shed, Region.shed), + ConnectionData(Entrance.enter_slime_hutch, Region.slime_hutch), + ConnectionData(Entrance.shipping, Region.shipping), ConnectionData(Entrance.use_desert_obelisk, Region.desert), - ConnectionData(Entrance.use_island_obelisk, Region.island_south), + ConnectionData(Entrance.use_island_obelisk, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.use_farm_obelisk, Region.farm), ConnectionData(Entrance.backwoods_to_mountain, Region.mountain), ConnectionData(Entrance.bus_stop_to_town, Region.town), @@ -232,6 +274,13 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.enter_secret_woods, Region.secret_woods), ConnectionData(Entrance.forest_to_sewer, Region.sewer, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.buy_from_traveling_merchant, Region.traveling_cart), + ConnectionData(Entrance.buy_from_traveling_merchant_sunday, Region.traveling_cart_sunday), + ConnectionData(Entrance.buy_from_traveling_merchant_monday, Region.traveling_cart_monday), + ConnectionData(Entrance.buy_from_traveling_merchant_tuesday, Region.traveling_cart_tuesday), + ConnectionData(Entrance.buy_from_traveling_merchant_wednesday, Region.traveling_cart_wednesday), + ConnectionData(Entrance.buy_from_traveling_merchant_thursday, Region.traveling_cart_thursday), + ConnectionData(Entrance.buy_from_traveling_merchant_friday, Region.traveling_cart_friday), + ConnectionData(Entrance.buy_from_traveling_merchant_saturday, Region.traveling_cart_saturday), ConnectionData(Entrance.town_to_sewer, Region.sewer, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.enter_mutant_bug_lair, Region.mutant_bug_lair, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.mountain_to_railroad, Region.railroad), @@ -267,6 +316,10 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.enter_sunroom, Region.sunroom, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.town_to_clint_blacksmith, Region.blacksmith, flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(Entrance.blacksmith_copper, Region.blacksmith_copper), + ConnectionData(Entrance.blacksmith_iron, Region.blacksmith_iron), + ConnectionData(Entrance.blacksmith_gold, Region.blacksmith_gold), + ConnectionData(Entrance.blacksmith_iridium, Region.blacksmith_iridium), ConnectionData(Entrance.town_to_saloon, Region.saloon, flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA), ConnectionData(Entrance.play_journey_of_the_prairie_king, Region.jotpk_world_1), @@ -289,6 +342,9 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA), ConnectionData(Entrance.town_to_jojamart, Region.jojamart, flag=RandomizationFlag.PELICAN_TOWN | RandomizationFlag.LEAD_TO_OPEN_AREA), + ConnectionData(Entrance.purchase_movie_ticket, Region.movie_ticket_stand), + ConnectionData(Entrance.enter_abandoned_jojamart, Region.abandoned_jojamart), + ConnectionData(Entrance.enter_movie_theater, Region.movie_theater), ConnectionData(Entrance.town_to_beach, Region.beach), ConnectionData(Entrance.enter_elliott_house, Region.elliott_house, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), @@ -296,8 +352,9 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), ConnectionData(Entrance.fish_shop_to_boat_tunnel, Region.boat_tunnel, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), - ConnectionData(Entrance.boat_to_ginger_island, Region.island_south), + ConnectionData(Entrance.boat_to_ginger_island, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.enter_tide_pools, Region.tide_pools), + ConnectionData(Entrance.fishing, Region.fishing), ConnectionData(Entrance.mountain_to_the_mines, Region.mines, flag=RandomizationFlag.NON_PROGRESSION | RandomizationFlag.LEAD_TO_OPEN_AREA), ConnectionData(Entrance.talk_to_mines_dwarf, Region.mines_dwarf_shop), @@ -325,6 +382,9 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.dig_to_mines_floor_110, Region.mines_floor_110), ConnectionData(Entrance.dig_to_mines_floor_115, Region.mines_floor_115), ConnectionData(Entrance.dig_to_mines_floor_120, Region.mines_floor_120), + ConnectionData(Entrance.dig_to_dangerous_mines_20, Region.dangerous_mines_20, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.dig_to_dangerous_mines_60, Region.dangerous_mines_60, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.dig_to_dangerous_mines_100, Region.dangerous_mines_100, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.enter_skull_cavern_entrance, Region.skull_cavern_entrance, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.LEAD_TO_OPEN_AREA), ConnectionData(Entrance.enter_oasis, Region.oasis, @@ -339,6 +399,7 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.mine_to_skull_cavern_floor_150, Region.skull_cavern_150), ConnectionData(Entrance.mine_to_skull_cavern_floor_175, Region.skull_cavern_175), ConnectionData(Entrance.mine_to_skull_cavern_floor_200, Region.skull_cavern_200), + ConnectionData(Entrance.enter_dangerous_skull_cavern, Region.dangerous_skull_cavern, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.enter_witch_warp_cave, Region.witch_warp_cave, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.enter_witch_swamp, Region.witch_swamp, flag=RandomizationFlag.BUILDINGS), ConnectionData(Entrance.enter_witch_hut, Region.witch_hut, flag=RandomizationFlag.BUILDINGS), @@ -352,17 +413,17 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.island_south_to_east, Region.island_east, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_south_to_southeast, Region.island_south_east, flag=RandomizationFlag.GINGER_ISLAND), - ConnectionData(Entrance.use_island_resort, Region.island_resort), + ConnectionData(Entrance.use_island_resort, Region.island_resort, flag=RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_west_to_islandfarmhouse, Region.island_farmhouse, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.island_cooking, Region.kitchen), ConnectionData(Entrance.island_west_to_gourmand_cave, Region.gourmand_frog_cave, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_west_to_crystals_cave, Region.colored_crystals_cave, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_west_to_shipwreck, Region.shipwreck, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), - ConnectionData(Entrance.island_west_to_qi_walnut_room, Region.qi_walnut_room, - flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.island_west_to_qi_walnut_room, Region.qi_walnut_room, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_east_to_leo_hut, Region.leo_hut, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.island_east_to_island_shrine, Region.island_shrine, @@ -378,21 +439,30 @@ def __call__(self, name: str, regions: Iterable[str]) -> Region: ConnectionData(Entrance.volcano_to_secret_beach, Region.volcano_secret_beach, flag=RandomizationFlag.BUILDINGS | RandomizationFlag.GINGER_ISLAND), ConnectionData(Entrance.talk_to_island_trader, Region.island_trader, flag=RandomizationFlag.GINGER_ISLAND), - ConnectionData(Entrance.climb_to_volcano_5, Region.volcano_floor_5), - ConnectionData(Entrance.talk_to_volcano_dwarf, Region.volcano_dwarf_shop), - ConnectionData(Entrance.climb_to_volcano_10, Region.volcano_floor_10), - ConnectionData(Entrance.parrot_express_jungle_to_docks, Region.island_south), - ConnectionData(Entrance.parrot_express_dig_site_to_docks, Region.island_south), - ConnectionData(Entrance.parrot_express_volcano_to_docks, Region.island_south), - ConnectionData(Entrance.parrot_express_volcano_to_jungle, Region.island_west), - ConnectionData(Entrance.parrot_express_docks_to_jungle, Region.island_west), - ConnectionData(Entrance.parrot_express_dig_site_to_jungle, Region.island_west), - ConnectionData(Entrance.parrot_express_docks_to_dig_site, Region.dig_site), - ConnectionData(Entrance.parrot_express_volcano_to_dig_site, Region.dig_site), - ConnectionData(Entrance.parrot_express_jungle_to_dig_site, Region.dig_site), - ConnectionData(Entrance.parrot_express_dig_site_to_volcano, Region.island_north), - ConnectionData(Entrance.parrot_express_docks_to_volcano, Region.island_north), - ConnectionData(Entrance.parrot_express_jungle_to_volcano, Region.island_north), + ConnectionData(Entrance.climb_to_volcano_5, Region.volcano_floor_5, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.talk_to_volcano_dwarf, Region.volcano_dwarf_shop, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.climb_to_volcano_10, Region.volcano_floor_10, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_jungle_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_dig_site_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_volcano_to_docks, Region.island_south, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_volcano_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_docks_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_dig_site_to_jungle, Region.island_west, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_docks_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_volcano_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_jungle_to_dig_site, Region.dig_site, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_dig_site_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_docks_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.parrot_express_jungle_to_volcano, Region.island_north, flag=RandomizationFlag.GINGER_ISLAND), + ConnectionData(Entrance.attend_egg_festival, Region.egg_festival), + ConnectionData(Entrance.attend_flower_dance, Region.flower_dance), + ConnectionData(Entrance.attend_luau, Region.luau), + ConnectionData(Entrance.attend_moonlight_jellies, Region.moonlight_jellies), + ConnectionData(Entrance.attend_fair, Region.fair), + ConnectionData(Entrance.attend_spirit_eve, Region.spirit_eve), + ConnectionData(Entrance.attend_festival_of_ice, Region.festival_of_ice), + ConnectionData(Entrance.attend_night_market, Region.night_market), + ConnectionData(Entrance.attend_winter_star, Region.winter_star), ] @@ -409,78 +479,105 @@ def create_final_regions(world_options) -> List[RegionData]: (region for region in final_regions if region.name == mod_region.name), None) if existing_region: final_regions.remove(existing_region) + if ModificationFlag.MODIFIED in mod_region.flag: + mod_region = modify_vanilla_regions(existing_region, mod_region) final_regions.append(existing_region.get_merged_with(mod_region.exits)) continue - final_regions.append(mod_region.get_clone()) + return final_regions -def create_final_connections(world_options) -> List[ConnectionData]: - final_connections = [] - final_connections.extend(vanilla_connections) - if world_options.mods is None: - return final_connections - for mod in world_options.mods.value: +def create_final_connections_and_regions(world_options) -> Tuple[Dict[str, ConnectionData], Dict[str, RegionData]]: + regions_data: Dict[str, RegionData] = {region.name: region for region in create_final_regions(world_options)} + connections = {connection.name: connection for connection in vanilla_connections} + connections = modify_connections_for_mods(connections, world_options.mods) + include_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_false + return remove_ginger_island_regions_and_connections(regions_data, connections, include_island) + + +def remove_ginger_island_regions_and_connections(regions_by_name: Dict[str, RegionData], connections: Dict[str, ConnectionData], include_island: bool): + if include_island: + return connections, regions_by_name + for connection_name in list(connections): + connection = connections[connection_name] + if connection.flag & RandomizationFlag.GINGER_ISLAND: + regions_by_name.pop(connection.destination, None) + connections.pop(connection_name) + regions_by_name = {name: regions_by_name[name].get_without_exit(connection_name) for name in regions_by_name} + return connections, regions_by_name + + +def modify_connections_for_mods(connections: Dict[str, ConnectionData], mods) -> Dict[str, ConnectionData]: + if mods is None: + return connections + for mod in mods.value: if mod not in ModDataList: continue - final_connections.extend(ModDataList[mod].connections) - return final_connections + if mod in vanilla_connections_to_remove_by_mod: + for connection_data in vanilla_connections_to_remove_by_mod[mod]: + connections.pop(connection_data.name) + connections.update({connection.name: connection for connection in ModDataList[mod].connections}) + return connections -def create_regions(region_factory: RegionFactory, random: Random, world_options) -> Tuple[ - Dict[str, Region], Dict[str, str]]: - final_regions = create_final_regions(world_options) - regions: Dict[str: Region] = {region.name: region_factory(region.name, region.exits) for region in - final_regions} - entrances: Dict[str: Entrance] = {entrance.name: entrance - for region in regions.values() - for entrance in region.exits} +def modify_vanilla_regions(existing_region: RegionData, modified_region: RegionData) -> RegionData: - regions_by_name: Dict[str, RegionData] = {region.name: region for region in final_regions} - connections, randomized_data = randomize_connections(random, world_options, regions_by_name) + updated_region = existing_region + region_exits = updated_region.exits + modified_exits = modified_region.exits + for exits in modified_exits: + region_exits.remove(exits) - for connection in connections: - if connection.name in entrances: - entrances[connection.name].connect(regions[connection.destination]) + return updated_region + + +def create_regions(region_factory: RegionFactory, random: Random, world_options: StardewValleyOptions) -> Tuple[ + Dict[str, Region], Dict[str, Entrance], Dict[str, str]]: + entrances_data, regions_data = create_final_connections_and_regions(world_options) + regions_by_name: Dict[str: Region] = {region_name: region_factory(region_name, regions_data[region_name].exits) for region_name in regions_data} + entrances_by_name: Dict[str: Entrance] = {entrance.name: entrance for region in regions_by_name.values() for entrance in region.exits + if entrance.name in entrances_data} - return regions, randomized_data + connections, randomized_data = randomize_connections(random, world_options, regions_data, entrances_data) + + for connection in connections: + if connection.name in entrances_by_name: + entrances_by_name[connection.name].connect(regions_by_name[connection.destination]) + return regions_by_name, entrances_by_name, randomized_data -def randomize_connections(random: Random, world_options, regions_by_name) -> Tuple[ - List[ConnectionData], Dict[str, str]]: - connections_to_randomize = [] - final_connections = create_final_connections(world_options) - connections_by_name: Dict[str, ConnectionData] = {connection.name: connection for connection in final_connections} +def randomize_connections(random: Random, world_options: StardewValleyOptions, regions_by_name: Dict[str, RegionData], + connections_by_name: Dict[str, ConnectionData]) -> Tuple[List[ConnectionData], Dict[str, str]]: + connections_to_randomize: List[ConnectionData] = [] if world_options.entrance_randomization == EntranceRandomization.option_pelican_town: - connections_to_randomize = [connection for connection in final_connections if - RandomizationFlag.PELICAN_TOWN in connection.flag] + connections_to_randomize = [connections_by_name[connection] for connection in connections_by_name if + RandomizationFlag.PELICAN_TOWN in connections_by_name[connection].flag] elif world_options.entrance_randomization == EntranceRandomization.option_non_progression: - connections_to_randomize = [connection for connection in final_connections if - RandomizationFlag.NON_PROGRESSION in connection.flag] + connections_to_randomize = [connections_by_name[connection] for connection in connections_by_name if + RandomizationFlag.NON_PROGRESSION in connections_by_name[connection].flag] elif world_options.entrance_randomization == EntranceRandomization.option_buildings: - connections_to_randomize = [connection for connection in final_connections if - RandomizationFlag.BUILDINGS in connection.flag] + connections_to_randomize = [connections_by_name[connection] for connection in connections_by_name if + RandomizationFlag.BUILDINGS in connections_by_name[connection].flag] elif world_options.entrance_randomization == EntranceRandomization.option_chaos: - connections_to_randomize = [connection for connection in final_connections if - RandomizationFlag.BUILDINGS in connection.flag] - connections_to_randomize = exclude_island_if_necessary(connections_to_randomize, world_options) + connections_to_randomize = [connections_by_name[connection] for connection in connections_by_name if + RandomizationFlag.BUILDINGS in connections_by_name[connection].flag] + connections_to_randomize = remove_excluded_entrances(connections_to_randomize, world_options) # On Chaos, we just add the connections to randomize, unshuffled, and the client does it every day randomized_data_for_mod = {} for connection in connections_to_randomize: randomized_data_for_mod[connection.name] = connection.name randomized_data_for_mod[connection.reverse] = connection.reverse - return final_connections, randomized_data_for_mod + return list(connections_by_name.values()), randomized_data_for_mod connections_to_randomize = remove_excluded_entrances(connections_to_randomize, world_options) - random.shuffle(connections_to_randomize) destination_pool = list(connections_to_randomize) random.shuffle(destination_pool) randomized_connections = randomize_chosen_connections(connections_to_randomize, destination_pool) - add_non_randomized_connections(final_connections, connections_to_randomize, randomized_connections) + add_non_randomized_connections(list(connections_by_name.values()), connections_to_randomize, randomized_connections) swap_connections_until_valid(regions_by_name, connections_by_name, randomized_connections, connections_to_randomize, random) randomized_connections_for_generation = create_connections_for_generation(randomized_connections) @@ -489,25 +586,14 @@ def randomize_connections(random: Random, world_options, regions_by_name) -> Tup return randomized_connections_for_generation, randomized_data_for_mod -def remove_excluded_entrances(connections_to_randomize, world_options): +def remove_excluded_entrances(connections_to_randomize: List[ConnectionData], world_options: StardewValleyOptions) -> List[ConnectionData]: exclude_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_true - exclude_sewers = world_options.museumsanity == Museumsanity.option_none if exclude_island: connections_to_randomize = [connection for connection in connections_to_randomize if RandomizationFlag.GINGER_ISLAND not in connection.flag] - if exclude_sewers: - connections_to_randomize = [connection for connection in connections_to_randomize if Region.sewer not in connection.name or Region.sewer not in connection.reverse] return connections_to_randomize -def exclude_island_if_necessary(connections_to_randomize: List[ConnectionData], world_options) -> List[ConnectionData]: - exclude_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_true - if exclude_island: - connections_to_randomize = [connection for connection in connections_to_randomize if - RandomizationFlag.GINGER_ISLAND not in connection.flag] - return connections_to_randomize - - def randomize_chosen_connections(connections_to_randomize: List[ConnectionData], destination_pool: List[ConnectionData]) -> Dict[ConnectionData, ConnectionData]: randomized_connections = {} @@ -517,8 +603,7 @@ def randomize_chosen_connections(connections_to_randomize: List[ConnectionData], return randomized_connections -def create_connections_for_generation(randomized_connections: Dict[ConnectionData, ConnectionData]) -> List[ - ConnectionData]: +def create_connections_for_generation(randomized_connections: Dict[ConnectionData, ConnectionData]) -> List[ConnectionData]: connections = [] for connection in randomized_connections: destination = randomized_connections[connection] @@ -536,37 +621,50 @@ def create_data_for_mod(randomized_connections: Dict[ConnectionData, ConnectionD add_to_mod_data(connection, destination, randomized_data_for_mod) return randomized_data_for_mod + def add_to_mod_data(connection: ConnectionData, destination: ConnectionData, randomized_data_for_mod: Dict[str, str]): randomized_data_for_mod[connection.name] = destination.name randomized_data_for_mod[destination.reverse] = connection.reverse -def add_non_randomized_connections(connections, connections_to_randomize: List[ConnectionData], +def add_non_randomized_connections(all_connections: List[ConnectionData], connections_to_randomize: List[ConnectionData], randomized_connections: Dict[ConnectionData, ConnectionData]): - for connection in connections: + for connection in all_connections: if connection in connections_to_randomize: continue randomized_connections[connection] = connection -def swap_connections_until_valid(regions_by_name, connections_by_name, randomized_connections: Dict[ConnectionData, ConnectionData], +def swap_connections_until_valid(regions_by_name, connections_by_name: Dict[str, ConnectionData], randomized_connections: Dict[ConnectionData, ConnectionData], connections_to_randomize: List[ConnectionData], random: Random): while True: reachable_regions, unreachable_regions = find_reachable_regions(regions_by_name, connections_by_name, randomized_connections) if not unreachable_regions: return randomized_connections - swap_one_connection(regions_by_name, connections_by_name, randomized_connections, reachable_regions, - unreachable_regions, connections_to_randomize, random) + swap_one_random_connection(regions_by_name, connections_by_name, randomized_connections, reachable_regions, + unreachable_regions, connections_to_randomize, random) + + +def region_should_be_reachable(region_name: str, connections_in_slot: Iterable[ConnectionData]) -> bool: + if region_name == Region.menu: + return True + for connection in connections_in_slot: + if region_name == connection.destination: + return True + return False def find_reachable_regions(regions_by_name, connections_by_name, randomized_connections: Dict[ConnectionData, ConnectionData]): reachable_regions = {Region.menu} unreachable_regions = {region for region in regions_by_name.keys()} + # unreachable_regions = {region for region in regions_by_name.keys() if region_should_be_reachable(region, connections_by_name.values())} unreachable_regions.remove(Region.menu) exits_to_explore = list(regions_by_name[Region.menu].exits) while exits_to_explore: exit_name = exits_to_explore.pop() + # if exit_name not in connections_by_name: + # continue exit_connection = connections_by_name[exit_name] replaced_connection = randomized_connections[exit_connection] target_region_name = replaced_connection.destination @@ -580,9 +678,9 @@ def find_reachable_regions(regions_by_name, connections_by_name, return reachable_regions, unreachable_regions -def swap_one_connection(regions_by_name, connections_by_name,randomized_connections: Dict[ConnectionData, ConnectionData], - reachable_regions: Set[str], unreachable_regions: Set[str], - connections_to_randomize: List[ConnectionData], random: Random): +def swap_one_random_connection(regions_by_name, connections_by_name, randomized_connections: Dict[ConnectionData, ConnectionData], + reachable_regions: Set[str], unreachable_regions: Set[str], + connections_to_randomize: List[ConnectionData], random: Random): randomized_connections_already_shuffled = {connection: randomized_connections[connection] for connection in randomized_connections if connection != randomized_connections[connection]} @@ -604,7 +702,11 @@ def swap_one_connection(regions_by_name, connections_by_name,randomized_connecti chosen_reachable_entrance_name = random.choice(chosen_reachable_region.exits) chosen_reachable_entrance = connections_by_name[chosen_reachable_entrance_name] - reachable_destination = randomized_connections[chosen_reachable_entrance] - unreachable_destination = randomized_connections[chosen_unreachable_entrance] - randomized_connections[chosen_reachable_entrance] = unreachable_destination - randomized_connections[chosen_unreachable_entrance] = reachable_destination + swap_two_connections(chosen_reachable_entrance, chosen_unreachable_entrance, randomized_connections) + + +def swap_two_connections(entrance_1, entrance_2, randomized_connections): + reachable_destination = randomized_connections[entrance_1] + unreachable_destination = randomized_connections[entrance_2] + randomized_connections[entrance_1] = unreachable_destination + randomized_connections[entrance_2] = reachable_destination diff --git a/worlds/stardew_valley/requirements.txt b/worlds/stardew_valley/requirements.txt index a7141f6aa805..b0922176e43b 100644 --- a/worlds/stardew_valley/requirements.txt +++ b/worlds/stardew_valley/requirements.txt @@ -1 +1 @@ -importlib_resources; python_version <= '3.8' \ No newline at end of file +importlib_resources; python_version <= '3.8' diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py index 88aa13f31471..8c0f63f2dbcf 100644 --- a/worlds/stardew_valley/rules.py +++ b/worlds/stardew_valley/rules.py @@ -1,28 +1,44 @@ import itertools -from typing import List +from typing import List, Dict, Set from BaseClasses import MultiWorld from worlds.generic import Rules as MultiWorldRules -from .options import StardewValleyOptions, ToolProgression, BuildingProgression, SkillProgression, ExcludeGingerIsland, Cropsanity, SpecialOrderLocations, Museumsanity, \ - BackpackProgression, ArcadeMachineLocations -from .strings.entrance_names import dig_to_mines_floor, dig_to_skull_floor, Entrance, move_to_woods_depth, \ - DeepWoodsEntrance, AlecEntrance, MagicEntrance -from .data.museum_data import all_museum_items, all_museum_minerals, all_museum_artifacts, \ - dwarf_scrolls, skeleton_front, \ - skeleton_middle, skeleton_back, all_museum_items_by_name, Artifact -from .strings.region_names import Region +from . import locations +from .bundles.bundle_room import BundleRoom +from .data.craftable_data import all_crafting_recipes_by_name +from .data.museum_data import all_museum_items, dwarf_scrolls, skeleton_front, skeleton_middle, skeleton_back, all_museum_items_by_name, all_museum_minerals, \ + all_museum_artifacts, Artifact +from .data.recipe_data import all_cooking_recipes_by_name +from .locations import LocationTags +from .logic.logic import StardewLogic +from .logic.time_logic import MAX_MONTHS +from .logic.tool_logic import tool_upgrade_prices from .mods.mod_data import ModNames -from .mods.logic import magic, deepwoods -from .locations import LocationTags, locations_by_tag -from .logic import StardewLogic, And, tool_upgrade_prices +from .options import StardewValleyOptions, Friendsanity +from .options import ToolProgression, BuildingProgression, ExcludeGingerIsland, SpecialOrderLocations, Museumsanity, BackpackProgression, Shipsanity, \ + Monstersanity, Chefsanity, Craftsanity, ArcadeMachineLocations, Cooksanity, Cropsanity, SkillProgression +from .stardew_rule import And, StardewRule +from .stardew_rule.indirect_connection import look_for_indirect_connection +from .strings.ap_names.event_names import Event +from .strings.ap_names.mods.mod_items import SVEQuestItem, SVERunes from .strings.ap_names.transport_names import Transportation from .strings.artisan_good_names import ArtisanGood +from .strings.building_names import Building +from .strings.bundle_names import CCRoom from .strings.calendar_names import Weekday -from .strings.craftable_names import Craftable +from .strings.craftable_names import Bomb +from .strings.crop_names import Fruit +from .strings.entrance_names import dig_to_mines_floor, dig_to_skull_floor, Entrance, move_to_woods_depth, DeepWoodsEntrance, AlecEntrance, \ + SVEEntrance, LaceyEntrance, BoardingHouseEntrance +from .strings.generic_names import Generic from .strings.material_names import Material from .strings.metal_names import MetalBar +from .strings.quest_names import Quest +from .strings.region_names import Region +from .strings.season_names import Season from .strings.skill_names import ModSkill, Skill from .strings.tool_names import Tool, ToolMaterial +from .strings.tv_channel_names import Channel from .strings.villager_names import NPC, ModNPC from .strings.wallet_item_names import Wallet @@ -32,269 +48,335 @@ def set_rules(world): world_options = world.options player = world.player logic = world.logic - current_bundles = world.modified_bundles - - all_location_names = list(location.name for location in multiworld.get_locations(player)) + bundle_rooms: List[BundleRoom] = world.modified_bundles - set_entrance_rules(logic, multiworld, player, world_options) + all_location_names = set(location.name for location in multiworld.get_locations(player)) + set_entrance_rules(logic, multiworld, player, world_options) set_ginger_island_rules(logic, multiworld, player, world_options) - # Those checks do not exist if ToolProgression is vanilla - if world_options.tool_progression != ToolProgression.option_vanilla: - MultiWorldRules.add_rule(multiworld.get_location("Purchase Fiberglass Rod", player), - (logic.has_skill_level(Skill.fishing, 2) & logic.can_spend_money(1800)).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Purchase Iridium Rod", player), - (logic.has_skill_level(Skill.fishing, 6) & logic.can_spend_money(7500)).simplify()) - - materials = [None, "Copper", "Iron", "Gold", "Iridium"] - tool = [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.watering_can, Tool.trash_can] - for (previous, material), tool in itertools.product(zip(materials[:4], materials[1:]), tool): - if previous is None: - MultiWorldRules.add_rule(multiworld.get_location(f"{material} {tool} Upgrade", player), - (logic.has(f"{material} Ore") & - logic.can_spend_money(tool_upgrade_prices[material])).simplify()) - else: - MultiWorldRules.add_rule(multiworld.get_location(f"{material} {tool} Upgrade", player), - (logic.has(f"{material} Ore") & logic.has_tool(tool, previous) & - logic.can_spend_money(tool_upgrade_prices[material])).simplify()) - + set_tool_rules(logic, multiworld, player, world_options) set_skills_rules(logic, multiworld, player, world_options) - - # Bundles - for bundle in current_bundles.values(): - location = multiworld.get_location(bundle.get_name_with_bundle(), player) - rules = logic.can_complete_bundle(bundle.requirements, bundle.number_required) - simplified_rules = rules.simplify() - MultiWorldRules.set_rule(location, simplified_rules) - MultiWorldRules.add_rule(multiworld.get_location("Complete Crafts Room", player), - And(logic.can_reach_location(bundle.name) - for bundle in locations_by_tag[LocationTags.CRAFTS_ROOM_BUNDLE]).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Complete Pantry", player), - And(logic.can_reach_location(bundle.name) - for bundle in locations_by_tag[LocationTags.PANTRY_BUNDLE]).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Complete Fish Tank", player), - And(logic.can_reach_location(bundle.name) - for bundle in locations_by_tag[LocationTags.FISH_TANK_BUNDLE]).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Complete Boiler Room", player), - And(logic.can_reach_location(bundle.name) - for bundle in locations_by_tag[LocationTags.BOILER_ROOM_BUNDLE]).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Complete Bulletin Board", player), - And(logic.can_reach_location(bundle.name) - for bundle - in locations_by_tag[LocationTags.BULLETIN_BOARD_BUNDLE]).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Complete Vault", player), - And(logic.can_reach_location(bundle.name) - for bundle in locations_by_tag[LocationTags.VAULT_BUNDLE]).simplify()) - - # Buildings - if world_options.building_progression != BuildingProgression.option_vanilla: - for building in locations_by_tag[LocationTags.BUILDING_BLUEPRINT]: - if building.mod_name is not None and building.mod_name not in world_options.mods: - continue - MultiWorldRules.set_rule(multiworld.get_location(building.name, player), - logic.building_rules[building.name.replace(" Blueprint", "")].simplify()) - + set_bundle_rules(bundle_rooms, logic, multiworld, player) + set_building_rules(logic, multiworld, player, world_options) set_cropsanity_rules(all_location_names, logic, multiworld, player, world_options) set_story_quests_rules(all_location_names, logic, multiworld, player, world_options) set_special_order_rules(all_location_names, logic, multiworld, player, world_options) set_help_wanted_quests_rules(logic, multiworld, player, world_options) set_fishsanity_rules(all_location_names, logic, multiworld, player) set_museumsanity_rules(all_location_names, logic, multiworld, player, world_options) - set_friendsanity_rules(all_location_names, logic, multiworld, player) + + set_friendsanity_rules(all_location_names, logic, multiworld, player, world_options) set_backpack_rules(logic, multiworld, player, world_options) set_festival_rules(all_location_names, logic, multiworld, player) + set_monstersanity_rules(all_location_names, logic, multiworld, player, world_options) + set_shipsanity_rules(all_location_names, logic, multiworld, player, world_options) + set_cooksanity_rules(all_location_names, logic, multiworld, player, world_options) + set_chefsanity_rules(all_location_names, logic, multiworld, player, world_options) + set_craftsanity_rules(all_location_names, logic, multiworld, player, world_options) + set_isolated_locations_rules(logic, multiworld, player) + set_traveling_merchant_day_rules(logic, multiworld, player) + set_arcade_machine_rules(logic, multiworld, player, world_options) + + set_deepwoods_rules(logic, multiworld, player, world_options) + set_magic_spell_rules(logic, multiworld, player, world_options) + set_sve_rules(logic, multiworld, player, world_options) + +def set_isolated_locations_rules(logic: StardewLogic, multiworld, player): MultiWorldRules.add_rule(multiworld.get_location("Old Master Cannoli", player), - logic.has("Sweet Gem Berry").simplify()) + logic.has(Fruit.sweet_gem_berry)) MultiWorldRules.add_rule(multiworld.get_location("Galaxy Sword Shrine", player), - logic.has("Prismatic Shard").simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Have a Baby", player), - logic.can_reproduce(1).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Have Another Baby", player), - logic.can_reproduce(2).simplify()) + logic.has("Prismatic Shard")) + MultiWorldRules.add_rule(multiworld.get_location("Krobus Stardrop", player), + logic.money.can_spend(20000)) + MultiWorldRules.add_rule(multiworld.get_location("Demetrius's Breakthrough", player), + logic.money.can_have_earned_total(25000)) - set_traveling_merchant_rules(logic, multiworld, player) - set_arcade_machine_rules(logic, multiworld, player, world_options) - set_deepwoods_rules(logic, multiworld, player, world_options) - set_magic_spell_rules(logic, multiworld, player, world_options) +def set_tool_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + if not world_options.tool_progression & ToolProgression.option_progressive: + return + + MultiWorldRules.add_rule(multiworld.get_location("Purchase Fiberglass Rod", player), + (logic.skill.has_level(Skill.fishing, 2) & logic.money.can_spend(1800))) + MultiWorldRules.add_rule(multiworld.get_location("Purchase Iridium Rod", player), + (logic.skill.has_level(Skill.fishing, 6) & logic.money.can_spend(7500))) -def set_skills_rules(logic, multiworld, player, world_options): - # Skills - if world_options.skill_progression != SkillProgression.option_vanilla: - for i in range(1, 11): - set_skill_rule(logic, multiworld, player, Skill.farming, i) - set_skill_rule(logic, multiworld, player, Skill.fishing, i) - set_skill_rule(logic, multiworld, player, Skill.foraging, i) - set_skill_rule(logic, multiworld, player, Skill.mining, i) - set_skill_rule(logic, multiworld, player, Skill.combat, i) - - # Modded Skills - if ModNames.luck_skill in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.luck, i) - if ModNames.magic in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.magic, i) - if ModNames.binning_skill in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.binning, i) - if ModNames.cooking_skill in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.cooking, i) - if ModNames.socializing_skill in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.socializing, i) - if ModNames.archaeology in world_options.mods: - set_skill_rule(logic, multiworld, player, ModSkill.archaeology, i) - - -def set_skill_rule(logic, multiworld, player, skill: str, level: int): + materials = [None, "Copper", "Iron", "Gold", "Iridium"] + tool = [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.watering_can, Tool.trash_can] + for (previous, material), tool in itertools.product(zip(materials[:4], materials[1:]), tool): + if previous is None: + continue + tool_upgrade_location = multiworld.get_location(f"{material} {tool} Upgrade", player) + MultiWorldRules.set_rule(tool_upgrade_location, logic.tool.has_tool(tool, previous)) + + +def set_building_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + if not world_options.building_progression & BuildingProgression.option_progressive: + return + + for building in locations.locations_by_tag[LocationTags.BUILDING_BLUEPRINT]: + if building.mod_name is not None and building.mod_name not in world_options.mods: + continue + MultiWorldRules.set_rule(multiworld.get_location(building.name, player), + logic.registry.building_rules[building.name.replace(" Blueprint", "")]) + + +def set_bundle_rules(bundle_rooms: List[BundleRoom], logic: StardewLogic, multiworld, player): + for bundle_room in bundle_rooms: + room_rules = [] + for bundle in bundle_room.bundles: + location = multiworld.get_location(bundle.name, player) + bundle_rules = logic.bundle.can_complete_bundle(bundle) + room_rules.append(bundle_rules) + MultiWorldRules.set_rule(location, bundle_rules) + if bundle_room.name == CCRoom.abandoned_joja_mart: + continue + room_location = f"Complete {bundle_room.name}" + MultiWorldRules.add_rule(multiworld.get_location(room_location, player), And(*room_rules)) + + +def set_skills_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + mods = world_options.mods + if world_options.skill_progression == SkillProgression.option_vanilla: + return + for i in range(1, 11): + set_vanilla_skill_rule_for_level(logic, multiworld, player, i) + set_modded_skill_rule_for_level(logic, multiworld, player, mods, i) + + +def set_vanilla_skill_rule_for_level(logic: StardewLogic, multiworld, player, level: int): + set_vanilla_skill_rule(logic, multiworld, player, Skill.farming, level) + set_vanilla_skill_rule(logic, multiworld, player, Skill.fishing, level) + set_vanilla_skill_rule(logic, multiworld, player, Skill.foraging, level) + set_vanilla_skill_rule(logic, multiworld, player, Skill.mining, level) + set_vanilla_skill_rule(logic, multiworld, player, Skill.combat, level) + + +def set_modded_skill_rule_for_level(logic: StardewLogic, multiworld, player, mods, level: int): + if ModNames.luck_skill in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.luck, level) + if ModNames.magic in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.magic, level) + if ModNames.binning_skill in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.binning, level) + if ModNames.cooking_skill in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.cooking, level) + if ModNames.socializing_skill in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.socializing, level) + if ModNames.archaeology in mods: + set_modded_skill_rule(logic, multiworld, player, ModSkill.archaeology, level) + + +def get_skill_level_location(multiworld, player, skill: str, level: int): location_name = f"Level {level} {skill}" - location = multiworld.get_location(location_name, player) - rule = logic.can_earn_skill_level(skill, level).simplify() - MultiWorldRules.set_rule(location, rule) + return multiworld.get_location(location_name, player) + + +def set_vanilla_skill_rule(logic: StardewLogic, multiworld, player, skill: str, level: int): + rule = logic.skill.can_earn_level(skill, level) + MultiWorldRules.set_rule(get_skill_level_location(multiworld, player, skill, level), rule) + + +def set_modded_skill_rule(logic: StardewLogic, multiworld, player, skill: str, level: int): + rule = logic.mod.skill.can_earn_mod_skill_level(skill, level) + MultiWorldRules.set_rule(get_skill_level_location(multiworld, player, skill, level), rule) + + +def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + set_mines_floor_entrance_rules(logic, multiworld, player) + set_skull_cavern_floor_entrance_rules(logic, multiworld, player) + set_blacksmith_entrance_rules(logic, multiworld, player) + set_skill_entrance_rules(logic, multiworld, player) + set_traveling_merchant_day_rules(logic, multiworld, player) + set_dangerous_mine_rules(logic, multiworld, player, world_options) + + set_entrance_rule(multiworld, player, Entrance.enter_tide_pools, logic.received("Beach Bridge") | (logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.enter_quarry, logic.received("Bridge Repair") | (logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.enter_secret_woods, logic.tool.has_tool(Tool.axe, "Iron") | (logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.forest_to_sewer, logic.wallet.has_rusty_key()) + set_entrance_rule(multiworld, player, Entrance.town_to_sewer, logic.wallet.has_rusty_key()) + set_entrance_rule(multiworld, player, Entrance.enter_abandoned_jojamart, logic.has_abandoned_jojamart()) + movie_theater_rule = logic.has_movie_theater() + set_entrance_rule(multiworld, player, Entrance.enter_movie_theater, movie_theater_rule) + set_entrance_rule(multiworld, player, Entrance.purchase_movie_ticket, movie_theater_rule) + set_entrance_rule(multiworld, player, Entrance.take_bus_to_desert, logic.received("Bus Repair")) + set_entrance_rule(multiworld, player, Entrance.enter_skull_cavern, logic.received(Wallet.skull_key)) + set_entrance_rule(multiworld, player, Entrance.talk_to_mines_dwarf, logic.wallet.can_speak_dwarf() & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron)) + set_entrance_rule(multiworld, player, Entrance.buy_from_traveling_merchant, logic.traveling_merchant.has_days()) + + set_farm_buildings_entrance_rules(logic, multiworld, player) + + set_entrance_rule(multiworld, player, Entrance.mountain_to_railroad, logic.received("Railroad Boulder Removed")) + set_entrance_rule(multiworld, player, Entrance.enter_witch_warp_cave, logic.quest.has_dark_talisman() | (logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.enter_witch_hut, (logic.has(ArtisanGood.void_mayonnaise) | logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.enter_mutant_bug_lair, + (logic.received(Event.start_dark_talisman_quest) & logic.relationship.can_meet(NPC.krobus)) | logic.mod.magic.can_blink()) + set_entrance_rule(multiworld, player, Entrance.enter_casino, logic.quest.has_club_card()) + + set_bedroom_entrance_rules(logic, multiworld, player, world_options) + set_festival_entrance_rules(logic, multiworld, player) + set_island_entrance_rule(multiworld, player, Entrance.island_cooking, logic.cooking.can_cook_in_kitchen, world_options) + set_entrance_rule(multiworld, player, Entrance.farmhouse_cooking, logic.cooking.can_cook_in_kitchen) + set_entrance_rule(multiworld, player, Entrance.shipping, logic.shipping.can_use_shipping_bin) + set_entrance_rule(multiworld, player, Entrance.watch_queen_of_sauce, logic.action.can_watch(Channel.queen_of_sauce)) + + +def set_dangerous_mine_rules(logic, multiworld, player, world_options: StardewValleyOptions): + if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return + dangerous_mine_rule = logic.mine.has_mine_elevator_to_floor(120) & logic.region.can_reach(Region.qi_walnut_room) + set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_20, dangerous_mine_rule) + set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_60, dangerous_mine_rule) + set_entrance_rule(multiworld, player, Entrance.dig_to_dangerous_mines_100, dangerous_mine_rule) + set_entrance_rule(multiworld, player, Entrance.enter_dangerous_skull_cavern, + (logic.received(Wallet.skull_key) & logic.region.can_reach(Region.qi_walnut_room))) + + +def set_farm_buildings_entrance_rules(logic, multiworld, player): + set_entrance_rule(multiworld, player, Entrance.use_desert_obelisk, logic.can_use_obelisk(Transportation.desert_obelisk)) + set_entrance_rule(multiworld, player, Entrance.enter_greenhouse, logic.received("Greenhouse")) + set_entrance_rule(multiworld, player, Entrance.enter_coop, logic.building.has_building(Building.coop)) + set_entrance_rule(multiworld, player, Entrance.enter_barn, logic.building.has_building(Building.barn)) + set_entrance_rule(multiworld, player, Entrance.enter_shed, logic.building.has_building(Building.shed)) + set_entrance_rule(multiworld, player, Entrance.enter_slime_hutch, logic.building.has_building(Building.slime_hutch)) + + +def set_bedroom_entrance_rules(logic, multiworld, player, world_options: StardewValleyOptions): + set_entrance_rule(multiworld, player, Entrance.enter_harvey_room, logic.relationship.has_hearts(NPC.harvey, 2)) + set_entrance_rule(multiworld, player, Entrance.mountain_to_maru_room, logic.relationship.has_hearts(NPC.maru, 2)) + set_entrance_rule(multiworld, player, Entrance.enter_sebastian_room, (logic.relationship.has_hearts(NPC.sebastian, 2) | logic.mod.magic.can_blink())) + set_entrance_rule(multiworld, player, Entrance.forest_to_leah_cottage, logic.relationship.has_hearts(NPC.leah, 2)) + set_entrance_rule(multiworld, player, Entrance.enter_elliott_house, logic.relationship.has_hearts(NPC.elliott, 2)) + set_entrance_rule(multiworld, player, Entrance.enter_sunroom, logic.relationship.has_hearts(NPC.caroline, 2)) + set_entrance_rule(multiworld, player, Entrance.enter_wizard_basement, logic.relationship.has_hearts(NPC.wizard, 4)) + if ModNames.alec in world_options.mods: + set_entrance_rule(multiworld, player, AlecEntrance.petshop_to_bedroom, (logic.relationship.has_hearts(ModNPC.alec, 2) | logic.mod.magic.can_blink())) + if ModNames.lacey in world_options.mods: + set_entrance_rule(multiworld, player, LaceyEntrance.forest_to_hat_house, logic.relationship.has_hearts(ModNPC.lacey, 2)) -def set_entrance_rules(logic, multiworld, player, world_options: StardewValleyOptions): +def set_mines_floor_entrance_rules(logic, multiworld, player): for floor in range(5, 120 + 5, 5): - MultiWorldRules.set_rule(multiworld.get_entrance(dig_to_mines_floor(floor), player), - logic.can_mine_to_floor(floor).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_tide_pools, player), - logic.received("Beach Bridge") | (magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_quarry, player), - logic.received("Bridge Repair") | (magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_secret_woods, player), - logic.has_tool(Tool.axe, "Iron") | (magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.forest_to_sewer, player), - logic.has_rusty_key().simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.town_to_sewer, player), - logic.has_rusty_key().simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.take_bus_to_desert, player), - logic.received("Bus Repair").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_skull_cavern, player), - logic.received(Wallet.skull_key).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_casino, player), - logic.received("Club Card").simplify()) + rule = logic.mine.has_mine_elevator_to_floor(floor - 10) + if floor == 5 or floor == 45 or floor == 85: + rule = rule & logic.mine.can_progress_in_the_mines_from_floor(floor) + entrance = multiworld.get_entrance(dig_to_mines_floor(floor), player) + MultiWorldRules.set_rule(entrance, rule) + + +def set_skull_cavern_floor_entrance_rules(logic, multiworld, player): for floor in range(25, 200 + 25, 25): - MultiWorldRules.set_rule(multiworld.get_entrance(dig_to_skull_floor(floor), player), - logic.can_mine_to_skull_cavern_floor(floor).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_mines_dwarf, player), - logic.can_speak_dwarf() & logic.has_tool(Tool.pickaxe, ToolMaterial.iron)) - - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_desert_obelisk, player), - logic.received(Transportation.desert_obelisk).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_island_obelisk, player), - logic.received(Transportation.island_obelisk).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_farm_obelisk, player), - logic.received(Transportation.farm_obelisk).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.buy_from_traveling_merchant, player), - logic.has_traveling_merchant()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_greenhouse, player), - logic.received("Greenhouse")) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_adventurer_guild, player), - logic.received("Adventurer's Guild")) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_railroad, player), - logic.has_lived_months(2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_witch_warp_cave, player), - logic.received(Wallet.dark_talisman) | (magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_witch_hut, player), - (logic.has(ArtisanGood.void_mayonnaise) | magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_mutant_bug_lair, player), - ((logic.has_rusty_key() & logic.can_reach_region(Region.railroad) & - logic.can_meet(NPC.krobus) | magic.can_blink(logic)).simplify())) - - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_harvey_room, player), - logic.has_relationship(NPC.harvey, 2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_maru_room, player), - logic.has_relationship(NPC.maru, 2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_sebastian_room, player), - (logic.has_relationship(NPC.sebastian, 2) | magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.forest_to_leah_cottage, player), - logic.has_relationship(NPC.leah, 2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_elliott_house, player), - logic.has_relationship(NPC.elliott, 2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_sunroom, player), - logic.has_relationship(NPC.caroline, 2)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_wizard_basement, player), - logic.has_relationship(NPC.wizard, 4)) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_leo_treehouse, player), - logic.received("Treehouse")) - if ModNames.alec in world_options.mods: - MultiWorldRules.set_rule(multiworld.get_entrance(AlecEntrance.petshop_to_bedroom, player), - (logic.has_relationship(ModNPC.alec, 2) | magic.can_blink(logic)).simplify()) + rule = logic.mod.elevator.has_skull_cavern_elevator_to_floor(floor - 25) + if floor == 25 or floor == 75 or floor == 125: + rule = rule & logic.mine.can_progress_in_the_skull_cavern_from_floor(floor) + entrance = multiworld.get_entrance(dig_to_skull_floor(floor), player) + MultiWorldRules.set_rule(entrance, rule) + + +def set_blacksmith_entrance_rules(logic, multiworld, player): + set_blacksmith_upgrade_rule(logic, multiworld, player, Entrance.blacksmith_copper, MetalBar.copper, ToolMaterial.copper) + set_blacksmith_upgrade_rule(logic, multiworld, player, Entrance.blacksmith_iron, MetalBar.iron, ToolMaterial.iron) + set_blacksmith_upgrade_rule(logic, multiworld, player, Entrance.blacksmith_gold, MetalBar.gold, ToolMaterial.gold) + set_blacksmith_upgrade_rule(logic, multiworld, player, Entrance.blacksmith_iridium, MetalBar.iridium, ToolMaterial.iridium) + + +def set_skill_entrance_rules(logic, multiworld, player): + set_entrance_rule(multiworld, player, Entrance.farming, logic.skill.can_get_farming_xp) + set_entrance_rule(multiworld, player, Entrance.fishing, logic.skill.can_get_fishing_xp) + + +def set_blacksmith_upgrade_rule(logic, multiworld, player, entrance_name: str, item_name: str, tool_material: str): + material_entrance = multiworld.get_entrance(entrance_name, player) + upgrade_rule = logic.has(item_name) & logic.money.can_spend(tool_upgrade_prices[tool_material]) + MultiWorldRules.set_rule(material_entrance, upgrade_rule) + + +def set_festival_entrance_rules(logic, multiworld, player): + set_entrance_rule(multiworld, player, Entrance.attend_egg_festival, logic.season.has(Season.spring)) + set_entrance_rule(multiworld, player, Entrance.attend_flower_dance, logic.season.has(Season.spring)) + + set_entrance_rule(multiworld, player, Entrance.attend_luau, logic.season.has(Season.summer)) + set_entrance_rule(multiworld, player, Entrance.attend_moonlight_jellies, logic.season.has(Season.summer)) + + set_entrance_rule(multiworld, player, Entrance.attend_fair, logic.season.has(Season.fall)) + set_entrance_rule(multiworld, player, Entrance.attend_spirit_eve, logic.season.has(Season.fall)) + + set_entrance_rule(multiworld, player, Entrance.attend_festival_of_ice, logic.season.has(Season.winter)) + set_entrance_rule(multiworld, player, Entrance.attend_night_market, logic.season.has(Season.winter)) + set_entrance_rule(multiworld, player, Entrance.attend_winter_star, logic.season.has(Season.winter)) def set_ginger_island_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): - set_island_entrances_rules(logic, multiworld, player) + set_island_entrances_rules(logic, multiworld, player, world_options) if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: return set_boat_repair_rules(logic, multiworld, player) set_island_parrot_rules(logic, multiworld, player) MultiWorldRules.add_rule(multiworld.get_location("Open Professor Snail Cave", player), - logic.has(Craftable.cherry_bomb).simplify()) + logic.has(Bomb.cherry_bomb)) MultiWorldRules.add_rule(multiworld.get_location("Complete Island Field Office", player), - logic.can_complete_field_office().simplify()) + logic.can_complete_field_office()) def set_boat_repair_rules(logic: StardewLogic, multiworld, player): MultiWorldRules.add_rule(multiworld.get_location("Repair Boat Hull", player), - logic.has(Material.hardwood).simplify()) + logic.has(Material.hardwood)) MultiWorldRules.add_rule(multiworld.get_location("Repair Boat Anchor", player), - logic.has(MetalBar.iridium).simplify()) + logic.has(MetalBar.iridium)) MultiWorldRules.add_rule(multiworld.get_location("Repair Ticket Machine", player), - logic.has(ArtisanGood.battery_pack).simplify()) - - -def set_island_entrances_rules(logic: StardewLogic, multiworld, player): - boat_repaired = logic.received(Transportation.boat_repair).simplify() - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.fish_shop_to_boat_tunnel, player), - boat_repaired) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.boat_to_ginger_island, player), - boat_repaired) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_west, player), - logic.received("Island West Turtle").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_north, player), - logic.received("Island North Turtle").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_islandfarmhouse, player), - logic.received("Island Farmhouse").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_gourmand_cave, player), - logic.received("Island Farmhouse").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_north_to_dig_site, player), - logic.received("Dig Site Bridge").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.dig_site_to_professor_snail_cave, player), - logic.received("Open Professor Snail Cave").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_island_trader, player), - logic.received("Island Trader").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_southeast, player), - logic.received("Island Resort").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_island_resort, player), - logic.received("Island Resort").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_qi_walnut_room, player), - logic.received("Qi Walnut Room").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_north_to_volcano, player), - (logic.can_water(0) | logic.received("Volcano Bridge") | - magic.can_blink(logic)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.volcano_to_secret_beach, player), - logic.can_water(2).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.climb_to_volcano_5, player), - (logic.can_mine_perfectly() & logic.can_water(1)).simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_volcano_dwarf, player), - logic.can_speak_dwarf()) - MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.climb_to_volcano_10, player), - (logic.can_mine_perfectly() & logic.can_water(1) & logic.received("Volcano Exit Shortcut")).simplify()) + logic.has(ArtisanGood.battery_pack)) + + +def set_island_entrances_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + boat_repaired = logic.received(Transportation.boat_repair) + dig_site_rule = logic.received("Dig Site Bridge") + entrance_rules = { + Entrance.use_island_obelisk: logic.can_use_obelisk(Transportation.island_obelisk), + Entrance.use_farm_obelisk: logic.can_use_obelisk(Transportation.farm_obelisk), + Entrance.fish_shop_to_boat_tunnel: boat_repaired, + Entrance.boat_to_ginger_island: boat_repaired, + Entrance.island_south_to_west: logic.received("Island West Turtle"), + Entrance.island_south_to_north: logic.received("Island North Turtle"), + Entrance.island_west_to_islandfarmhouse: logic.received("Island Farmhouse"), + Entrance.island_west_to_gourmand_cave: logic.received("Island Farmhouse"), + Entrance.island_north_to_dig_site: dig_site_rule, + Entrance.dig_site_to_professor_snail_cave: logic.received("Open Professor Snail Cave"), + Entrance.talk_to_island_trader: logic.received("Island Trader"), + Entrance.island_south_to_southeast: logic.received("Island Resort"), + Entrance.use_island_resort: logic.received("Island Resort"), + Entrance.island_west_to_qi_walnut_room: logic.received("Qi Walnut Room"), + Entrance.island_north_to_volcano: logic.tool.can_water(0) | logic.received("Volcano Bridge") | logic.mod.magic.can_blink(), + Entrance.volcano_to_secret_beach: logic.tool.can_water(2), + Entrance.climb_to_volcano_5: logic.ability.can_mine_perfectly() & logic.tool.can_water(1), + Entrance.talk_to_volcano_dwarf: logic.wallet.can_speak_dwarf(), + Entrance.climb_to_volcano_10: logic.ability.can_mine_perfectly() & logic.tool.can_water(1), + Entrance.mountain_to_leo_treehouse: logic.received("Treehouse"), + } parrots = [Entrance.parrot_express_docks_to_volcano, Entrance.parrot_express_jungle_to_volcano, Entrance.parrot_express_dig_site_to_volcano, Entrance.parrot_express_docks_to_dig_site, Entrance.parrot_express_jungle_to_dig_site, Entrance.parrot_express_volcano_to_dig_site, Entrance.parrot_express_docks_to_jungle, Entrance.parrot_express_dig_site_to_jungle, Entrance.parrot_express_volcano_to_jungle, Entrance.parrot_express_jungle_to_docks, Entrance.parrot_express_dig_site_to_docks, Entrance.parrot_express_volcano_to_docks] + parrot_express_rule = logic.received(Transportation.parrot_express) + parrot_express_to_dig_site_rule = dig_site_rule & parrot_express_rule for parrot in parrots: - MultiWorldRules.set_rule(multiworld.get_entrance(parrot, player), logic.received(Transportation.parrot_express).simplify()) + if "Dig Site" in parrot: + entrance_rules[parrot] = parrot_express_to_dig_site_rule + else: + entrance_rules[parrot] = parrot_express_rule + + set_many_island_entrances_rules(multiworld, player, entrance_rules, world_options) def set_island_parrot_rules(logic: StardewLogic, multiworld, player): - has_walnut = logic.has_walnut(1).simplify() - has_5_walnut = logic.has_walnut(5).simplify() - has_10_walnut = logic.has_walnut(10).simplify() - has_20_walnut = logic.has_walnut(20).simplify() + has_walnut = logic.has_walnut(1) + has_5_walnut = logic.has_walnut(5) + has_10_walnut = logic.has_walnut(10) + has_20_walnut = logic.has_walnut(20) MultiWorldRules.add_rule(multiworld.get_location("Leo's Parrot", player), has_walnut) MultiWorldRules.add_rule(multiworld.get_location("Island West Turtle", player), @@ -311,7 +393,7 @@ def set_island_parrot_rules(logic: StardewLogic, multiworld, player): has_10_walnut & logic.received("Island Farmhouse")) MultiWorldRules.add_rule(multiworld.get_location("Volcano Bridge", player), has_5_walnut & logic.received("Island West Turtle") & - logic.can_reach_region(Region.volcano_floor_10)) + logic.region.can_reach(Region.volcano_floor_10)) MultiWorldRules.add_rule(multiworld.get_location("Volcano Exit Shortcut", player), has_5_walnut & logic.received("Island West Turtle")) MultiWorldRules.add_rule(multiworld.get_location("Island Resort", player), @@ -320,45 +402,47 @@ def set_island_parrot_rules(logic: StardewLogic, multiworld, player): has_10_walnut) -def set_cropsanity_rules(all_location_names: List[str], logic, multiworld, player, world_options: StardewValleyOptions): +def set_cropsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): if world_options.cropsanity == Cropsanity.option_disabled: return harvest_prefix = "Harvest " harvest_prefix_length = len(harvest_prefix) - for harvest_location in locations_by_tag[LocationTags.CROPSANITY]: + for harvest_location in locations.locations_by_tag[LocationTags.CROPSANITY]: if harvest_location.name in all_location_names and (harvest_location.mod_name is None or harvest_location.mod_name in world_options.mods): crop_name = harvest_location.name[harvest_prefix_length:] MultiWorldRules.set_rule(multiworld.get_location(harvest_location.name, player), - logic.has(crop_name).simplify()) + logic.has(crop_name)) -def set_story_quests_rules(all_location_names: List[str], logic, multiworld, player, world_options: StardewValleyOptions): - for quest in locations_by_tag[LocationTags.QUEST]: +def set_story_quests_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + if world_options.quest_locations < 0: + return + for quest in locations.locations_by_tag[LocationTags.STORY_QUEST]: if quest.name in all_location_names and (quest.mod_name is None or quest.mod_name in world_options.mods): MultiWorldRules.set_rule(multiworld.get_location(quest.name, player), - logic.quest_rules[quest.name].simplify()) + logic.registry.quest_rules[quest.name]) -def set_special_order_rules(all_location_names: List[str], logic: StardewLogic, multiworld, player, +def set_special_order_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): if world_options.special_order_locations == SpecialOrderLocations.option_disabled: return - board_rule = logic.received("Special Order Board") & logic.has_lived_months(4) - for board_order in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]: + board_rule = logic.received("Special Order Board") & logic.time.has_lived_months(4) + for board_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]: if board_order.name in all_location_names: - order_rule = board_rule & logic.special_order_rules[board_order.name] - MultiWorldRules.set_rule(multiworld.get_location(board_order.name, player), order_rule.simplify()) + order_rule = board_rule & logic.registry.special_order_rules[board_order.name] + MultiWorldRules.set_rule(multiworld.get_location(board_order.name, player), order_rule) if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: return if world_options.special_order_locations == SpecialOrderLocations.option_board_only: return - qi_rule = logic.can_reach_region(Region.qi_walnut_room) & logic.has_lived_months(8) - for qi_order in locations_by_tag[LocationTags.SPECIAL_ORDER_QI]: + qi_rule = logic.region.can_reach(Region.qi_walnut_room) & logic.time.has_lived_months(8) + for qi_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_QI]: if qi_order.name in all_location_names: - order_rule = qi_rule & logic.special_order_rules[qi_order.name] - MultiWorldRules.set_rule(multiworld.get_location(qi_order.name, player), order_rule.simplify()) + order_rule = qi_rule & logic.registry.special_order_rules[qi_order.name] + MultiWorldRules.set_rule(multiworld.get_location(qi_order.name, player), order_rule) help_wanted_prefix = "Help Wanted:" @@ -369,19 +453,21 @@ def set_special_order_rules(all_location_names: List[str], logic: StardewLogic, def set_help_wanted_quests_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): - help_wanted_number = world_options.help_wanted_locations + help_wanted_number = world_options.quest_locations.value + if help_wanted_number < 0: + return for i in range(0, help_wanted_number): set_number = i // 7 - month_rule = logic.has_lived_months(set_number).simplify() + month_rule = logic.time.has_lived_months(set_number) quest_number = set_number + 1 quest_number_in_set = i % 7 if quest_number_in_set < 4: quest_number = set_number * 4 + quest_number_in_set + 1 set_help_wanted_delivery_rule(multiworld, player, month_rule, quest_number) elif quest_number_in_set == 4: - set_help_wanted_fishing_rule(logic, multiworld, player, month_rule, quest_number) + set_help_wanted_fishing_rule(multiworld, player, month_rule, quest_number) elif quest_number_in_set == 5: - set_help_wanted_slay_monsters_rule(logic, multiworld, player, month_rule, quest_number) + set_help_wanted_slay_monsters_rule(multiworld, player, month_rule, quest_number) elif quest_number_in_set == 6: set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number) @@ -396,50 +482,47 @@ def set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number) MultiWorldRules.set_rule(multiworld.get_location(location_name, player), month_rule) -def set_help_wanted_fishing_rule(logic: StardewLogic, multiworld, player, month_rule, quest_number): +def set_help_wanted_fishing_rule(multiworld, player, month_rule, quest_number): location_name = f"{help_wanted_prefix} {fishing} {quest_number}" - fishing_rule = month_rule & logic.can_fish() - MultiWorldRules.set_rule(multiworld.get_location(location_name, player), fishing_rule.simplify()) + MultiWorldRules.set_rule(multiworld.get_location(location_name, player), month_rule) -def set_help_wanted_slay_monsters_rule(logic: StardewLogic, multiworld, player, month_rule, quest_number): +def set_help_wanted_slay_monsters_rule(multiworld, player, month_rule, quest_number): location_name = f"{help_wanted_prefix} {slay_monsters} {quest_number}" - slay_rule = month_rule & logic.can_do_combat_at_level("Basic") - MultiWorldRules.set_rule(multiworld.get_location(location_name, player), slay_rule.simplify()) + MultiWorldRules.set_rule(multiworld.get_location(location_name, player), month_rule) -def set_fishsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int): +def set_fishsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld: MultiWorld, player: int): fish_prefix = "Fishsanity: " - for fish_location in locations_by_tag[LocationTags.FISHSANITY]: + for fish_location in locations.locations_by_tag[LocationTags.FISHSANITY]: if fish_location.name in all_location_names: fish_name = fish_location.name[len(fish_prefix):] MultiWorldRules.set_rule(multiworld.get_location(fish_location.name, player), - logic.has(fish_name).simplify()) + logic.has(fish_name)) -def set_museumsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int, +def set_museumsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): museum_prefix = "Museumsanity: " if world_options.museumsanity == Museumsanity.option_milestones: - for museum_milestone in locations_by_tag[LocationTags.MUSEUM_MILESTONES]: + for museum_milestone in locations.locations_by_tag[LocationTags.MUSEUM_MILESTONES]: set_museum_milestone_rule(logic, multiworld, museum_milestone, museum_prefix, player) elif world_options.museumsanity != Museumsanity.option_none: set_museum_individual_donations_rules(all_location_names, logic, multiworld, museum_prefix, player) def set_museum_individual_donations_rules(all_location_names, logic: StardewLogic, multiworld, museum_prefix, player): - all_donations = sorted(locations_by_tag[LocationTags.MUSEUM_DONATIONS], + all_donations = sorted(locations.locations_by_tag[LocationTags.MUSEUM_DONATIONS], key=lambda x: all_museum_items_by_name[x.name[len(museum_prefix):]].difficulty, reverse=True) counter = 0 number_donations = len(all_donations) for museum_location in all_donations: if museum_location.name in all_location_names: donation_name = museum_location.name[len(museum_prefix):] - required_detectors = counter * 5 // number_donations - rule = logic.can_donate_museum_item(all_museum_items_by_name[donation_name]) & logic.received("Traveling Merchant Metal Detector", - required_detectors) + required_detectors = counter * 3 // number_donations + rule = logic.museum.can_find_museum_item(all_museum_items_by_name[donation_name]) & logic.received(Wallet.metal_detector, required_detectors) MultiWorldRules.set_rule(multiworld.get_location(museum_location.name, player), - rule.simplify()) + rule) counter += 1 @@ -449,33 +532,33 @@ def set_museum_milestone_rule(logic: StardewLogic, multiworld: MultiWorld, museu donations_suffix = " Donations" minerals_suffix = " Minerals" artifacts_suffix = " Artifacts" - metal_detector = "Traveling Merchant Metal Detector" + metal_detector = Wallet.metal_detector rule = None if milestone_name.endswith(donations_suffix): - rule = get_museum_item_count_rule(logic, donations_suffix, milestone_name, all_museum_items, logic.can_donate_museum_items) + rule = get_museum_item_count_rule(logic, donations_suffix, milestone_name, all_museum_items, logic.museum.can_find_museum_items) elif milestone_name.endswith(minerals_suffix): - rule = get_museum_item_count_rule(logic, minerals_suffix, milestone_name, all_museum_minerals, logic.can_donate_museum_minerals) + rule = get_museum_item_count_rule(logic, minerals_suffix, milestone_name, all_museum_minerals, logic.museum.can_find_museum_minerals) elif milestone_name.endswith(artifacts_suffix): - rule = get_museum_item_count_rule(logic, artifacts_suffix, milestone_name, all_museum_artifacts, logic.can_donate_museum_artifacts) + rule = get_museum_item_count_rule(logic, artifacts_suffix, milestone_name, all_museum_artifacts, logic.museum.can_find_museum_artifacts) elif milestone_name == "Dwarf Scrolls": - rule = And([logic.can_donate_museum_item(item) for item in dwarf_scrolls]) & logic.received(metal_detector, 4) + rule = And(*(logic.museum.can_find_museum_item(item) for item in dwarf_scrolls)) & logic.received(metal_detector, 2) elif milestone_name == "Skeleton Front": - rule = And([logic.can_donate_museum_item(item) for item in skeleton_front]) & logic.received(metal_detector, 4) + rule = And(*(logic.museum.can_find_museum_item(item) for item in skeleton_front)) & logic.received(metal_detector, 2) elif milestone_name == "Skeleton Middle": - rule = And([logic.can_donate_museum_item(item) for item in skeleton_middle]) & logic.received(metal_detector, 4) + rule = And(*(logic.museum.can_find_museum_item(item) for item in skeleton_middle)) & logic.received(metal_detector, 2) elif milestone_name == "Skeleton Back": - rule = And([logic.can_donate_museum_item(item) for item in skeleton_back]) & logic.received(metal_detector, 4) + rule = And(*(logic.museum.can_find_museum_item(item) for item in skeleton_back)) & logic.received(metal_detector, 2) elif milestone_name == "Ancient Seed": - rule = logic.can_donate_museum_item(Artifact.ancient_seed) & logic.received(metal_detector, 4) + rule = logic.museum.can_find_museum_item(Artifact.ancient_seed) & logic.received(metal_detector, 2) if rule is None: return - MultiWorldRules.set_rule(multiworld.get_location(museum_milestone.name, player), rule.simplify()) + MultiWorldRules.set_rule(multiworld.get_location(museum_milestone.name, player), rule) def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, accepted_items, donation_func): - metal_detector = "Traveling Merchant Metal Detector" + metal_detector = Wallet.metal_detector num = int(milestone_name[:milestone_name.index(suffix)]) - required_detectors = (num - 1) * 5 // len(accepted_items) + required_detectors = (num - 1) * 3 // len(accepted_items) rule = donation_func(num) & logic.received(metal_detector, required_detectors) return rule @@ -483,63 +566,214 @@ def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, acce def set_backpack_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): if world_options.backpack_progression != BackpackProgression.option_vanilla: MultiWorldRules.set_rule(multiworld.get_location("Large Pack", player), - logic.can_spend_money(2000).simplify()) + logic.money.can_spend(2000)) MultiWorldRules.set_rule(multiworld.get_location("Deluxe Pack", player), - (logic.can_spend_money(10000) & logic.received("Progressive Backpack")).simplify()) + (logic.money.can_spend(10000) & logic.received("Progressive Backpack"))) if ModNames.big_backpack in world_options.mods: MultiWorldRules.set_rule(multiworld.get_location("Premium Pack", player), - (logic.can_spend_money(150000) & - logic.received("Progressive Backpack", 2)).simplify()) + (logic.money.can_spend(150000) & + logic.received("Progressive Backpack", 2))) -def set_festival_rules(all_location_names: List[str], logic: StardewLogic, multiworld, player): +def set_festival_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player): festival_locations = [] - festival_locations.extend(locations_by_tag[LocationTags.FESTIVAL]) - festival_locations.extend(locations_by_tag[LocationTags.FESTIVAL_HARD]) + festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL]) + festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL_HARD]) for festival in festival_locations: if festival.name in all_location_names: MultiWorldRules.set_rule(multiworld.get_location(festival.name, player), - logic.festival_rules[festival.name].simplify()) + logic.registry.festival_rules[festival.name]) + +monster_eradication_prefix = "Monster Eradication: " + + +def set_monstersanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + monstersanity_option = world_options.monstersanity + if monstersanity_option == Monstersanity.option_none: + return + + if monstersanity_option == Monstersanity.option_one_per_monster or monstersanity_option == Monstersanity.option_split_goals: + set_monstersanity_monster_rules(all_location_names, logic, multiworld, player, monstersanity_option) + return + + if monstersanity_option == Monstersanity.option_progressive_goals: + set_monstersanity_progressive_category_rules(all_location_names, logic, multiworld, player) + return -def set_traveling_merchant_rules(logic: StardewLogic, multiworld: MultiWorld, player: int): + set_monstersanity_category_rules(all_location_names, logic, multiworld, player, monstersanity_option) + + +def set_monstersanity_monster_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monstersanity_option): + for monster_name in logic.monster.all_monsters_by_name: + location_name = f"{monster_eradication_prefix}{monster_name}" + if location_name not in all_location_names: + continue + location = multiworld.get_location(location_name, player) + if monstersanity_option == Monstersanity.option_split_goals: + rule = logic.monster.can_kill_many(logic.monster.all_monsters_by_name[monster_name]) + else: + rule = logic.monster.can_kill(logic.monster.all_monsters_by_name[monster_name]) + MultiWorldRules.set_rule(location, rule) + + +def set_monstersanity_progressive_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player): + for monster_category in logic.monster.all_monsters_by_category: + set_monstersanity_progressive_single_category_rules(all_location_names, logic, multiworld, player, monster_category) + + +def set_monstersanity_progressive_single_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monster_category: str): + location_names = [name for name in all_location_names if name.startswith(monster_eradication_prefix) and name.endswith(monster_category)] + if not location_names: + return + location_names = sorted(location_names, key=lambda name: get_monster_eradication_number(name, monster_category)) + for i in range(5): + location_name = location_names[i] + set_monstersanity_progressive_category_rule(all_location_names, logic, multiworld, player, monster_category, location_name, i) + + +def set_monstersanity_progressive_category_rule(all_location_names: Set[str], logic: StardewLogic, multiworld, player, + monster_category: str, location_name: str, goal_index): + if location_name not in all_location_names: + return + location = multiworld.get_location(location_name, player) + if goal_index < 3: + rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], goal_index + 1) + else: + rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], goal_index * 2) + MultiWorldRules.set_rule(location, rule) + + +def get_monster_eradication_number(location_name, monster_category) -> int: + number = location_name[len(monster_eradication_prefix):-len(monster_category)] + number = number.strip() + if number.isdigit(): + return int(number) + return 1000 + + +def set_monstersanity_category_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, monstersanity_option): + for monster_category in logic.monster.all_monsters_by_category: + location_name = f"{monster_eradication_prefix}{monster_category}" + if location_name not in all_location_names: + continue + location = multiworld.get_location(location_name, player) + if monstersanity_option == Monstersanity.option_one_per_category: + rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category]) + else: + rule = logic.monster.can_kill_any(logic.monster.all_monsters_by_category[monster_category], MAX_MONTHS) + MultiWorldRules.set_rule(location, rule) + + +def set_shipsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + shipsanity_option = world_options.shipsanity + if shipsanity_option == Shipsanity.option_none: + return + + shipsanity_prefix = "Shipsanity: " + for location in locations.locations_by_tag[LocationTags.SHIPSANITY]: + if location.name not in all_location_names: + continue + item_to_ship = location.name[len(shipsanity_prefix):] + MultiWorldRules.set_rule(multiworld.get_location(location.name, player), logic.shipping.can_ship(item_to_ship)) + + +def set_cooksanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + cooksanity_option = world_options.cooksanity + if cooksanity_option == Cooksanity.option_none: + return + + cooksanity_prefix = "Cook " + for location in locations.locations_by_tag[LocationTags.COOKSANITY]: + if location.name not in all_location_names: + continue + recipe_name = location.name[len(cooksanity_prefix):] + recipe = all_cooking_recipes_by_name[recipe_name] + cook_rule = logic.cooking.can_cook(recipe) + MultiWorldRules.set_rule(multiworld.get_location(location.name, player), cook_rule) + + +def set_chefsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + chefsanity_option = world_options.chefsanity + if chefsanity_option == Chefsanity.option_none: + return + + chefsanity_suffix = " Recipe" + for location in locations.locations_by_tag[LocationTags.CHEFSANITY]: + if location.name not in all_location_names: + continue + recipe_name = location.name[:-len(chefsanity_suffix)] + recipe = all_cooking_recipes_by_name[recipe_name] + learn_rule = logic.cooking.can_learn_recipe(recipe.source) + MultiWorldRules.set_rule(multiworld.get_location(location.name, player), learn_rule) + + +def set_craftsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions): + craftsanity_option = world_options.craftsanity + if craftsanity_option == Craftsanity.option_none: + return + + craft_prefix = "Craft " + craft_suffix = " Recipe" + for location in locations.locations_by_tag[LocationTags.CRAFTSANITY]: + if location.name not in all_location_names: + continue + if location.name.endswith(craft_suffix): + recipe_name = location.name[:-len(craft_suffix)] + recipe = all_crafting_recipes_by_name[recipe_name] + craft_rule = logic.crafting.can_learn_recipe(recipe) + else: + recipe_name = location.name[len(craft_prefix):] + recipe = all_crafting_recipes_by_name[recipe_name] + craft_rule = logic.crafting.can_craft(recipe) + MultiWorldRules.set_rule(multiworld.get_location(location.name, player), craft_rule) + + +def set_traveling_merchant_day_rules(logic: StardewLogic, multiworld: MultiWorld, player: int): for day in Weekday.all_days: item_for_day = f"Traveling Merchant: {day}" - for i in range(1, 4): - location_name = f"Traveling Merchant {day} Item {i}" - MultiWorldRules.set_rule(multiworld.get_location(location_name, player), - logic.received(item_for_day)) + entrance_name = f"Buy from Traveling Merchant {day}" + set_entrance_rule(multiworld, player, entrance_name, logic.received(item_for_day)) def set_arcade_machine_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player), - logic.received(Wallet.skull_key).simplify()) + logic.received(Wallet.skull_key)) if world_options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling: return MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player), - logic.has("Junimo Kart Small Buff").simplify()) + logic.has("Junimo Kart Small Buff")) MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_2, player), - logic.has("Junimo Kart Medium Buff").simplify()) + logic.has("Junimo Kart Medium Buff")) MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_3, player), - logic.has("Junimo Kart Big Buff").simplify()) + logic.has("Junimo Kart Big Buff")) MultiWorldRules.add_rule(multiworld.get_location("Junimo Kart: Sunset Speedway (Victory)", player), - logic.has("Junimo Kart Max Buff").simplify()) + logic.has("Junimo Kart Max Buff")) MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_journey_of_the_prairie_king, player), - logic.has("JotPK Small Buff").simplify()) + logic.has("JotPK Small Buff")) MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_2, player), - logic.has("JotPK Medium Buff").simplify()) + logic.has("JotPK Medium Buff")) MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_3, player), - logic.has("JotPK Big Buff").simplify()) + logic.has("JotPK Big Buff")) MultiWorldRules.add_rule(multiworld.get_location("Journey of the Prairie King Victory", player), - logic.has("JotPK Max Buff").simplify()) + logic.has("JotPK Max Buff")) -def set_friendsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int): +def set_friendsanity_rules(all_location_names: Set[str], logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): + if world_options.friendsanity == Friendsanity.option_none: + return + MultiWorldRules.add_rule(multiworld.get_location("Spouse Stardrop", player), + logic.relationship.has_hearts(Generic.bachelor, 13)) + MultiWorldRules.add_rule(multiworld.get_location("Have a Baby", player), + logic.relationship.can_reproduce(1)) + MultiWorldRules.add_rule(multiworld.get_location("Have Another Baby", player), + logic.relationship.can_reproduce(2)) + friend_prefix = "Friendsanity: " friend_suffix = " <3" - for friend_location in locations_by_tag[LocationTags.FRIENDSANITY]: - if friend_location.name not in all_location_names: + for friend_location in locations.locations_by_tag[LocationTags.FRIENDSANITY]: + if not friend_location.name in all_location_names: continue friend_location_without_prefix = friend_location.name[len(friend_prefix):] friend_location_trimmed = friend_location_without_prefix[:friend_location_without_prefix.index(friend_suffix)] @@ -547,89 +781,144 @@ def set_friendsanity_rules(all_location_names: List[str], logic: StardewLogic, m friend_name = friend_location_trimmed[:split_index] num_hearts = int(friend_location_trimmed[split_index + 1:]) MultiWorldRules.set_rule(multiworld.get_location(friend_location.name, player), - logic.can_earn_relationship(friend_name, num_hearts).simplify()) + logic.relationship.can_earn_relationship(friend_name, num_hearts)) def set_deepwoods_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): if ModNames.deepwoods in world_options.mods: MultiWorldRules.add_rule(multiworld.get_location("Breaking Up Deep Woods Gingerbread House", player), - logic.has_tool(Tool.axe, "Gold") & deepwoods.can_reach_woods_depth(logic, 50).simplify()) + logic.tool.has_tool(Tool.axe, "Gold")) MultiWorldRules.add_rule(multiworld.get_location("Chop Down a Deep Woods Iridium Tree", player), - logic.has_tool(Tool.axe, "Iridium").simplify()) - MultiWorldRules.set_rule(multiworld.get_entrance(DeepWoodsEntrance.use_woods_obelisk, player), - logic.received("Woods Obelisk").simplify()) + logic.tool.has_tool(Tool.axe, "Iridium")) + set_entrance_rule(multiworld, player, DeepWoodsEntrance.use_woods_obelisk, logic.received("Woods Obelisk")) for depth in range(10, 100 + 10, 10): - MultiWorldRules.set_rule(multiworld.get_entrance(move_to_woods_depth(depth), player), - deepwoods.can_chop_to_depth(logic, depth).simplify()) + set_entrance_rule(multiworld, player, move_to_woods_depth(depth), logic.mod.deepwoods.can_chop_to_depth(depth)) + MultiWorldRules.add_rule(multiworld.get_location("The Sword in the Stone", player), + logic.mod.deepwoods.can_pull_sword() & logic.mod.deepwoods.can_chop_to_depth(100)) def set_magic_spell_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): if ModNames.magic not in world_options.mods: return - MultiWorldRules.set_rule(multiworld.get_entrance(MagicEntrance.store_to_altar, player), - (logic.has_relationship(NPC.wizard, 3) & - logic.can_reach_region(Region.wizard_tower)).simplify()) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Clear Debris", player), - ((logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic")) - & magic.can_use_altar(logic)).simplify()) + (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic"))) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Till", player), - (logic.has_tool("Hoe", "Basic") & magic.can_use_altar(logic)).simplify()) + logic.tool.has_tool("Hoe", "Basic")) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Water", player), - (logic.has_tool("Watering Can", "Basic") & magic.can_use_altar(logic)).simplify()) + logic.tool.has_tool("Watering Can", "Basic")) MultiWorldRules.add_rule(multiworld.get_location("Analyze All Toil School Locations", player), - (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic") - & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic")) - & magic.can_use_altar(logic)).simplify()) + (logic.tool.has_tool("Watering Can", "Basic") & logic.tool.has_tool("Hoe", "Basic") + & (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic")))) # Do I *want* to add boots into logic when you get them even in vanilla without effort? idk MultiWorldRules.add_rule(multiworld.get_location("Analyze: Evac", player), - (logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify()) + logic.ability.can_mine_perfectly()) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Haste", player), - (logic.has("Coffee") & magic.can_use_altar(logic)).simplify()) + logic.has("Coffee")) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Heal", player), - (logic.has("Life Elixir") & magic.can_use_altar(logic)).simplify()) + logic.has("Life Elixir")) MultiWorldRules.add_rule(multiworld.get_location("Analyze All Life School Locations", player), (logic.has("Coffee") & logic.has("Life Elixir") - & logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify()) + & logic.ability.can_mine_perfectly())) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Descend", player), - (logic.can_reach_region(Region.mines) & magic.can_use_altar(logic)).simplify()) + logic.region.can_reach(Region.mines)) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Fireball", player), - (logic.has("Fire Quartz") & magic.can_use_altar(logic)).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Analyze: Frostbite", player), - (logic.can_mine_to_floor(70) & logic.can_fish(85) & magic.can_use_altar(logic)).simplify()) + logic.has("Fire Quartz")) + MultiWorldRules.add_rule(multiworld.get_location("Analyze: Frostbolt", player), + logic.region.can_reach(Region.mines_floor_60) & logic.skill.can_fish(difficulty=85)) MultiWorldRules.add_rule(multiworld.get_location("Analyze All Elemental School Locations", player), - (logic.can_reach_region(Region.mines) & logic.has("Fire Quartz") - & logic.can_reach_region(Region.mines_floor_70) & logic.can_fish(85) & - magic.can_use_altar(logic)).simplify()) - MultiWorldRules.add_rule(multiworld.get_location("Analyze: Lantern", player), - magic.can_use_altar(logic).simplify()) + logic.has("Fire Quartz") & logic.region.can_reach(Region.mines_floor_60) & logic.skill.can_fish(difficulty=85)) + # MultiWorldRules.add_rule(multiworld.get_location("Analyze: Lantern", player),) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Tendrils", player), - (logic.can_reach_region(Region.farm) & magic.can_use_altar(logic)).simplify()) + logic.region.can_reach(Region.farm)) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Shockwave", player), - (logic.has("Earth Crystal") & magic.can_use_altar(logic)).simplify()) + logic.has("Earth Crystal")) MultiWorldRules.add_rule(multiworld.get_location("Analyze All Nature School Locations", player), - (logic.has("Earth Crystal") & logic.can_reach_region("Farm") & - magic.can_use_altar(logic)).simplify()), + (logic.has("Earth Crystal") & logic.region.can_reach("Farm"))), MultiWorldRules.add_rule(multiworld.get_location("Analyze: Meteor", player), - (logic.can_reach_region(Region.farm) & logic.has_lived_months(12) - & magic.can_use_altar(logic)).simplify()), + (logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12))), MultiWorldRules.add_rule(multiworld.get_location("Analyze: Lucksteal", player), - (logic.can_reach_region(Region.witch_hut) & magic.can_use_altar(logic)).simplify()) + logic.region.can_reach(Region.witch_hut)) MultiWorldRules.add_rule(multiworld.get_location("Analyze: Bloodmana", player), - (logic.can_reach_region(Region.mines_floor_100) & magic.can_use_altar(logic)).simplify()) + logic.region.can_reach(Region.mines_floor_100)) MultiWorldRules.add_rule(multiworld.get_location("Analyze All Eldritch School Locations", player), - (logic.can_reach_region(Region.witch_hut) & - logic.can_reach_region(Region.mines_floor_100) & - logic.can_reach_region(Region.farm) & logic.has_lived_months(12) & - magic.can_use_altar(logic)).simplify()) + (logic.region.can_reach(Region.witch_hut) & + logic.region.can_reach(Region.mines_floor_100) & + logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12))) MultiWorldRules.add_rule(multiworld.get_location("Analyze Every Magic School Location", player), - (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic") - & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic")) & + (logic.tool.has_tool("Watering Can", "Basic") & logic.tool.has_tool("Hoe", "Basic") + & (logic.tool.has_tool("Axe", "Basic") | logic.tool.has_tool("Pickaxe", "Basic")) & logic.has("Coffee") & logic.has("Life Elixir") - & logic.can_mine_perfectly() & logic.has("Earth Crystal") & - logic.can_reach_region(Region.mines) & - logic.has("Fire Quartz") & logic.can_fish(85) & - logic.can_reach_region(Region.witch_hut) & - logic.can_reach_region(Region.mines_floor_100) & - logic.can_reach_region(Region.farm) & logic.has_lived_months(12) & - magic.can_use_altar(logic)).simplify()) + & logic.ability.can_mine_perfectly() & logic.has("Earth Crystal") & + logic.has("Fire Quartz") & logic.skill.can_fish(difficulty=85) & + logic.region.can_reach(Region.witch_hut) & + logic.region.can_reach(Region.mines_floor_100) & + logic.region.can_reach(Region.farm) & logic.time.has_lived_months(12))) + + +def set_sve_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): + if ModNames.sve not in world_options.mods: + return + set_entrance_rule(multiworld, player, SVEEntrance.forest_to_lost_woods, logic.bundle.can_complete_community_center) + set_entrance_rule(multiworld, player, SVEEntrance.enter_summit, logic.mod.sve.has_iridium_bomb()) + set_entrance_rule(multiworld, player, SVEEntrance.backwoods_to_grove, logic.mod.sve.has_any_rune()) + set_entrance_rule(multiworld, player, SVEEntrance.badlands_to_cave, logic.has("Aegis Elixir")) + set_entrance_rule(multiworld, player, SVEEntrance.forest_west_to_spring, logic.quest.can_complete_quest(Quest.magic_ink)) + set_entrance_rule(multiworld, player, SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer)) + set_entrance_rule(multiworld, player, SVEEntrance.secret_woods_to_west, logic.tool.has_tool(Tool.axe, ToolMaterial.iron)) + set_entrance_rule(multiworld, player, SVEEntrance.grandpa_shed_to_interior, logic.tool.has_tool(Tool.axe, ToolMaterial.iron)) + set_entrance_rule(multiworld, player, SVEEntrance.aurora_warp_to_aurora, logic.received(SVERunes.nexus_aurora)) + set_entrance_rule(multiworld, player, SVEEntrance.farm_warp_to_farm, logic.received(SVERunes.nexus_farm)) + set_entrance_rule(multiworld, player, SVEEntrance.guild_warp_to_guild, logic.received(SVERunes.nexus_guild)) + set_entrance_rule(multiworld, player, SVEEntrance.junimo_warp_to_junimo, logic.received(SVERunes.nexus_junimo)) + set_entrance_rule(multiworld, player, SVEEntrance.spring_warp_to_spring, logic.received(SVERunes.nexus_spring)) + set_entrance_rule(multiworld, player, SVEEntrance.outpost_warp_to_outpost, logic.received(SVERunes.nexus_outpost)) + set_entrance_rule(multiworld, player, SVEEntrance.wizard_warp_to_wizard, logic.received(SVERunes.nexus_wizard)) + set_entrance_rule(multiworld, player, SVEEntrance.use_purple_junimo, logic.relationship.has_hearts(ModNPC.apples, 10)) + set_entrance_rule(multiworld, player, SVEEntrance.grandpa_interior_to_upstairs, logic.received(SVEQuestItem.grandpa_shed)) + set_entrance_rule(multiworld, player, SVEEntrance.use_bear_shop, (logic.mod.sve.can_buy_bear_recipe())) + set_entrance_rule(multiworld, player, SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer)) + set_entrance_rule(multiworld, player, SVEEntrance.museum_to_gunther_bedroom, logic.relationship.has_hearts(ModNPC.gunther, 2)) + logic.mod.sve.initialize_rules() + for location in logic.registry.sve_location_rules: + MultiWorldRules.set_rule(multiworld.get_location(location, player), + logic.registry.sve_location_rules[location]) + set_sve_ginger_island_rules(logic, multiworld, player, world_options) + set_boarding_house_rules(logic, multiworld, player, world_options) + + +def set_sve_ginger_island_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): + if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return + set_entrance_rule(multiworld, player, SVEEntrance.summit_to_highlands, logic.received(SVEQuestItem.marlon_boat_paddle)) + set_entrance_rule(multiworld, player, SVEEntrance.wizard_to_fable_reef, logic.received(SVEQuestItem.fable_reef_portal)) + set_entrance_rule(multiworld, player, SVEEntrance.highlands_to_cave, + logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron) & logic.tool.has_tool(Tool.axe, ToolMaterial.iron)) + + +def set_boarding_house_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions): + if ModNames.boarding_house not in world_options.mods: + return + set_entrance_rule(multiworld, player, BoardingHouseEntrance.the_lost_valley_to_lost_valley_ruins, logic.tool.has_tool(Tool.axe, ToolMaterial.iron)) + + +def set_entrance_rule(multiworld, player, entrance: str, rule: StardewRule): + potentially_required_regions = look_for_indirect_connection(rule) + if potentially_required_regions: + for region in potentially_required_regions: + multiworld.register_indirect_condition(multiworld.get_region(region, player), multiworld.get_entrance(entrance, player)) + + MultiWorldRules.set_rule(multiworld.get_entrance(entrance, player), rule) + + +def set_island_entrance_rule(multiworld, player, entrance: str, rule: StardewRule, world_options: StardewValleyOptions): + if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return + set_entrance_rule(multiworld, player, entrance, rule) + + +def set_many_island_entrances_rules(multiworld, player, entrance_rules: Dict[str, StardewRule], world_options: StardewValleyOptions): + if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true: + return + for entrance, rule in entrance_rules.items(): + set_entrance_rule(multiworld, player, entrance, rule) diff --git a/worlds/stardew_valley/scripts/update_data.py b/worlds/stardew_valley/scripts/update_data.py index 7b31a3705c5c..ae8f7f8d5503 100644 --- a/worlds/stardew_valley/scripts/update_data.py +++ b/worlds/stardew_valley/scripts/update_data.py @@ -12,7 +12,7 @@ from worlds.stardew_valley import LocationData from worlds.stardew_valley.items import load_item_csv, Group, ItemData -from worlds.stardew_valley.locations import load_location_csv +from worlds.stardew_valley.locations import load_location_csv, LocationTags RESOURCE_PACK_CODE_OFFSET = 5000 script_folder = Path(__file__) @@ -34,14 +34,15 @@ def write_item_csv(items: List[ItemData]): def write_location_csv(locations: List[LocationData]): with open((script_folder.parent.parent / "data/locations.csv").resolve(), "w", newline="") as file: - write = csv.DictWriter(file, ["id", "region", "name", "tags"]) + write = csv.DictWriter(file, ["id", "region", "name", "tags", "mod_name"]) write.writeheader() for location in locations: location_dict = { "id": location.code_without_offset, "name": location.name, "region": location.region, - "tags": ",".join(sorted(group.name for group in location.tags)) + "tags": ",".join(sorted(group.name for group in location.tags)), + "mod_name": location.mod_name } write.writerow(location_dict) @@ -76,12 +77,11 @@ def write_location_csv(locations: List[LocationData]): location_counter = itertools.count(max(location.code_without_offset for location in loaded_locations if location.code_without_offset is not None) + 1) - locations_to_write = [] for location in loaded_locations: if location.code_without_offset is None: locations_to_write.append( - LocationData(next(location_counter), location.region, location.name, location.tags)) + LocationData(next(location_counter), location.region, location.name, location.mod_name, location.tags)) continue locations_to_write.append(location) diff --git a/worlds/stardew_valley/stardew_rule.py b/worlds/stardew_valley/stardew_rule.py deleted file mode 100644 index 9c96de00d333..000000000000 --- a/worlds/stardew_valley/stardew_rule.py +++ /dev/null @@ -1,384 +0,0 @@ -from __future__ import annotations - -from dataclasses import dataclass -from typing import Iterable, Dict, List, Union, FrozenSet, Set - -from BaseClasses import CollectionState, ItemClassification -from .items import item_table - -MISSING_ITEM = "THIS ITEM IS MISSING" - - -class StardewRule: - def __call__(self, state: CollectionState) -> bool: - raise NotImplementedError - - def __or__(self, other) -> StardewRule: - if type(other) is Or: - return Or(self, *other.rules) - - return Or(self, other) - - def __and__(self, other) -> StardewRule: - if type(other) is And: - return And(other.rules.union({self})) - - return And(self, other) - - def get_difficulty(self): - raise NotImplementedError - - def simplify(self) -> StardewRule: - return self - - -class True_(StardewRule): # noqa - - def __new__(cls, _cache=[]): # noqa - # Only one single instance will be ever created. - if not _cache: - _cache.append(super(True_, cls).__new__(cls)) - return _cache[0] - - def __call__(self, state: CollectionState) -> bool: - return True - - def __or__(self, other) -> StardewRule: - return self - - def __and__(self, other) -> StardewRule: - return other - - def __repr__(self): - return "True" - - def get_difficulty(self): - return 0 - - -class False_(StardewRule): # noqa - - def __new__(cls, _cache=[]): # noqa - # Only one single instance will be ever created. - if not _cache: - _cache.append(super(False_, cls).__new__(cls)) - return _cache[0] - - def __call__(self, state: CollectionState) -> bool: - return False - - def __or__(self, other) -> StardewRule: - return other - - def __and__(self, other) -> StardewRule: - return self - - def __repr__(self): - return "False" - - def get_difficulty(self): - return 999999999 - - -false_ = False_() -true_ = True_() -assert false_ is False_() -assert true_ is True_() - - -class Or(StardewRule): - rules: FrozenSet[StardewRule] - _simplified: bool - - def __init__(self, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule): - rules_list: Set[StardewRule] - - if isinstance(rule, Iterable): - rules_list = {*rule} - else: - rules_list = {rule} - - if rules is not None: - rules_list.update(rules) - - assert rules_list, "Can't create a Or conditions without rules" - - if any(type(rule) is Or for rule in rules_list): - new_rules: Set[StardewRule] = set() - for rule in rules_list: - if type(rule) is Or: - new_rules.update(rule.rules) - else: - new_rules.add(rule) - rules_list = new_rules - - self.rules = frozenset(rules_list) - self._simplified = False - - def __call__(self, state: CollectionState) -> bool: - return any(rule(state) for rule in self.rules) - - def __repr__(self): - return f"({' | '.join(repr(rule) for rule in self.rules)})" - - def __or__(self, other): - if other is true_: - return other - if other is false_: - return self - if type(other) is Or: - return Or(self.rules.union(other.rules)) - - return Or(self.rules.union({other})) - - def __eq__(self, other): - return isinstance(other, self.__class__) and other.rules == self.rules - - def __hash__(self): - return hash(self.rules) - - def get_difficulty(self): - return min(rule.get_difficulty() for rule in self.rules) - - def simplify(self) -> StardewRule: - if self._simplified: - return self - if true_ in self.rules: - return true_ - - simplified_rules = [simplified for simplified in {rule.simplify() for rule in self.rules} - if simplified is not false_] - - if not simplified_rules: - return false_ - - if len(simplified_rules) == 1: - return simplified_rules[0] - - self.rules = frozenset(simplified_rules) - self._simplified = True - return self - - -class And(StardewRule): - rules: FrozenSet[StardewRule] - _simplified: bool - - def __init__(self, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule): - rules_list: Set[StardewRule] - - if isinstance(rule, Iterable): - rules_list = {*rule} - else: - rules_list = {rule} - - if rules is not None: - rules_list.update(rules) - - if not rules_list: - rules_list.add(true_) - elif any(type(rule) is And for rule in rules_list): - new_rules: Set[StardewRule] = set() - for rule in rules_list: - if type(rule) is And: - new_rules.update(rule.rules) - else: - new_rules.add(rule) - rules_list = new_rules - - self.rules = frozenset(rules_list) - self._simplified = False - - def __call__(self, state: CollectionState) -> bool: - return all(rule(state) for rule in self.rules) - - def __repr__(self): - return f"({' & '.join(repr(rule) for rule in self.rules)})" - - def __and__(self, other): - if other is true_: - return self - if other is false_: - return other - if type(other) is And: - return And(self.rules.union(other.rules)) - - return And(self.rules.union({other})) - - def __eq__(self, other): - return isinstance(other, self.__class__) and other.rules == self.rules - - def __hash__(self): - return hash(self.rules) - - def get_difficulty(self): - return max(rule.get_difficulty() for rule in self.rules) - - def simplify(self) -> StardewRule: - if self._simplified: - return self - if false_ in self.rules: - return false_ - - simplified_rules = [simplified for simplified in {rule.simplify() for rule in self.rules} - if simplified is not true_] - - if not simplified_rules: - return true_ - - if len(simplified_rules) == 1: - return simplified_rules[0] - - self.rules = frozenset(simplified_rules) - self._simplified = True - return self - - -class Count(StardewRule): - count: int - rules: List[StardewRule] - - def __init__(self, count: int, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule): - rules_list: List[StardewRule] - - if isinstance(rule, Iterable): - rules_list = [*rule] - else: - rules_list = [rule] - - if rules is not None: - rules_list.extend(rules) - - assert rules_list, "Can't create a Count conditions without rules" - assert len(rules_list) >= count, "Count need at least as many rules at the count" - - self.rules = rules_list - self.count = count - - def __call__(self, state: CollectionState) -> bool: - c = 0 - for r in self.rules: - if r(state): - c += 1 - if c >= self.count: - return True - return False - - def __repr__(self): - return f"Received {self.count} {repr(self.rules)}" - - def get_difficulty(self): - rules_sorted_by_difficulty = sorted(self.rules, key=lambda x: x.get_difficulty()) - easiest_n_rules = rules_sorted_by_difficulty[0:self.count] - return max(rule.get_difficulty() for rule in easiest_n_rules) - - def simplify(self): - return Count(self.count, [rule.simplify() for rule in self.rules]) - - -class TotalReceived(StardewRule): - count: int - items: Iterable[str] - player: int - - def __init__(self, count: int, items: Union[str, Iterable[str]], player: int): - items_list: List[str] - - if isinstance(items, Iterable): - items_list = [*items] - else: - items_list = [items] - - assert items_list, "Can't create a Total Received conditions without items" - for item in items_list: - assert item_table[item].classification & ItemClassification.progression, \ - "Item has to be progression to be used in logic" - - self.player = player - self.items = items_list - self.count = count - - def __call__(self, state: CollectionState) -> bool: - c = 0 - for item in self.items: - c += state.count(item, self.player) - if c >= self.count: - return True - return False - - def __repr__(self): - return f"Received {self.count} {self.items}" - - def get_difficulty(self): - return self.count - - -@dataclass(frozen=True) -class Received(StardewRule): - item: str - player: int - count: int - - def __post_init__(self): - assert item_table[self.item].classification & ItemClassification.progression, \ - f"Item [{item_table[self.item].name}] has to be progression to be used in logic" - - def __call__(self, state: CollectionState) -> bool: - return state.has(self.item, self.player, self.count) - - def __repr__(self): - if self.count == 1: - return f"Received {self.item}" - return f"Received {self.count} {self.item}" - - def get_difficulty(self): - if self.item == "Spring": - return 0 - if self.item == "Summer": - return 1 - if self.item == "Fall": - return 2 - if self.item == "Winter": - return 3 - return self.count - - -@dataclass(frozen=True) -class Reach(StardewRule): - spot: str - resolution_hint: str - player: int - - def __call__(self, state: CollectionState) -> bool: - return state.can_reach(self.spot, self.resolution_hint, self.player) - - def __repr__(self): - return f"Reach {self.resolution_hint} {self.spot}" - - def get_difficulty(self): - return 1 - - -@dataclass(frozen=True) -class Has(StardewRule): - item: str - # For sure there is a better way than just passing all the rules everytime - other_rules: Dict[str, StardewRule] - - def __call__(self, state: CollectionState) -> bool: - if isinstance(self.item, str): - return self.other_rules[self.item](state) - - def __repr__(self): - if not self.item in self.other_rules: - return f"Has {self.item} -> {MISSING_ITEM}" - return f"Has {self.item} -> {repr(self.other_rules[self.item])}" - - def get_difficulty(self): - return self.other_rules[self.item].get_difficulty() + 1 - - def __hash__(self): - return hash(self.item) - - def simplify(self) -> StardewRule: - return self.other_rules[self.item].simplify() diff --git a/worlds/stardew_valley/stardew_rule/__init__.py b/worlds/stardew_valley/stardew_rule/__init__.py new file mode 100644 index 000000000000..73b2d1b66747 --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/__init__.py @@ -0,0 +1,4 @@ +from .base import * +from .literal import * +from .protocol import * +from .state import * diff --git a/worlds/stardew_valley/stardew_rule/base.py b/worlds/stardew_valley/stardew_rule/base.py new file mode 100644 index 000000000000..007d2b64dc41 --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/base.py @@ -0,0 +1,448 @@ +from __future__ import annotations + +from abc import ABC, abstractmethod +from collections import deque +from functools import cached_property +from itertools import chain +from threading import Lock +from typing import Iterable, Dict, List, Union, Sized, Hashable, Callable, Tuple, Set, Optional + +from BaseClasses import CollectionState +from .literal import true_, false_, LiteralStardewRule +from .protocol import StardewRule + +MISSING_ITEM = "THIS ITEM IS MISSING" + + +class BaseStardewRule(StardewRule, ABC): + + def __or__(self, other) -> StardewRule: + if other is true_ or other is false_ or type(other) is Or: + return other | self + + return Or(self, other) + + def __and__(self, other) -> StardewRule: + if other is true_ or other is false_ or type(other) is And: + return other & self + + return And(self, other) + + +class CombinableStardewRule(BaseStardewRule, ABC): + + @property + @abstractmethod + def combination_key(self) -> Hashable: + raise NotImplementedError + + @property + @abstractmethod + def value(self): + raise NotImplementedError + + def is_same_rule(self, other: CombinableStardewRule): + return self.combination_key == other.combination_key + + def add_into(self, rules: Dict[Hashable, CombinableStardewRule], reducer: Callable[[CombinableStardewRule, CombinableStardewRule], CombinableStardewRule]) \ + -> Dict[Hashable, CombinableStardewRule]: + rules = dict(rules) + + if self.combination_key in rules: + rules[self.combination_key] = reducer(self, rules[self.combination_key]) + else: + rules[self.combination_key] = self + + return rules + + def __and__(self, other): + if isinstance(other, CombinableStardewRule) and self.is_same_rule(other): + return And.combine(self, other) + return super().__and__(other) + + def __or__(self, other): + if isinstance(other, CombinableStardewRule) and self.is_same_rule(other): + return Or.combine(self, other) + return super().__or__(other) + + +class _SimplificationState: + original_simplifiable_rules: Tuple[StardewRule, ...] + + rules_to_simplify: deque[StardewRule] + simplified_rules: Set[StardewRule] + lock: Lock + + def __init__(self, simplifiable_rules: Tuple[StardewRule, ...], rules_to_simplify: Optional[deque[StardewRule]] = None, + simplified_rules: Optional[Set[StardewRule]] = None): + if simplified_rules is None: + simplified_rules = set() + + self.original_simplifiable_rules = simplifiable_rules + self.rules_to_simplify = rules_to_simplify + self.simplified_rules = simplified_rules + self.locked = False + + @property + def is_simplified(self): + return self.rules_to_simplify is not None and not self.rules_to_simplify + + def short_circuit(self, complement: LiteralStardewRule): + self.rules_to_simplify = deque() + self.simplified_rules = {complement} + + def try_popleft(self): + try: + self.rules_to_simplify.popleft() + except IndexError: + pass + + def acquire_copy(self): + state = _SimplificationState(self.original_simplifiable_rules, self.rules_to_simplify.copy(), self.simplified_rules.copy()) + state.acquire() + return state + + def merge(self, other: _SimplificationState): + return _SimplificationState(self.original_simplifiable_rules + other.original_simplifiable_rules) + + def add(self, rule: StardewRule): + return _SimplificationState(self.original_simplifiable_rules + (rule,)) + + def acquire(self): + """ + This just set a boolean to True and is absolutely not thread safe. It just works because AP is single-threaded. + """ + if self.locked is True: + return False + + self.locked = True + return True + + def release(self): + assert self.locked + self.locked = False + + +class AggregatingStardewRule(BaseStardewRule, ABC): + """ + Logic for both "And" and "Or" rules. + """ + identity: LiteralStardewRule + complement: LiteralStardewRule + symbol: str + + combinable_rules: Dict[Hashable, CombinableStardewRule] + simplification_state: _SimplificationState + _last_short_circuiting_rule: Optional[StardewRule] = None + + def __init__(self, *rules: StardewRule, _combinable_rules=None, _simplification_state=None): + if _combinable_rules is None: + assert rules, f"Can't create an aggregating condition without rules" + rules, _combinable_rules = self.split_rules(rules) + _simplification_state = _SimplificationState(rules) + + self.combinable_rules = _combinable_rules + self.simplification_state = _simplification_state + + @property + def original_rules(self): + return RepeatableChain(self.combinable_rules.values(), self.simplification_state.original_simplifiable_rules) + + @property + def current_rules(self): + if self.simplification_state.rules_to_simplify is None: + return self.original_rules + + return RepeatableChain(self.combinable_rules.values(), self.simplification_state.simplified_rules, self.simplification_state.rules_to_simplify) + + @classmethod + def split_rules(cls, rules: Union[Iterable[StardewRule]]) -> Tuple[Tuple[StardewRule, ...], Dict[Hashable, CombinableStardewRule]]: + other_rules = [] + reduced_rules = {} + for rule in rules: + if isinstance(rule, CombinableStardewRule): + key = rule.combination_key + if key not in reduced_rules: + reduced_rules[key] = rule + continue + + reduced_rules[key] = cls.combine(reduced_rules[key], rule) + continue + + if type(rule) is cls: + other_rules.extend(rule.simplification_state.original_simplifiable_rules) # noqa + reduced_rules = cls.merge(reduced_rules, rule.combinable_rules) # noqa + continue + + other_rules.append(rule) + + return tuple(other_rules), reduced_rules + + @classmethod + def merge(cls, left: Dict[Hashable, CombinableStardewRule], right: Dict[Hashable, CombinableStardewRule]) -> Dict[Hashable, CombinableStardewRule]: + reduced_rules = dict(left) + for key, rule in right.items(): + if key not in reduced_rules: + reduced_rules[key] = rule + continue + + reduced_rules[key] = cls.combine(reduced_rules[key], rule) + + return reduced_rules + + @staticmethod + @abstractmethod + def combine(left: CombinableStardewRule, right: CombinableStardewRule) -> CombinableStardewRule: + raise NotImplementedError + + def short_circuit_simplification(self): + self.simplification_state.short_circuit(self.complement) + self.combinable_rules = {} + return self.complement, self.complement.value + + def short_circuit_evaluation(self, rule): + self._last_short_circuiting_rule = rule + return self, self.complement.value + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + """ + The global idea here is the same as short-circuiting operators, applied to evaluation and rule simplification. + """ + + # Directly checking last rule that short-circuited, in case state has not changed. + if self._last_short_circuiting_rule: + if self._last_short_circuiting_rule(state) is self.complement.value: + return self.short_circuit_evaluation(self._last_short_circuiting_rule) + self._last_short_circuiting_rule = None + + # Combinable rules are considered already simplified, so we evaluate them right away to go faster. + for rule in self.combinable_rules.values(): + if rule(state) is self.complement.value: + return self.short_circuit_evaluation(rule) + + if self.simplification_state.is_simplified: + # The rule is fully simplified, so now we can only evaluate. + for rule in self.simplification_state.simplified_rules: + if rule(state) is self.complement.value: + return self.short_circuit_evaluation(rule) + return self, self.identity.value + + return self.evaluate_while_simplifying_stateful(state) + + def evaluate_while_simplifying_stateful(self, state): + local_state = self.simplification_state + try: + # Creating a new copy, so we don't modify the rules while we're already evaluating it. This can happen if a rule is used for an entrance and a + # location. When evaluating a given rule what requires access to a region, the region cache can get an update. If it does, we could enter this rule + # again. Since the simplification is stateful, the set of simplified rules can be modified while it's being iterated on, and cause a crash. + # + # After investigation, for millions of call to this method, copy were acquired 425 times. + # Merging simplification state in parent call was deemed useless. + if not local_state.acquire(): + local_state = local_state.acquire_copy() + self.simplification_state = local_state + + # Evaluating what has already been simplified. First it will be faster than simplifying "new" rules, but we also assume that if we reach this point + # and there are already are simplified rule, one of these rules has short-circuited, and might again, so we can leave early. + for rule in local_state.simplified_rules: + if rule(state) is self.complement.value: + return self.short_circuit_evaluation(rule) + + # If the queue is None, it means we have not start simplifying. Otherwise, we will continue simplification where we left. + if local_state.rules_to_simplify is None: + rules_to_simplify = frozenset(local_state.original_simplifiable_rules) + if self.complement in rules_to_simplify: + return self.short_circuit_simplification() + local_state.rules_to_simplify = deque(rules_to_simplify) + + # Start simplification where we left. + while local_state.rules_to_simplify: + result = self.evaluate_rule_while_simplifying_stateful(local_state, state) + local_state.try_popleft() + if result is not None: + return result + + # The whole rule has been simplified and evaluated without short-circuit. + return self, self.identity.value + finally: + local_state.release() + + def evaluate_rule_while_simplifying_stateful(self, local_state, state): + simplified, value = local_state.rules_to_simplify[0].evaluate_while_simplifying(state) + + # Identity is removed from the resulting simplification since it does not affect the result. + if simplified is self.identity: + return + + # If we find a complement here, we know the rule will always short-circuit, what ever the state. + if simplified is self.complement: + return self.short_circuit_simplification() + # Keep the simplified rule to be reevaluated later. + local_state.simplified_rules.add(simplified) + + # Now we use the value to short-circuit if it is the complement. + if value is self.complement.value: + return self.short_circuit_evaluation(simplified) + + def __str__(self): + return f"({self.symbol.join(str(rule) for rule in self.original_rules)})" + + def __repr__(self): + return f"({self.symbol.join(repr(rule) for rule in self.original_rules)})" + + def __eq__(self, other): + return (isinstance(other, type(self)) and self.combinable_rules == other.combinable_rules and + self.simplification_state.original_simplifiable_rules == self.simplification_state.original_simplifiable_rules) + + def __hash__(self): + return hash((id(self.combinable_rules), self.simplification_state.original_simplifiable_rules)) + + +class Or(AggregatingStardewRule): + identity = false_ + complement = true_ + symbol = " | " + + def __call__(self, state: CollectionState) -> bool: + return self.evaluate_while_simplifying(state)[1] + + def __or__(self, other): + if other is true_ or other is false_: + return other | self + + if isinstance(other, CombinableStardewRule): + return Or(_combinable_rules=other.add_into(self.combinable_rules, self.combine), _simplification_state=self.simplification_state) + + if type(other) is Or: + return Or(_combinable_rules=self.merge(self.combinable_rules, other.combinable_rules), + _simplification_state=self.simplification_state.merge(other.simplification_state)) + + return Or(_combinable_rules=self.combinable_rules, _simplification_state=self.simplification_state.add(other)) + + @staticmethod + def combine(left: CombinableStardewRule, right: CombinableStardewRule) -> CombinableStardewRule: + return min(left, right, key=lambda x: x.value) + + def get_difficulty(self): + return min(rule.get_difficulty() for rule in self.original_rules) + + +class And(AggregatingStardewRule): + identity = true_ + complement = false_ + symbol = " & " + + def __call__(self, state: CollectionState) -> bool: + return self.evaluate_while_simplifying(state)[1] + + def __and__(self, other): + if other is true_ or other is false_: + return other & self + + if isinstance(other, CombinableStardewRule): + return And(_combinable_rules=other.add_into(self.combinable_rules, self.combine), _simplification_state=self.simplification_state) + + if type(other) is And: + return And(_combinable_rules=self.merge(self.combinable_rules, other.combinable_rules), + _simplification_state=self.simplification_state.merge(other.simplification_state)) + + return And(_combinable_rules=self.combinable_rules, _simplification_state=self.simplification_state.add(other)) + + @staticmethod + def combine(left: CombinableStardewRule, right: CombinableStardewRule) -> CombinableStardewRule: + return max(left, right, key=lambda x: x.value) + + def get_difficulty(self): + return max(rule.get_difficulty() for rule in self.original_rules) + + +class Count(BaseStardewRule): + count: int + rules: List[StardewRule] + + def __init__(self, rules: List[StardewRule], count: int): + self.rules = rules + self.count = count + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + c = 0 + for i in range(self.rules_count): + self.rules[i], value = self.rules[i].evaluate_while_simplifying(state) + if value: + c += 1 + + if c >= self.count: + return self, True + if c + self.rules_count - i < self.count: + break + + return self, False + + def __call__(self, state: CollectionState) -> bool: + return self.evaluate_while_simplifying(state)[1] + + @cached_property + def rules_count(self): + return len(self.rules) + + def get_difficulty(self): + self.rules = sorted(self.rules, key=lambda x: x.get_difficulty()) + # In an optimal situation, all the simplest rules will be true. Since the rules are sorted, we know that the most difficult rule we might have to do + # is the one at the "self.count". + return self.rules[self.count - 1].get_difficulty() + + def __repr__(self): + return f"Received {self.count} {repr(self.rules)}" + + +class Has(BaseStardewRule): + item: str + # For sure there is a better way than just passing all the rules everytime + other_rules: Dict[str, StardewRule] + + def __init__(self, item: str, other_rules: Dict[str, StardewRule]): + self.item = item + self.other_rules = other_rules + + def __call__(self, state: CollectionState) -> bool: + return self.evaluate_while_simplifying(state)[1] + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self.other_rules[self.item].evaluate_while_simplifying(state) + + def get_difficulty(self): + return self.other_rules[self.item].get_difficulty() + 1 + + def __str__(self): + if self.item not in self.other_rules: + return f"Has {self.item} -> {MISSING_ITEM}" + return f"Has {self.item}" + + def __repr__(self): + if self.item not in self.other_rules: + return f"Has {self.item} -> {MISSING_ITEM}" + return f"Has {self.item} -> {repr(self.other_rules[self.item])}" + + def __hash__(self): + return hash(self.item) + + +class RepeatableChain(Iterable, Sized): + """ + Essentially a copy of what's in the core, with proper type hinting + """ + + def __init__(self, *iterable: Union[Iterable, Sized]): + self.iterables = iterable + + def __iter__(self): + return chain.from_iterable(self.iterables) + + def __bool__(self): + return any(sub_iterable for sub_iterable in self.iterables) + + def __len__(self): + return sum(len(iterable) for iterable in self.iterables) + + def __contains__(self, item): + return any(item in it for it in self.iterables) diff --git a/worlds/stardew_valley/stardew_rule/indirect_connection.py b/worlds/stardew_valley/stardew_rule/indirect_connection.py new file mode 100644 index 000000000000..2bbddb16818f --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/indirect_connection.py @@ -0,0 +1,39 @@ +from functools import singledispatch +from typing import Set + +from . import StardewRule, Reach, Count, AggregatingStardewRule, Has + + +def look_for_indirect_connection(rule: StardewRule) -> Set[str]: + required_regions = set() + _find(rule, required_regions) + return required_regions + + +@singledispatch +def _find(rule: StardewRule, regions: Set[str]): + ... + + +@_find.register +def _(rule: AggregatingStardewRule, regions: Set[str]): + for r in rule.original_rules: + _find(r, regions) + + +@_find.register +def _(rule: Count, regions: Set[str]): + for r in rule.rules: + _find(r, regions) + + +@_find.register +def _(rule: Has, regions: Set[str]): + r = rule.other_rules[rule.item] + _find(r, regions) + + +@_find.register +def _(rule: Reach, regions: Set[str]): + if rule.resolution_hint == "Region": + regions.add(rule.spot) diff --git a/worlds/stardew_valley/stardew_rule/literal.py b/worlds/stardew_valley/stardew_rule/literal.py new file mode 100644 index 000000000000..58f7bae047fa --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/literal.py @@ -0,0 +1,62 @@ +from abc import ABC +from typing import Tuple + +from BaseClasses import CollectionState +from .protocol import StardewRule + + +class LiteralStardewRule(StardewRule, ABC): + value: bool + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self, self.value + + def __call__(self, state: CollectionState) -> bool: + return self.value + + def __repr__(self): + return str(self.value) + + +class True_(LiteralStardewRule): # noqa + value = True + + def __new__(cls, _cache=[]): # noqa + # Only one single instance will be ever created. + if not _cache: + _cache.append(super(True_, cls).__new__(cls)) + return _cache[0] + + def __or__(self, other) -> StardewRule: + return self + + def __and__(self, other) -> StardewRule: + return other + + def get_difficulty(self): + return 0 + + +class False_(LiteralStardewRule): # noqa + value = False + + def __new__(cls, _cache=[]): # noqa + # Only one single instance will be ever created. + if not _cache: + _cache.append(super(False_, cls).__new__(cls)) + return _cache[0] + + def __or__(self, other) -> StardewRule: + return other + + def __and__(self, other) -> StardewRule: + return self + + def get_difficulty(self): + return 999999999 + + +false_ = False_() +true_ = True_() +assert false_ +assert true_ diff --git a/worlds/stardew_valley/stardew_rule/protocol.py b/worlds/stardew_valley/stardew_rule/protocol.py new file mode 100644 index 000000000000..c20394d5b826 --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/protocol.py @@ -0,0 +1,30 @@ +from __future__ import annotations + +from abc import abstractmethod +from typing import Protocol, Tuple, runtime_checkable + +from BaseClasses import CollectionState + + +@runtime_checkable +class StardewRule(Protocol): + + @abstractmethod + def __call__(self, state: CollectionState) -> bool: + ... + + @abstractmethod + def __and__(self, other: StardewRule): + ... + + @abstractmethod + def __or__(self, other: StardewRule): + ... + + @abstractmethod + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + ... + + @abstractmethod + def get_difficulty(self): + ... diff --git a/worlds/stardew_valley/stardew_rule/state.py b/worlds/stardew_valley/stardew_rule/state.py new file mode 100644 index 000000000000..a0fce7c7c19e --- /dev/null +++ b/worlds/stardew_valley/stardew_rule/state.py @@ -0,0 +1,140 @@ +from dataclasses import dataclass +from typing import Iterable, Union, List, Tuple, Hashable + +from BaseClasses import ItemClassification, CollectionState +from .base import BaseStardewRule, CombinableStardewRule +from .protocol import StardewRule +from ..items import item_table + + +class TotalReceived(BaseStardewRule): + count: int + items: Iterable[str] + player: int + + def __init__(self, count: int, items: Union[str, Iterable[str]], player: int): + items_list: List[str] + + if isinstance(items, Iterable): + items_list = [*items] + else: + items_list = [items] + + assert items_list, "Can't create a Total Received conditions without items" + for item in items_list: + assert item_table[item].classification & ItemClassification.progression, \ + f"Item [{item_table[item].name}] has to be progression to be used in logic" + + self.player = player + self.items = items_list + self.count = count + + def __call__(self, state: CollectionState) -> bool: + c = 0 + for item in self.items: + c += state.count(item, self.player) + if c >= self.count: + return True + return False + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self, self(state) + + def get_difficulty(self): + return self.count + + def __repr__(self): + return f"Received {self.count} {self.items}" + + +@dataclass(frozen=True) +class Received(CombinableStardewRule): + item: str + player: int + count: int + + def __post_init__(self): + assert item_table[self.item].classification & ItemClassification.progression, \ + f"Item [{item_table[self.item].name}] has to be progression to be used in logic" + + @property + def combination_key(self) -> Hashable: + return self.item + + @property + def value(self): + return self.count + + def __call__(self, state: CollectionState) -> bool: + return state.has(self.item, self.player, self.count) + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self, self(state) + + def __repr__(self): + if self.count == 1: + return f"Received {self.item}" + return f"Received {self.count} {self.item}" + + def get_difficulty(self): + return self.count + + +@dataclass(frozen=True) +class Reach(BaseStardewRule): + spot: str + resolution_hint: str + player: int + + def __call__(self, state: CollectionState) -> bool: + if self.resolution_hint == 'Region' and self.spot not in state.multiworld.regions.region_cache[self.player]: + return False + return state.can_reach(self.spot, self.resolution_hint, self.player) + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self, self(state) + + def __repr__(self): + return f"Reach {self.resolution_hint} {self.spot}" + + def get_difficulty(self): + return 1 + + +@dataclass(frozen=True) +class HasProgressionPercent(CombinableStardewRule): + player: int + percent: int + + def __post_init__(self): + assert self.percent > 0, "HasProgressionPercent rule must be above 0%" + assert self.percent <= 100, "HasProgressionPercent rule can't require more than 100% of items" + + @property + def combination_key(self) -> Hashable: + return HasProgressionPercent.__name__ + + @property + def value(self): + return self.percent + + def __call__(self, state: CollectionState) -> bool: + stardew_world = state.multiworld.worlds[self.player] + total_count = stardew_world.total_progression_items + needed_count = (total_count * self.percent) // 100 + total_count = 0 + for item in state.prog_items[self.player]: + item_count = state.prog_items[self.player][item] + total_count += item_count + if total_count >= needed_count: + return True + return False + + def evaluate_while_simplifying(self, state: CollectionState) -> Tuple[StardewRule, bool]: + return self, self(state) + + def __repr__(self): + return f"HasProgressionPercent {self.percent}" + + def get_difficulty(self): + return self.percent diff --git a/worlds/stardew_valley/strings/animal_product_names.py b/worlds/stardew_valley/strings/animal_product_names.py index 6656e70e580d..f89b610ae89d 100644 --- a/worlds/stardew_valley/strings/animal_product_names.py +++ b/worlds/stardew_valley/strings/animal_product_names.py @@ -1,24 +1,30 @@ class AnimalProduct: any_egg = "Any Egg" - chicken_egg = "Chicken Egg" - egg = "Egg" brown_egg = "Egg (Brown)" - large_egg = "Large Egg" - large_brown_egg = "Large Egg (Brown)" - milk = "Milk" - large_milk = "Large Milk" + chicken_egg = "Chicken Egg" cow_milk = "Cow Milk" - wool = "Wool" - goat_milk = "Goat Milk" - large_goat_milk = "Large Goat Milk" + dinosaur_egg = "Dinosaur Egg" duck_egg = "Duck Egg" duck_feather = "Duck Feather" - void_egg = "Void Egg" - truffle = "Truffle" + egg = "Egg" + goat_milk = "Goat Milk" + golden_egg = "Golden Egg" + large_brown_egg = "Large Egg (Brown)" + large_egg = "Large Egg" + large_goat_milk = "Large Goat Milk" + large_milk = "Large Milk" + milk = "Milk" + ostrich_egg = "Ostrich Egg" rabbit_foot = "Rabbit's Foot" roe = "Roe" - sturgeon_roe = "Sturgeon Roe" - ostrich_egg = "Ostrich Egg" - dinosaur_egg = "Dinosaur Egg" + slime_egg_blue = "Blue Slime Egg" + slime_egg_green = "Green Slime Egg" + slime_egg_purple = "Purple Slime Egg" + slime_egg_red = "Red Slime Egg" + slime_egg_tiger = "Tiger Slime Egg" squid_ink = "Squid Ink" + sturgeon_roe = "Sturgeon Roe" + truffle = "Truffle" + void_egg = "Void Egg" + wool = "Wool" diff --git a/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py b/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py new file mode 100644 index 000000000000..7fcd6873761c --- /dev/null +++ b/worlds/stardew_valley/strings/ap_names/ap_weapon_names.py @@ -0,0 +1,7 @@ +class APWeapon: + weapon = "Progressive Weapon" + sword = "Progressive Sword" + club = "Progressive Club" + dagger = "Progressive Dagger" + slingshot = "Progressive Slingshot" + footwear = "Progressive Footwear" diff --git a/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py b/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py new file mode 100644 index 000000000000..68dad8e75287 --- /dev/null +++ b/worlds/stardew_valley/strings/ap_names/community_upgrade_names.py @@ -0,0 +1,4 @@ +class CommunityUpgrade: + fruit_bats = "Fruit Bats" + mushroom_boxes = "Mushroom Boxes" + movie_theater = "Progressive Movie Theater" diff --git a/worlds/stardew_valley/strings/ap_names/event_names.py b/worlds/stardew_valley/strings/ap_names/event_names.py new file mode 100644 index 000000000000..08b9d8f8131c --- /dev/null +++ b/worlds/stardew_valley/strings/ap_names/event_names.py @@ -0,0 +1,6 @@ +class Event: + victory = "Victory" + can_construct_buildings = "Can Construct Buildings" + start_dark_talisman_quest = "Start Dark Talisman Quest" + can_ship_items = "Can Ship Items" + can_shop_at_pierre = "Can Shop At Pierre's" diff --git a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py new file mode 100644 index 000000000000..ccc2765544a6 --- /dev/null +++ b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py @@ -0,0 +1,50 @@ +from typing import List + + +class DeepWoodsItem: + pendant_community = "Pendant of Community" + pendant_elder = "Pendant of Elders" + pendant_depths = "Pendant of Depths" + obelisk_sigil = "Progressive Woods Obelisk Sigils" + + +class SkillLevel: + luck = "Luck Level" + archaeology = "Archaeology Level" + + +class SVEQuestItem: + aurora_vineyard_tablet = "Aurora Vineyard Tablet" + iridium_bomb = "Iridium Bomb" + void_soul = "Void Spirit Peace Agreement" + kittyfish_spell = "Kittyfish Spell" + scarlett_job_offer = "Scarlett's Job Offer" + morgan_schooling = "Morgan's Schooling" + diamond_wand = "Diamond Wand" + marlon_boat_paddle = "Marlon's Boat Paddle" + fable_reef_portal = "Fable Reef Portal" + grandpa_shed = "Grandpa's Shed" + + sve_quest_items: List[str] = [aurora_vineyard_tablet, iridium_bomb, void_soul, kittyfish_spell, scarlett_job_offer, morgan_schooling, grandpa_shed] + sve_quest_items_ginger_island: List[str] = [marlon_boat_paddle, fable_reef_portal] + + +class SVELocation: + tempered_galaxy_sword = "Tempered Galaxy Sword" + tempered_galaxy_hammer = "Tempered Galaxy Hammer" + tempered_galaxy_dagger = "Tempered Galaxy Dagger" + diamond_wand = "Lance's Diamond Wand" + monster_crops = "Monster Crops" + + +class SVERunes: + nexus_guild = "Nexus: Adventurer's Guild Runes" + nexus_junimo = "Nexus: Junimo Woods Runes" + nexus_outpost = "Nexus: Outpost Runes" + nexus_aurora = "Nexus: Aurora Vineyard Runes" + nexus_spring = "Nexus: Sprite Spring Runes" + nexus_farm = "Nexus: Farm Runes" + nexus_wizard = "Nexus: Wizard Runes" + + nexus_items: List[str] = [nexus_farm, nexus_wizard, nexus_spring, nexus_aurora, nexus_guild, nexus_junimo, nexus_outpost] + diff --git a/worlds/stardew_valley/strings/artisan_good_names.py b/worlds/stardew_valley/strings/artisan_good_names.py index 469644d95fd3..a017cff1f9dd 100644 --- a/worlds/stardew_valley/strings/artisan_good_names.py +++ b/worlds/stardew_valley/strings/artisan_good_names.py @@ -21,3 +21,7 @@ class ArtisanGood: caviar = "Caviar" green_tea = "Green Tea" mead = "Mead" + + +class ModArtisanGood: + pterodactyl_egg = "Pterodactyl Egg" diff --git a/worlds/stardew_valley/strings/bundle_names.py b/worlds/stardew_valley/strings/bundle_names.py new file mode 100644 index 000000000000..de8d8af3877f --- /dev/null +++ b/worlds/stardew_valley/strings/bundle_names.py @@ -0,0 +1,80 @@ +class CCRoom: + pantry = "Pantry" + crafts_room = "Crafts Room" + fish_tank = "Fish Tank" + bulletin_board = "Bulletin Board" + vault = "Vault" + boiler_room = "Boiler Room" + abandoned_joja_mart = "Abandoned Joja Mart" + + +class BundleName: + spring_foraging = "Spring Foraging Bundle" + summer_foraging = "Summer Foraging Bundle" + fall_foraging = "Fall Foraging Bundle" + winter_foraging = "Winter Foraging Bundle" + construction = "Construction Bundle" + exotic_foraging = "Exotic Foraging Bundle" + beach_foraging = "Beach Foraging Bundle" + mines_foraging = "Mines Foraging Bundle" + desert_foraging = "Desert Foraging Bundle" + island_foraging = "Island Foraging Bundle" + sticky = "Sticky Bundle" + wild_medicine = "Wild Medicine Bundle" + quality_foraging = "Quality Foraging Bundle" + spring_crops = "Spring Crops Bundle" + summer_crops = "Summer Crops Bundle" + fall_crops = "Fall Crops Bundle" + quality_crops = "Quality Crops Bundle" + animal = "Animal Bundle" + artisan = "Artisan Bundle" + rare_crops = "Rare Crops Bundle" + fish_farmer = "Fish Farmer's Bundle" + garden = "Garden Bundle" + brewer = "Brewer's Bundle" + orchard = "Orchard Bundle" + island_crops = "Island Crops Bundle" + agronomist = "Agronomist's Bundle" + slime_farmer = "Slime Farmer Bundle" + river_fish = "River Fish Bundle" + lake_fish = "Lake Fish Bundle" + ocean_fish = "Ocean Fish Bundle" + night_fish = "Night Fishing Bundle" + crab_pot = "Crab Pot Bundle" + trash = "Trash Bundle" + recycling = "Recycling Bundle" + specialty_fish = "Specialty Fish Bundle" + spring_fish = "Spring Fishing Bundle" + summer_fish = "Summer Fishing Bundle" + fall_fish = "Fall Fishing Bundle" + winter_fish = "Winter Fishing Bundle" + rain_fish = "Rain Fishing Bundle" + quality_fish = "Quality Fish Bundle" + master_fisher = "Master Fisher's Bundle" + legendary_fish = "Legendary Fish Bundle" + island_fish = "Island Fish Bundle" + deep_fishing = "Deep Fishing Bundle" + tackle = "Tackle Bundle" + bait = "Master Baiter Bundle" + blacksmith = "Blacksmith's Bundle" + geologist = "Geologist's Bundle" + adventurer = "Adventurer's Bundle" + treasure_hunter = "Treasure Hunter's Bundle" + engineer = "Engineer's Bundle" + demolition = "Demolition Bundle" + paleontologist = "Paleontologist's Bundle" + archaeologist = "Archaeologist's Bundle" + chef = "Chef's Bundle" + dye = "Dye Bundle" + field_research = "Field Research Bundle" + fodder = "Fodder Bundle" + enchanter = "Enchanter's Bundle" + children = "Children's Bundle" + forager = "Forager's Bundle" + home_cook = "Home Cook's Bundle" + bartender = "Bartender's Bundle" + gambler = "Gambler's Bundle" + carnival = "Carnival Bundle" + walnut_hunter = "Walnut Hunter Bundle" + qi_helper = "Qi's Helper Bundle" + missing_bundle = "The Missing Bundle" diff --git a/worlds/stardew_valley/strings/craftable_names.py b/worlds/stardew_valley/strings/craftable_names.py index a1ee15b12fde..74a77a8e9467 100644 --- a/worlds/stardew_valley/strings/craftable_names.py +++ b/worlds/stardew_valley/strings/craftable_names.py @@ -1,16 +1,185 @@ -class Craftable: - bait = "Bait" +class Bomb: cherry_bomb = "Cherry Bomb" bomb = "Bomb" mega_bomb = "Mega Bomb" - staircase = "Staircase" - scarecrow = "Scarecrow" - rain_totem = "Rain Totem" - flute_block = "Flute Block" + + +class Fence: + gate = "Gate" + wood = "Wood Fence" + stone = "Stone Fence" + iron = "Iron Fence" + hardwood = "Hardwood Fence" + + +class Sprinkler: + basic = "Sprinkler" + quality = "Quality Sprinkler" + iridium = "Iridium Sprinkler" + + +class WildSeeds: + spring = "Spring Seeds" + summer = "Summer Seeds" + fall = "Fall Seeds" + winter = "Winter Seeds" + ancient = "Ancient Seeds" + grass_starter = "Grass Starter" + tea_sapling = "Tea Sapling" + fiber = "Fiber Seeds" + + +class Floor: + wood = "Wood Floor" + rustic = "Rustic Plank Floor" + straw = "Straw Floor" + weathered = "Weathered Floor" + crystal = "Crystal Floor" + stone = "Stone Floor" + stone_walkway = "Stone Walkway Floor" + brick = "Brick Floor" + wood_path = "Wood Path" + gravel_path = "Gravel Path" + cobblestone_path = "Cobblestone Path" + stepping_stone_path = "Stepping Stone Path" + crystal_path = "Crystal Path" + + +class Fishing: + spinner = "Spinner" + trap_bobber = "Trap Bobber" + cork_bobber = "Cork Bobber" + quality_bobber = "Quality Bobber" + treasure_hunter = "Treasure Hunter" + dressed_spinner = "Dressed Spinner" + barbed_hook = "Barbed Hook" + magnet = "Magnet" + bait = "Bait" + wild_bait = "Wild Bait" + magic_bait = "Magic Bait" + lead_bobber = "Lead Bobber" + curiosity_lure = "Curiosity Lure" + + +class Ring: + hot_java_ring = "Hot Java Ring" + sturdy_ring = "Sturdy Ring" + warrior_ring = "Warrior Ring" + ring_of_yoba = "Ring of Yoba" + thorns_ring = "Thorns Ring" + glowstone_ring = "Glowstone Ring" + iridium_band = "Iridium Band" + wedding_ring = "Wedding Ring" + + +class Edible: + field_snack = "Field Snack" + bug_steak = "Bug Steak" life_elixir = "Life Elixir" - monster_musk = "Monster Musk" oil_of_garlic = "Oil of Garlic" +class Consumable: + monster_musk = "Monster Musk" + fairy_dust = "Fairy Dust" + warp_totem_beach = "Warp Totem: Beach" + warp_totem_mountains = "Warp Totem: Mountains" + warp_totem_farm = "Warp Totem: Farm" + warp_totem_desert = "Warp Totem: Desert" + warp_totem_island = "Warp Totem: Island" + rain_totem = "Rain Totem" + + +class Lighting: + torch = "Torch" + campfire = "Campfire" + wooden_brazier = "Wooden Brazier" + stone_brazier = "Stone Brazier" + gold_brazier = "Gold Brazier" + carved_brazier = "Carved Brazier" + stump_brazier = "Stump Brazier" + barrel_brazier = "Barrel Brazier" + skull_brazier = "Skull Brazier" + marble_brazier = "Marble Brazier" + wood_lamp_post = "Wood Lamp-post" + iron_lamp_post = "Iron Lamp-post" + jack_o_lantern = "Jack-O-Lantern" + + +class Furniture: + tub_o_flowers = "Tub o' Flowers" + wicked_statue = "Wicked Statue" + flute_block = "Flute Block" + drum_block = "Drum Block" + + +class Storage: + chest = "Chest" + stone_chest = "Stone Chest" + + +class Sign: + wood = "Wood Sign" + stone = "Stone Sign" + dark = "Dark Sign" + + +class Craftable: + garden_pot = "Garden Pot" + scarecrow = "Scarecrow" + deluxe_scarecrow = "Deluxe Scarecrow" + staircase = "Staircase" + explosive_ammo = "Explosive Ammo" + transmute_fe = "Transmute (Fe)" + transmute_au = "Transmute (Au)" + mini_jukebox = "Mini-Jukebox" + mini_obelisk = "Mini-Obelisk" + farm_computer = "Farm Computer" + hopper = "Hopper" + cookout_kit = "Cookout Kit" + + +class ModEdible: + magic_elixir = "Magic Elixir" + aegis_elixir = "Aegis Elixir" + armor_elixir = "Armor Elixir" + barbarian_elixir = "Barbarian Elixir" + lightning_elixir = "Lightning Elixir" + gravity_elixir = "Gravity Elixir" + hero_elixir = "Hero Elixir" + haste_elixir = "Haste Elixir" + + +class ModCraftable: + travel_core = "Travel Core" + glass_bazier = "Glass Bazier" + water_shifter = "Water Shifter" + glass_fence = "Glass Fence" + wooden_display = "Wooden Display" + hardwood_display = "Hardwood Display" + neanderthal_skeleton = "Neanderthal Skeleton" + pterodactyl_skeleton_l = "Pterodactyl Skeleton L" + pterodactyl_skeleton_m = "Pterodactyl Skeleton M" + pterodactyl_skeleton_r = "Pterodactyl Skeleton R" + trex_skeleton_l = "T-Rex Skeleton L" + trex_skeleton_m = "T-Rex Skeleton M" + trex_skeleton_r = "T-Rex Skeleton R" + + +class ModMachine: + preservation_chamber = "Preservation Chamber" + hardwood_preservation_chamber = "Hardwood Preservation Chamber" + grinder = "Grinder" + ancient_battery = "Ancient Battery Production Station" + + +class ModFloor: + glass_path = "Glass Path" + bone_path = "Bone Path" + + +class ModConsumable: + volcano_totem = "Dwarf Gadget: Infinite Volcano Simulation" + ginger_tincture = "Ginger Tincture" diff --git a/worlds/stardew_valley/strings/crop_names.py b/worlds/stardew_valley/strings/crop_names.py index 2b5ea4d32768..295e40005f75 100644 --- a/worlds/stardew_valley/strings/crop_names.py +++ b/worlds/stardew_valley/strings/crop_names.py @@ -13,6 +13,7 @@ def fruity(name: str) -> str: class Fruit: + sweet_gem_berry = fruity("Sweet Gem Berry") any = "Any Fruit" blueberry = fruity("Blueberry") melon = fruity("Melon") @@ -38,6 +39,7 @@ class Vegetable: any = "Any Vegetable" parsnip = veggie("Parsnip") garlic = veggie("Garlic") + bok_choy = "Bok Choy" wheat = "Wheat" potato = veggie("Potato") corn = veggie("Corn") @@ -57,3 +59,24 @@ class Vegetable: yam = veggie("Yam") radish = veggie("Radish") taro_root = veggie("Taro Root") + + +class SVEFruit: + slime_berry = "Slime Berry" + monster_fruit = "Monster Fruit" + salal_berry = "Salal Berry" + + +class SVEVegetable: + monster_mushroom = "Monster Mushroom" + void_root = "Void Root" + ancient_fiber = "Ancient Fiber" + + +class DistantLandsCrop: + void_mint = "Void Mint Leaves" + vile_ancient_fruit = "Vile Ancient Fruit" + + +all_vegetables = tuple(all_vegetables) +all_fruits = tuple(all_fruits) diff --git a/worlds/stardew_valley/strings/currency_names.py b/worlds/stardew_valley/strings/currency_names.py new file mode 100644 index 000000000000..5192466c9ca7 --- /dev/null +++ b/worlds/stardew_valley/strings/currency_names.py @@ -0,0 +1,13 @@ +class Currency: + qi_coin = "Qi Coin" + golden_walnut = "Golden Walnut" + qi_gem = "Qi Gem" + star_token = "Star Token" + money = "Money" + cinder_shard = "Cinder Shard" + + @staticmethod + def is_currency(item: str) -> bool: + return item in [Currency.qi_coin, Currency.golden_walnut, Currency.qi_gem, Currency.star_token, Currency.money] + + diff --git a/worlds/stardew_valley/strings/decoration_names.py b/worlds/stardew_valley/strings/decoration_names.py new file mode 100644 index 000000000000..150a106c6a20 --- /dev/null +++ b/worlds/stardew_valley/strings/decoration_names.py @@ -0,0 +1,2 @@ +class Decoration: + rotten_plant = "Rotten Plant" diff --git a/worlds/stardew_valley/strings/entrance_names.py b/worlds/stardew_valley/strings/entrance_names.py index e744400cfbd5..00823d62ea07 100644 --- a/worlds/stardew_valley/strings/entrance_names.py +++ b/worlds/stardew_valley/strings/entrance_names.py @@ -2,6 +2,10 @@ def dig_to_mines_floor(floor: int) -> str: return f"Dig to The Mines - Floor {floor}" +def dig_to_dangerous_mines_floor(floor: int) -> str: + return f"Dig to the Dangerous Mines - Floor {floor}" + + def dig_to_skull_floor(floor: int) -> str: return f"Mine to Skull Cavern Floor {floor}" @@ -22,6 +26,10 @@ class Entrance: farm_to_forest = "Farm to Forest" farm_to_farmcave = "Farm to Farmcave" enter_greenhouse = "Farm to Greenhouse" + enter_coop = "Farm to Coop" + enter_barn = "Farm to Barn" + enter_shed = "Farm to Shed" + enter_slime_hutch = "Farm to Slime Hutch" use_desert_obelisk = "Use Desert Obelisk" use_island_obelisk = "Use Island Obelisk" use_farm_obelisk = "Use Farm Obelisk" @@ -35,6 +43,13 @@ class Entrance: forest_to_leah_cottage = "Forest to Leah's Cottage" forest_to_sewer = "Forest to Sewer" buy_from_traveling_merchant = "Buy from Traveling Merchant" + buy_from_traveling_merchant_sunday = "Buy from Traveling Merchant Sunday" + buy_from_traveling_merchant_monday = "Buy from Traveling Merchant Monday" + buy_from_traveling_merchant_tuesday = "Buy from Traveling Merchant Tuesday" + buy_from_traveling_merchant_wednesday = "Buy from Traveling Merchant Wednesday" + buy_from_traveling_merchant_thursday = "Buy from Traveling Merchant Thursday" + buy_from_traveling_merchant_friday = "Buy from Traveling Merchant Friday" + buy_from_traveling_merchant_saturday = "Buy from Traveling Merchant Saturday" mountain_to_railroad = "Mountain to Railroad" mountain_to_tent = "Mountain to Tent" mountain_to_carpenter_shop = "Mountain to Carpenter Shop" @@ -63,6 +78,9 @@ class Entrance: town_to_clint_blacksmith = "Town to Clint's Blacksmith" town_to_museum = "Town to Museum" town_to_jojamart = "Town to JojaMart" + purchase_movie_ticket = "Purchase Movie Ticket" + enter_abandoned_jojamart = "Enter Abandoned Joja Mart" + enter_movie_theater = "Enter Movie Theater" beach_to_willy_fish_shop = "Beach to Willy's Fish Shop" fish_shop_to_boat_tunnel = "Fish Shop to Boat Tunnel" boat_to_ginger_island = "Take the Boat to Ginger Island" @@ -101,6 +119,7 @@ class Entrance: mine_to_skull_cavern_floor_150 = dig_to_skull_floor(150) mine_to_skull_cavern_floor_175 = dig_to_skull_floor(175) mine_to_skull_cavern_floor_200 = dig_to_skull_floor(200) + enter_dangerous_skull_cavern = "Enter the Dangerous Skull Cavern" talk_to_mines_dwarf = "Talk to Mines Dwarf" dig_to_mines_floor_5 = dig_to_mines_floor(5) dig_to_mines_floor_10 = dig_to_mines_floor(10) @@ -126,6 +145,9 @@ class Entrance: dig_to_mines_floor_110 = dig_to_mines_floor(110) dig_to_mines_floor_115 = dig_to_mines_floor(115) dig_to_mines_floor_120 = dig_to_mines_floor(120) + dig_to_dangerous_mines_20 = dig_to_dangerous_mines_floor(20) + dig_to_dangerous_mines_60 = dig_to_dangerous_mines_floor(60) + dig_to_dangerous_mines_100 = dig_to_dangerous_mines_floor(100) island_south_to_west = "Island South to West" island_south_to_north = "Island South to North" island_south_to_east = "Island South to East" @@ -161,6 +183,26 @@ class Entrance: parrot_express_jungle_to_docks = "Parrot Express Jungle to Docks" parrot_express_dig_site_to_docks = "Parrot Express Dig Site to Docks" parrot_express_volcano_to_docks = "Parrot Express Volcano to Docks" + farmhouse_cooking = "Farmhouse Cooking" + island_cooking = "Island Cooking" + shipping = "Use Shipping Bin" + watch_queen_of_sauce = "Watch Queen of Sauce" + blacksmith_copper = "Upgrade Copper Tools" + blacksmith_iron = "Upgrade Iron Tools" + blacksmith_gold = "Upgrade Gold Tools" + blacksmith_iridium = "Upgrade Iridium Tools" + farming = "Start Farming" + fishing = "Start Fishing" + attend_egg_festival = "Attend Egg Festival" + attend_flower_dance = "Attend Flower Dance" + attend_luau = "Attend Luau" + attend_moonlight_jellies = "Attend Dance of the Moonlight Jellies" + attend_fair = "Attend Stardew Valley Fair" + attend_spirit_eve = "Attend Spirit's Eve" + attend_festival_of_ice = "Attend Festival of Ice" + attend_night_market = "Attend Night Market" + attend_winter_star = "Attend Feast of the Winter Star" + # Skull Cavern Elevator @@ -215,3 +257,103 @@ class AyeishaEntrance: class RileyEntrance: town_to_riley = "Town to Riley's House" + +class SVEEntrance: + backwoods_to_grove = "Backwoods to Enchanted Grove" + grove_to_outpost_warp = "Enchanted Grove to Grove Outpost Warp" + outpost_warp_to_outpost = "Grove Outpost Warp to Galmoran Outpost" + grove_to_wizard_warp = "Enchanted Grove to Grove Wizard Warp" + wizard_warp_to_wizard = "Grove Wizard Warp to Wizard Basement" + grove_to_aurora_warp = "Enchanted Grove to Grove Aurora Vineyard Warp" + aurora_warp_to_aurora = "Grove Aurora Vineyard Warp to Aurora Vineyard Basement" + grove_to_farm_warp = "Enchanted Grove to Grove Farm Warp" + farm_warp_to_farm = "Grove Farm Warp to Farm" + grove_to_guild_warp = "Enchanted Grove to Grove Guild Warp" + guild_warp_to_guild = "Grove Guild Warp to Guild Summit" + grove_to_junimo_warp = "Enchanted Grove to Grove Junimo Woods Warp" + junimo_warp_to_junimo = "Grove Junimo Woods Warp to Junimo Woods" + grove_to_spring_warp = "Enchanted Grove to Grove Sprite Spring Warp" + spring_warp_to_spring = "Grove Sprite Spring Warp to Sprite Spring" + wizard_to_fable_reef = "Wizard Basement to Fable Reef" + bus_stop_to_shed = "Bus Stop to Grandpa's Shed" + grandpa_shed_to_interior = "Grandpa's Shed to Grandpa's Shed Interior" + grandpa_shed_to_town = "Grandpa's Shed to Town" + grandpa_interior_to_upstairs = "Grandpa's Shed Interior to Grandpa's Shed Upstairs" + forest_to_fairhaven = "Forest to Fairhaven Farm" + forest_to_west = "Forest to Forest West" + forest_to_lost_woods = "Forest to Lost Woods" + lost_woods_to_junimo_woods = "Lost Woods to Junimo Woods" + use_purple_junimo = "Talk to Purple Junimo" + forest_to_bmv = "Forest to Blue Moon Vineyard" + forest_to_marnie_shed = "Forest to Marnie's Shed" + town_to_bmv = "Town to Blue Moon Vineyard" + town_to_jenkins = "Town to Jenkins' Residence" + town_to_bridge = "Town to Shearwater Bridge" + town_to_plot = "Town to Unclaimed Plot" + bmv_to_sophia = "Blue Moon Vineyard to Sophia's House" + bmv_to_beach = "Blue Moon Vineyard to Beach" + jenkins_to_cellar = "Jenkins' Residence to Jenkins' Cellar" + plot_to_bridge = "Unclaimed Plot to Shearwater Bridge" + mountain_to_guild_summit = "Mountain to Guild Summit" + guild_to_interior = "Guild Summit to Adventurer's Guild" + guild_to_mines = "Guild Summit to The Mines" + summit_to_boat = "Guild Summit to Marlon's Boat" + summit_to_highlands = "Guild Summit to Highlands Outside" + to_aurora_basement = "Aurora Vineyard to Aurora Vineyard Basement" + outpost_to_badlands_entrance = "Galmoran Outpost to Badlands Entrance" + use_alesia_shop = "Talk to Alesia" + use_isaac_shop = "Talk to Isaac" + badlands_entrance_to_badlands = "Badlands Entrance to Crimson Badlands" + badlands_to_cave = "Crimson Badlands to Badlands Cave" + to_susan_house = "Railroad to Susan's House" + enter_summit = "Railroad to Summit" + fable_reef_to_guild = "Fable Reef to First Slash Guild" + highlands_to_lance = "Highlands Outside to Lance's House Main" + lance_to_ladder = "Lance's House Main to Lance's House Ladder" + highlands_to_cave = "Highlands Outside to Highlands Cavern" + to_dwarf_prison = "Highlands Cavern to Highlands Cavern Prison" + lance_ladder_to_highlands = "Lance's House Ladder to Highlands Outside" + forest_west_to_spring = "Forest West to Sprite Spring" + west_to_aurora = "Forest West to Aurora Vineyard" + use_bear_shop = "Talk to Bear Shop" + secret_woods_to_west = "Secret Woods to Forest West" + to_outpost_roof = "Galmoran Outpost to Galmoran Outpost Roof" + railroad_to_grampleton_station = "Railroad to Grampleton Station" + grampleton_station_to_grampleton_suburbs = "Grampleton Station to Grampleton Suburbs" + grampleton_suburbs_to_scarlett_house = "Grampleton Suburbs to Scarlett's House" + first_slash_guild_to_hallway = "First Slash Guild to First Slash Hallway" + first_slash_hallway_to_room = "First Slash Hallway to First Slash Spare Room" + sprite_spring_to_cave = "Sprite Spring to Sprite Spring Cave" + fish_shop_to_willy_bedroom = "Willy's Fish Shop to Willy's Bedroom" + museum_to_gunther_bedroom = "Museum to Gunther's Bedroom" + + +class AlectoEntrance: + witch_hut_to_witch_attic = "Witch's Hut to Witch's Attic" + + +class LaceyEntrance: + forest_to_hat_house = "Forest to Mouse House" + + +class BoardingHouseEntrance: + bus_stop_to_boarding_house_plateau = "Bus Stop to Boarding House Outside" + boarding_house_plateau_to_boarding_house_first = "Boarding House Outside to Boarding House - First Floor" + boarding_house_first_to_boarding_house_second = "Boarding House - First Floor to Boarding House - Second Floor" + boarding_house_plateau_to_abandoned_mines_entrance = "Boarding House Outside to Abandoned Mines Entrance" + abandoned_mines_entrance_to_abandoned_mines_1a = "Abandoned Mines Entrance to Abandoned Mines - 1A" + abandoned_mines_1a_to_abandoned_mines_1b = "Abandoned Mines - 1A to Abandoned Mines - 1B" + abandoned_mines_1b_to_abandoned_mines_2a = "Abandoned Mines - 1B to Abandoned Mines - 2A" + abandoned_mines_2a_to_abandoned_mines_2b = "Abandoned Mines - 2A to Abandoned Mines - 2B" + abandoned_mines_2b_to_abandoned_mines_3 = "Abandoned Mines - 2B to Abandoned Mines - 3" + abandoned_mines_3_to_abandoned_mines_4 = "Abandoned Mines - 3 to Abandoned Mines - 4" + abandoned_mines_4_to_abandoned_mines_5 = "Abandoned Mines - 4 to Abandoned Mines - 5" + abandoned_mines_5_to_the_lost_valley = "Abandoned Mines - 5 to The Lost Valley" + lost_valley_to_lost_valley_minecart = "The Lost Valley to Lost Valley Minecart" + abandoned_mines_entrance_to_the_lost_valley = "Abandoned Mines Entrance to The Lost Valley" + the_lost_valley_to_gregory_tent = "The Lost Valley to Gregory's Tent" + the_lost_valley_to_lost_valley_ruins = "The Lost Valley to Lost Valley Ruins" + lost_valley_ruins_to_lost_valley_house_1 = "Lost Valley Ruins to Lost Valley Ruins - First House" + lost_valley_ruins_to_lost_valley_house_2 = "Lost Valley Ruins to Lost Valley Ruins - Second House" + boarding_house_plateau_to_buffalo_ranch = "Boarding House Outside to Buffalo's Ranch" + diff --git a/worlds/stardew_valley/strings/festival_check_names.py b/worlds/stardew_valley/strings/festival_check_names.py index 404878999fc7..73a9d3978eab 100644 --- a/worlds/stardew_valley/strings/festival_check_names.py +++ b/worlds/stardew_valley/strings/festival_check_names.py @@ -20,6 +20,7 @@ class FestivalCheck: moonlight_jellies = "Dance of the Moonlight Jellies" rarecrow_1 = "Rarecrow #1 (Turnip Head)" rarecrow_2 = "Rarecrow #2 (Witch)" + rarecrow_3 = "Rarecrow #3 (Alien)" rarecrow_4 = "Rarecrow #4 (Snowman)" rarecrow_5 = "Rarecrow #5 (Woman)" rarecrow_7 = "Rarecrow #7 (Tanuki)" @@ -30,3 +31,7 @@ class FestivalCheck: spirit_eve_maze = "Spirit's Eve Maze" strawberry_seeds = "Egg Festival: Strawberry Seeds" all_rarecrows = "Collect All Rarecrows" + tub_o_flowers = "Tub o' Flowers Recipe" + jack_o_lantern = "Jack-O-Lantern Recipe" + moonlight_jellies_banner = "Moonlight Jellies Banner" + starport_decal = "Starport Decal" diff --git a/worlds/stardew_valley/strings/fish_names.py b/worlds/stardew_valley/strings/fish_names.py index 8ee778103752..cd59d749ee01 100644 --- a/worlds/stardew_valley/strings/fish_names.py +++ b/worlds/stardew_valley/strings/fish_names.py @@ -1,49 +1,84 @@ class Fish: + albacore = "Albacore" + anchovy = "Anchovy" angler = "Angler" any = "Any Fish" + blob_fish = "Blobfish" blobfish = "Blobfish" blue_discus = "Blue Discus" bream = "Bream" + bullhead = "Bullhead" + carp = "Carp" catfish = "Catfish" + chub = "Chub" + clam = "Clam" + cockle = "Cockle" crab = "Crab" crayfish = "Crayfish" crimsonfish = "Crimsonfish" dorado = "Dorado" + eel = "Eel" + flounder = "Flounder" + ghostfish = "Ghostfish" glacierfish = "Glacierfish" + glacierfish_jr = "Glacierfish Jr." + halibut = "Halibut" + herring = "Herring" + ice_pip = "Ice Pip" + largemouth_bass = "Largemouth Bass" lava_eel = "Lava Eel" legend = "Legend" + legend_ii = "Legend II" + lingcod = "Lingcod" lionfish = "Lionfish" lobster = "Lobster" + midnight_carp = "Midnight Carp" + midnight_squid = "Midnight Squid" + ms_angler = "Ms. Angler" mussel = "Mussel" mussel_node = "Mussel Node" mutant_carp = "Mutant Carp" octopus = "Octopus" oyster = "Oyster" + perch = "Perch" + periwinkle = "Periwinkle" + pike = "Pike" pufferfish = "Pufferfish" + radioactive_carp = "Radioactive Carp" + rainbow_trout = "Rainbow Trout" + red_mullet = "Red Mullet" + red_snapper = "Red Snapper" + salmon = "Salmon" + sandfish = "Sandfish" + sardine = "Sardine" + scorpion_carp = "Scorpion Carp" + sea_cucumber = "Sea Cucumber" + shad = "Shad" + shrimp = "Shrimp" + slimejack = "Slimejack" + smallmouth_bass = "Smallmouth Bass" + snail = "Snail" + son_of_crimsonfish = "Son of Crimsonfish" + spook_fish = "Spook Fish" spookfish = "Spook Fish" squid = "Squid" stingray = "Stingray" + stonefish = "Stonefish" sturgeon = "Sturgeon" sunfish = "Sunfish" - void_salmon = "Void Salmon" - albacore = "Albacore" - largemouth_bass = "Largemouth Bass" - smallmouth_bass = "Smallmouth Bass" - sardine = "Sardine" - periwinkle = "Periwinkle" - shrimp = "Shrimp" - snail = "Snail" + super_cucumber = "Super Cucumber" + tiger_trout = "Tiger Trout" + tilapia = "Tilapia" tuna = "Tuna" - eel = "Eel" - salmon = "Salmon" + void_salmon = "Void Salmon" + walleye = "Walleye" + woodskip = "Woodskip" class WaterItem: seaweed = "Seaweed" green_algae = "Green Algae" white_algae = "White Algae" - clam = "Clam" - cockle = "Cockle" coral = "Coral" nautilus_shell = "Nautilus Shell" sea_urchin = "Sea Urchin" @@ -58,5 +93,44 @@ class Trash: soggy_newspaper = "Soggy Newspaper" +class WaterChest: + fishing_chest = "Fishing Chest" + treasure = "Treasure Chest" + + +class SVEFish: + baby_lunaloo = "Baby Lunaloo" + bonefish = "Bonefish" + bull_trout = "Bull Trout" + butterfish = "Butterfish" + clownfish = "Clownfish" + daggerfish = "Daggerfish" + frog = "Frog" + gemfish = "Gemfish" + goldenfish = "Goldenfish" + grass_carp = "Grass Carp" + king_salmon = "King Salmon" + kittyfish = "Kittyfish" + lunaloo = "Lunaloo" + meteor_carp = "Meteor Carp" + minnow = "Minnow" + puppyfish = "Puppyfish" + radioactive_bass = "Radioactive Bass" + seahorse = "Seahorse" + shiny_lunaloo = "Shiny Lunaloo" + snatcher_worm = "Snatcher Worm" + starfish = "Starfish" + torpedo_trout = "Torpedo Trout" + undeadfish = "Undeadfish" + void_eel = "Void Eel" + water_grub = "Water Grub" + sea_sponge = "Sea Sponge" + dulse_seaweed = "Dulse Seaweed" + +class DistantLandsFish: + void_minnow = "Void Minnow" + swamp_leech = "Swamp Leech" + purple_algae = "Purple Algae" + giant_horsehoe_crab = "Giant Horsehoe Crab" diff --git a/worlds/stardew_valley/strings/flower_names.py b/worlds/stardew_valley/strings/flower_names.py index a804682f1b55..7e708fc3c074 100644 --- a/worlds/stardew_valley/strings/flower_names.py +++ b/worlds/stardew_valley/strings/flower_names.py @@ -1,3 +1,7 @@ class Flower: - sunflower = "Sunflower" + blue_jazz = "Blue Jazz" + fairy_rose = "Fairy Rose" poppy = "Poppy" + summer_spangle = "Summer Spangle" + sunflower = "Sunflower" + tulip = "Tulip" diff --git a/worlds/stardew_valley/strings/food_names.py b/worlds/stardew_valley/strings/food_names.py index 55e3ef0a7bd3..6e2f98fd581b 100644 --- a/worlds/stardew_valley/strings/food_names.py +++ b/worlds/stardew_valley/strings/food_names.py @@ -1,67 +1,118 @@ class Meal: - blueberry_tart = "Blueberry Tart" - bread = "Bread" - fiddlehead_risotto = "Fiddlehead Risotto" - complete_breakfast = "Complete Breakfast" - fried_egg = "Fried Egg" - hashbrowns = "Hashbrowns" - pancakes = "Pancakes" - ice_cream = "Ice Cream" - maki_roll = "Maki Roll" - miners_treat = "Miner's Treat" - omelet = "Omelet" - parsnip_soup = "Parsnip Soup" - pink_cake = "Pink Cake" - pizza = "Pizza" - pumpkin_pie = "Pumpkin Pie" - roasted_hazelnuts = "Roasted Hazelnuts" - salad = "Salad" - spaghetti = "Spaghetti" - tortilla = "Tortilla" + banana_pudding = "Banana Pudding" + poi = "Poi" + mango_sticky_rice = "Mango Sticky Rice" algae_soup = "Algae Soup" artichoke_dip = "Artichoke Dip" + autumn_bounty = "Autumn's Bounty" baked_fish = "Baked Fish" bean_hotpot = "Bean Hotpot" blackberry_cobbler = "Blackberry Cobbler" + blueberry_tart = "Blueberry Tart" + bread = "Bread" + bruschetta = "Bruschetta" + carp_surprise = "Carp Surprise" cheese_cauliflower = "Cheese Cauliflower" chocolate_cake = "Chocolate Cake" chowder = "Chowder" + coleslaw = "Coleslaw" + complete_breakfast = "Complete Breakfast" + cookie = "Cookies" crab_cakes = "Crab Cakes" cranberry_candy = "Cranberry Candy" + cranberry_sauce = "Cranberry Sauce" crispy_bass = "Crispy Bass" dish_o_the_sea = "Dish O' The Sea" eggplant_parmesan = "Eggplant Parmesan" escargot = "Escargot" farmer_lunch = "Farmer's Lunch" + fiddlehead_risotto = "Fiddlehead Risotto" + fish_stew = "Fish Stew" fish_taco = "Fish Taco" fried_calamari = "Fried Calamari" fried_eel = "Fried Eel" + fried_egg = "Fried Egg" fried_mushroom = "Fried Mushroom" fruit_salad = "Fruit Salad" glazed_yams = "Glazed Yams" + hashbrowns = "Hashbrowns" + ice_cream = "Ice Cream" + lobster_bisque = "Lobster Bisque" + lucky_lunch = "Lucky Lunch" + maki_roll = "Maki Roll" maple_bar = "Maple Bar" + miners_treat = "Miner's Treat" + omelet = "Omelet" pale_broth = "Pale Broth" + pancakes = "Pancakes" + parsnip_soup = "Parsnip Soup" pepper_poppers = "Pepper Poppers" + pink_cake = "Pink Cake" + pizza = "Pizza" plum_pudding = "Plum Pudding" poppyseed_muffin = "Poppyseed Muffin" + pumpkin_pie = "Pumpkin Pie" + pumpkin_soup = "Pumpkin Soup" + radish_salad = "Radish Salad" red_plate = "Red Plate" rhubarb_pie = "Rhubarb Pie" rice_pudding = "Rice Pudding" + roasted_hazelnuts = "Roasted Hazelnuts" roots_platter = "Roots Platter" + salad = "Salad" salmon_dinner = "Salmon Dinner" sashimi = "Sashimi" + seafoam_pudding = "Seafoam Pudding" + shrimp_cocktail = "Shrimp Cocktail" + spaghetti = "Spaghetti" + spicy_eel = "Spicy Eel" + squid_ink_ravioli = "Squid Ink Ravioli" stir_fry = "Stir Fry" strange_bun = "Strange Bun" stuffing = "Stuffing" + super_meal = "Super Meal" survival_burger = "Survival Burger" + tom_kha_soup = "Tom Kha Soup" + tortilla = "Tortilla" tropical_curry = "Tropical Curry" + trout_soup = "Trout Soup" vegetable_medley = "Vegetable Medley" + magic_rock_candy = "Magic Rock Candy" class Beverage: - pina_colada = "Piña Colada" + pina_colada = "Pina Colada" ginger_ale = "Ginger Ale" coffee = "Coffee" triple_shot_espresso = "Triple Shot Espresso" beer = "Beer" joja_cola = "Joja Cola" + + +class SVEMeal: + baked_berry_oatmeal = "Baked Berry Oatmeal" + big_bark_burger = "Big Bark Burger" + flower_cookie = "Flower Cookie" + frog_legs = "Frog Legs" + glazed_butterfish = "Glazed Butterfish" + mixed_berry_pie = "Mixed Berry Pie" + mushroom_berry_rice = "Mushroom Berry Rice" + seaweed_salad = "Seaweed Salad" + void_delight = "Void Delight" + void_salmon_sushi = "Void Salmon Sushi" + grampleton_orange_chicken = "Grampleton Orange Chicken" + + +class SVEBeverage: + sports_drink = "Sports Drink" + + +class DistantLandsMeal: + mushroom_kebab = "Mushroom Kebab" + crayfish_soup = "Crayfish Soup" + pemmican = "Pemmican" + void_mint_tea = "Void Mint Tea" + + +class BoardingHouseMeal: + special_pumpkin_soup = "Special Pumpkin Soup" diff --git a/worlds/stardew_valley/strings/forageable_names.py b/worlds/stardew_valley/strings/forageable_names.py index b29ff317cf77..24127beb9838 100644 --- a/worlds/stardew_valley/strings/forageable_names.py +++ b/worlds/stardew_valley/strings/forageable_names.py @@ -14,6 +14,7 @@ class Forageable: hay = "Hay" hazelnut = "Hazelnut" holly = "Holly" + journal_scrap = "Journal Scrap" leek = "Leek" magma_cap = "Magma Cap" morel = "Morel" @@ -32,4 +33,29 @@ class Forageable: spring_onion = "Spring Onion" +class SVEForage: + ornate_treasure_chest = "Ornate Treasure Chest" + swirl_stone = "Swirl Stone" + void_pebble = "Void Pebble" + void_soul = "Void Soul" + ferngill_primrose = "Ferngill Primrose" + goldenrod = "Goldenrod" + winter_star_rose = "Winter Star Rose" + bearberrys = "Bearberrys" + poison_mushroom = "Poison Mushroom" + red_baneberry = "Red Baneberry" + big_conch = "Big Conch" + dewdrop_berry = "Dewdrop Berry" + dried_sand_dollar = "Dried Sand Dollar" + golden_ocean_flower = "Golden Ocean Flower" + lucky_four_leaf_clover = "Lucky Four Leaf Clover" + mushroom_colony = "Mushroom Colony" + poison_mushroom = "Poison Mushroom" + rusty_blade = "Rusty Blade" + smelly_rafflesia = "Smelly Rafflesia" + thistle = "Thistle" + +class DistantLandsForageable: + brown_amanita = "Brown Amanita" + swamp_herb = "Swamp Herb" diff --git a/worlds/stardew_valley/strings/gift_names.py b/worlds/stardew_valley/strings/gift_names.py index 0baf31d5dbfd..9362f453cfea 100644 --- a/worlds/stardew_valley/strings/gift_names.py +++ b/worlds/stardew_valley/strings/gift_names.py @@ -1,6 +1,14 @@ class Gift: bouquet = "Bouquet" - wilted_bouquet = "Wilted Bouquet" - pearl = "Pearl" golden_pumpkin = "Golden Pumpkin" mermaid_pendant = "Mermaid's Pendant" + movie_ticket = "Movie Ticket" + pearl = "Pearl" + tea_set = "Tea Set" + void_ghost_pendant = "Void Ghost Pendant" + wilted_bouquet = "Wilted Bouquet" + + +class SVEGift: + blue_moon_wine = "Blue Moon Wine" + aged_blue_moon_wine = "Aged Blue Moon Wine" diff --git a/worlds/stardew_valley/strings/goal_names.py b/worlds/stardew_valley/strings/goal_names.py index da8b7d847006..601b00510428 100644 --- a/worlds/stardew_valley/strings/goal_names.py +++ b/worlds/stardew_valley/strings/goal_names.py @@ -7,4 +7,11 @@ class Goal: complete_museum = "Complete the Museum Collection" full_house = "Full House" greatest_walnut_hunter = "Greatest Walnut Hunter" + protector_of_the_valley = "Protector of the Valley" + full_shipment = "Full Shipment" + gourmet_chef = "Gourmet Chef" + craft_master = "Craft Master" + legend = "Legend" + mystery_of_the_stardrops = "Mystery of the Stardrops" + allsanity = "Allsanity" perfection = "Perfection" diff --git a/worlds/stardew_valley/strings/ingredient_names.py b/worlds/stardew_valley/strings/ingredient_names.py index 22271d661587..5537c7353c42 100644 --- a/worlds/stardew_valley/strings/ingredient_names.py +++ b/worlds/stardew_valley/strings/ingredient_names.py @@ -4,3 +4,4 @@ class Ingredient: oil = "Oil" rice = "Rice" vinegar = "Vinegar" + qi_seasoning = "Qi Seasoning" diff --git a/worlds/stardew_valley/strings/machine_names.py b/worlds/stardew_valley/strings/machine_names.py index 55d6cef79401..f9be78c41a03 100644 --- a/worlds/stardew_valley/strings/machine_names.py +++ b/worlds/stardew_valley/strings/machine_names.py @@ -1,22 +1,29 @@ class Machine: bee_house = "Bee House" + bone_mill = "Bone Mill" cask = "Cask" charcoal_kiln = "Charcoal Kiln" cheese_press = "Cheese Press" + coffee_maker = "Coffee Maker" + crab_pot = "Crab Pot" + crystalarium = "Crystalarium" + enricher = "Enricher" furnace = "Furnace" geode_crusher = "Geode Crusher" + heavy_tapper = "Heavy Tapper" keg = "Keg" lightning_rod = "Lightning Rod" loom = "Loom" mayonnaise_machine = "Mayonnaise Machine" oil_maker = "Oil Maker" + ostrich_incubator = "Ostrich Incubator" preserves_jar = "Preserves Jar" + pressure_nozzle = "Pressure Nozzle" recycling_machine = "Recycling Machine" seed_maker = "Seed Maker" + slime_egg_press = "Slime Egg-Press" + slime_incubator = "Slime Incubator" solar_panel = "Solar Panel" tapper = "Tapper" worm_bin = "Worm Bin" - coffee_maker = "Coffee Maker" - crab_pot = "Crab Pot" - ostrich_incubator = "Ostrich Incubator" diff --git a/worlds/stardew_valley/strings/metal_names.py b/worlds/stardew_valley/strings/metal_names.py index 67aefc692a56..bf15b9d01c8e 100644 --- a/worlds/stardew_valley/strings/metal_names.py +++ b/worlds/stardew_valley/strings/metal_names.py @@ -1,3 +1,17 @@ +all_fossils = [] +all_artifacts = [] + + +def fossil(name: str): + all_fossils.append(name) + return name + + +def artifact(name: str): + all_artifacts.append(name) + return name + + class Ore: copper = "Copper Ore" iron = "Iron Ore" @@ -16,6 +30,14 @@ class MetalBar: class Mineral: + petrified_slime = "Petrified Slime" + quartz = "Quartz" + earth_crystal = "Earth Crystal" + fire_quartz = "Fire Quartz" + marble = "Marble" + prismatic_shard = "Prismatic Shard" + diamond = "Diamond" + frozen_tear = "Frozen Tear" aquamarine = "Aquamarine" topaz = "Topaz" jade = "Jade" @@ -25,11 +47,99 @@ class Mineral: class Artifact: - pass # Eventually this will be the artifact names + prehistoric_handaxe = "Prehistoric Handaxe" + dwarf_gadget = artifact("Dwarf Gadget") + ancient_seed = artifact("Ancient Seed") + glass_shards = artifact("Glass Shards") + rusty_cog = artifact("Rusty Cog") + rare_disc = artifact("Rare Disc") + ancient_doll = artifact("Ancient Doll") + ancient_drum = artifact("Ancient Drum") + ancient_sword = artifact("Ancient Sword") + arrowhead = artifact("Arrowhead") + bone_flute = artifact("Bone Flute") + chewing_stick = artifact("Chewing Stick") + chicken_statue = artifact("Chicken Statue") + anchor = artifact("Anchor") + chipped_amphora = artifact("Chipped Amphora") + dwarf_scroll_i = artifact("Dwarf Scroll I") + dwarf_scroll_ii = artifact("Dwarf Scroll II") + dwarf_scroll_iii = artifact("Dwarf Scroll III") + dwarf_scroll_iv = artifact("Dwarf Scroll IV") + dwarvish_helm = artifact("Dwarvish Helm") + elvish_jewelry = artifact("Elvish Jewelry") + golden_mask = artifact("Golden Mask") + golden_relic = artifact("Golden Relic") + ornamental_fan = artifact("Ornamental Fan") + prehistoric_hammer = artifact("Prehistoric Handaxe") + prehistoric_tool = artifact("Prehistoric Tool") + rusty_spoon = artifact("Rusty Spoon") + rusty_spur = artifact("Rusty Spur") + strange_doll_green = artifact("Strange Doll (Green)") + strange_doll = artifact("Strange Doll") class Fossil: + amphibian_fossil = fossil("Amphibian Fossil") bone_fragment = "Bone Fragment" + dinosaur_egg = fossil("Dinosaur Egg") + dried_starfish = fossil("Dried Starfish") + fossilized_leg = fossil("Fossilized Leg") + fossilized_ribs = fossil("Fossilized Ribs") + fossilized_skull = fossil("Fossilized Skull") + fossilized_spine = fossil("Fossilized Spine") + fossilized_tail = fossil("Fossilized Tail") + mummified_bat = fossil("Mummified Bat") + mummified_frog = fossil("Mummified Frog") + nautilus_fossil = fossil("Nautilus Fossil") + palm_fossil = fossil("Palm Fossil") + prehistoric_hand = fossil("Skeletal Hand") + prehistoric_rib = fossil("Prehistoric Rib") + prehistoric_scapula = fossil("Prehistoric Scapula") + prehistoric_skull = fossil("Prehistoric Skull") + prehistoric_tibia = fossil("Prehistoric Tibia") + prehistoric_vertebra = fossil("Prehistoric Vertebra") + skeletal_hand = "Skeletal Hand" + skeletal_tail = fossil("Skeletal Tail") + snake_skull = fossil("Snake Skull") + snake_vertebrae = fossil("Snake Vertebrae") + trilobite = fossil("Trilobite") + + +class ModArtifact: + ancient_hilt = "Ancient Hilt" + ancient_blade = "Ancient Blade" + mask_piece_1 = "Mask Piece 1" + mask_piece_2 = "Mask Piece 2" + mask_piece_3 = "Mask Piece 3" + ancient_doll_body = "Ancient Doll Body" + ancient_doll_legs = "Ancient Doll Legs" + prismatic_shard_piece_1 = "Prismatic Shard Piece 1" + prismatic_shard_piece_2 = "Prismatic Shard Piece 2" + prismatic_shard_piece_3 = "Prismatic Shard Piece 3" + prismatic_shard_piece_4 = "Prismatic Shard Piece 4" + chipped_amphora_piece_1 = "Chipped Amphora Piece 1" + chipped_amphora_piece_2 = "Chipped Amphora Piece 2" + +class ModFossil: + neanderthal_limb_bones = "Neanderthal Limb Bones" + neanderthal_ribs = "Neanderthal Ribs" + neanderthal_skull = "Neanderthal Skull" + neanderthal_pelvis = "Neanderthal Pelvis" + dinosaur_tooth = "Dinosaur Tooth" + dinosaur_skull = "Dinosaur Skull" + dinosaur_claw = "Dinosaur Claw" + dinosaur_femur = "Dinosaur Femur" + dinosaur_ribs = "Dinosaur Ribs" + dinosaur_pelvis = "Dinosaur Pelvis" + dinosaur_vertebra = "Dinosaur Vertebra" + pterodactyl_ribs = "Pterodactyl Ribs" + pterodactyl_skull = "Pterodactyl Skull" + pterodactyl_r_wing_bone = "Pterodactyl R Wing Bone" + pterodactyl_l_wing_bone = "Pterodactyl L Wing Bone" + pterodactyl_phalange = "Pterodactyl Phalange" + pterodactyl_vertebra = "Pterodactyl Vertebra" + pterodactyl_claw = "Pterodactyl Claw" diff --git a/worlds/stardew_valley/strings/monster_drop_names.py b/worlds/stardew_valley/strings/monster_drop_names.py index 1b9f42429d07..c42e7ad5ede0 100644 --- a/worlds/stardew_valley/strings/monster_drop_names.py +++ b/worlds/stardew_valley/strings/monster_drop_names.py @@ -1,6 +1,17 @@ class Loot: + blue_slime_egg = "Blue Slime Egg" + red_slime_egg = "Red Slime Egg" + purple_slime_egg = "Purple Slime Egg" + green_slime_egg = "Green Slime Egg" + tiger_slime_egg = "Tiger Slime Egg" slime = "Slime" bug_meat = "Bug Meat" bat_wing = "Bat Wing" solar_essence = "Solar Essence" void_essence = "Void Essence" + + +class ModLoot: + void_shard = "Void Shard" + green_mushroom = "Green Mushroom" + diff --git a/worlds/stardew_valley/strings/monster_names.py b/worlds/stardew_valley/strings/monster_names.py new file mode 100644 index 000000000000..e995d563f059 --- /dev/null +++ b/worlds/stardew_valley/strings/monster_names.py @@ -0,0 +1,67 @@ +class Monster: + green_slime = "Green Slime" + blue_slime = "Frost Jelly" + red_slime = "Sludge" # Yeah I know this is weird that these two are the same name + purple_slime = "Sludge" # Blame CA + yellow_slime = "Yellow Slime" + black_slime = "Black Slime" + copper_slime = "Copper Slime" + iron_slime = "Iron Slime" + tiger_slime = "Tiger Slime" + shadow_shaman = "Shadow Shaman" + shadow_shaman_dangerous = "Dangerous Shadow Shaman" + shadow_brute = "Shadow Brute" + shadow_brute_dangerous = "Dangerous Shadow Brute" + shadow_sniper = "Shadow Sniper" + bat = "Bat" + bat_dangerous = "Dangerous Bat" + frost_bat = "Frost Bat" + frost_bat_dangerous = "Dangerous Frost Bat" + lava_bat = "Lava Bat" + iridium_bat = "Iridium Bat" + skeleton = "Skeleton" + skeleton_dangerous = "Dangerous Skeleton" + skeleton_mage = "Skeleton Mage" + bug = "Bug" + bug_dangerous = "Dangerous Bug" + cave_fly = "Fly" + cave_fly_dangerous = "Dangerous Cave Fly" + grub = "Grub" + grub_dangerous = "Dangerous Grub" + mutant_fly = "Mutant Fly" + mutant_grub = "Mutant Grub" + armored_bug = "Armored Bug" + armored_bug_dangerous = "Armored Bug (dangerous)" + duggy = "Duggy" + duggy_dangerous = "Dangerous Duggy" + magma_duggy = "Magma Duggy" + dust_sprite = "Dust Sprite" + dust_sprite_dangerous = "Dangerous Dust Sprite" + rock_crab = "Rock Crab" + rock_crab_dangerous = "Dangerous Rock Crab" + lava_crab = "Lava Crab" + lava_crab_dangerous = "Dangerous Lava Crab" + iridium_crab = "Iridium Crab" + mummy = "Mummy" + mummy_dangerous = "Dangerous Mummy" + pepper_rex = "Pepper Rex" + serpent = "Serpent" + royal_serpent = "Royal Serpent" + magma_sprite = "Magma Sprite" + magma_sparker = "Magma Sparker" + + +class MonsterCategory: + slime = "Slimes" + void_spirits = "Void Spirits" + bats = "Bats" + skeletons = "Skeletons" + cave_insects = "Cave Insects" + duggies = "Duggies" + dust_sprites = "Dust Sprites" + rock_crabs = "Rock Crabs" + mummies = "Mummies" + pepper_rex = "Pepper Rex" + serpents = "Serpents" + magma_sprites = "Magma Sprites" + diff --git a/worlds/stardew_valley/strings/quality_names.py b/worlds/stardew_valley/strings/quality_names.py new file mode 100644 index 000000000000..740bb5a3efc2 --- /dev/null +++ b/worlds/stardew_valley/strings/quality_names.py @@ -0,0 +1,63 @@ +from typing import List + + +class CropQuality: + basic = "Basic Crop" + silver = "Silver Crop" + gold = "Gold Crop" + iridium = "Iridium Crop" + + @staticmethod + def get_highest(qualities: List[str]) -> str: + for quality in crop_qualities_in_desc_order: + if quality in qualities: + return quality + return CropQuality.basic + + +class FishQuality: + basic = "Basic Fish" + silver = "Silver Fish" + gold = "Gold Fish" + iridium = "Iridium Fish" + + @staticmethod + def get_highest(qualities: List[str]) -> str: + for quality in fish_qualities_in_desc_order: + if quality in qualities: + return quality + return FishQuality.basic + + +class ForageQuality: + basic = "Basic Forage" + silver = "Silver Forage" + gold = "Gold Forage" + iridium = "Iridium Forage" + + @staticmethod + def get_highest(qualities: List[str]) -> str: + for quality in forage_qualities_in_desc_order: + if quality in qualities: + return quality + return ForageQuality.basic + + +class ArtisanQuality: + basic = "Basic Artisan" + silver = "Silver Artisan" + gold = "Gold Artisan" + iridium = "Iridium Artisan" + + @staticmethod + def get_highest(qualities: List[str]) -> str: + for quality in artisan_qualities_in_desc_order: + if quality in qualities: + return quality + return ArtisanQuality.basic + + +crop_qualities_in_desc_order = [CropQuality.iridium, CropQuality.gold, CropQuality.silver, CropQuality.basic] +fish_qualities_in_desc_order = [FishQuality.iridium, FishQuality.gold, FishQuality.silver, FishQuality.basic] +forage_qualities_in_desc_order = [ForageQuality.iridium, ForageQuality.gold, ForageQuality.silver, ForageQuality.basic] +artisan_qualities_in_desc_order = [ArtisanQuality.iridium, ArtisanQuality.gold, ArtisanQuality.silver, ArtisanQuality.basic] diff --git a/worlds/stardew_valley/strings/quest_names.py b/worlds/stardew_valley/strings/quest_names.py index 112e40a5d84d..2c02381609ec 100644 --- a/worlds/stardew_valley/strings/quest_names.py +++ b/worlds/stardew_valley/strings/quest_names.py @@ -6,6 +6,7 @@ class Quest: raising_animals = "Raising Animals" advancement = "Advancement" archaeology = "Archaeology" + rat_problem = "Rat Problem" meet_the_wizard = "Meet The Wizard" forging_ahead = "Forging Ahead" smelting = "Smelting" @@ -49,9 +50,23 @@ class Quest: goblin_problem = "Goblin Problem" magic_ink = "Magic Ink" + class ModQuest: MrGinger = "Mr.Ginger's request" AyeishaEnvelope = "Missing Envelope" AyeishaRing = "Lost Emerald Ring" JunaCola = "Juna's Drink Request" - JunaSpaghetti = "Juna's BFF Request" \ No newline at end of file + JunaSpaghetti = "Juna's BFF Request" + RailroadBoulder = "The Railroad Boulder" + GrandpasShed = "Grandpa's Shed" + MarlonsBoat = "Marlon's Boat" + AuroraVineyard = "Aurora Vineyard" + MonsterCrops = "Monster Crops" + VoidSoul = "Void Soul Retrieval" + WizardInvite = "Wizard's Invite" + CorruptedCropsTask = "Corrupted Crops Task" + ANewPot = "A New Pot" + FancyBlanketTask = "Fancy Blanket Task" + WitchOrder = "Witch's order" + PumpkinSoup = "Pumpkin Soup" + HatMouseHat = "Hats for the Hat Mouse" diff --git a/worlds/stardew_valley/strings/region_names.py b/worlds/stardew_valley/strings/region_names.py index 9fa257114eb3..0fdab64fef68 100644 --- a/worlds/stardew_valley/strings/region_names.py +++ b/worlds/stardew_valley/strings/region_names.py @@ -4,6 +4,10 @@ class Region: farm_house = "Farmhouse" cellar = "Cellar" farm = "Farm" + coop = "Coop" + barn = "Barn" + shed = "Shed" + slime_hutch = "Slime Hutch" town = "Town" beach = "Beach" mountain = "Mountain" @@ -63,12 +67,20 @@ class Region: skull_cavern_150 = "Skull Cavern Floor 150" skull_cavern_175 = "Skull Cavern Floor 175" skull_cavern_200 = "Skull Cavern Floor 200" + dangerous_skull_cavern = "Dangerous Skull Cavern" hospital = "Hospital" carpenter = "Carpenter Shop" alex_house = "Alex's House" elliott_house = "Elliott's House" ranch = "Marnie's Ranch" traveling_cart = "Traveling Cart" + traveling_cart_sunday = "Traveling Cart Sunday" + traveling_cart_monday = "Traveling Cart Monday" + traveling_cart_tuesday = "Traveling Cart Tuesday" + traveling_cart_wednesday = "Traveling Cart Wednesday" + traveling_cart_thursday = "Traveling Cart Thursday" + traveling_cart_friday = "Traveling Cart Friday" + traveling_cart_saturday = "Traveling Cart Saturday" farm_cave = "Farmcave" greenhouse = "Greenhouse" tunnel_entrance = "Tunnel Entrance" @@ -94,6 +106,9 @@ class Region: haley_house = "Haley's House" sam_house = "Sam's House" jojamart = "JojaMart" + abandoned_jojamart = "Abandoned JojaMart" + movie_theater = "Movie Theater" + movie_ticket_stand = "Ticket Stand" fish_shop = "Willy's Fish Shop" boat_tunnel = "Boat Tunnel" tide_pools = "Tide Pools" @@ -130,6 +145,27 @@ class Region: mines_floor_110 = "The Mines - Floor 110" mines_floor_115 = "The Mines - Floor 115" mines_floor_120 = "The Mines - Floor 120" + dangerous_mines_20 = "Dangerous Mines - Floor 20" + dangerous_mines_60 = "Dangerous Mines - Floor 60" + dangerous_mines_100 = "Dangerous Mines - Floor 100" + kitchen = "Kitchen" + shipping = "Shipping" + queen_of_sauce = "The Queen of Sauce" + blacksmith_copper = "Blacksmith Copper Upgrades" + blacksmith_iron = "Blacksmith Iron Upgrades" + blacksmith_gold = "Blacksmith Gold Upgrades" + blacksmith_iridium = "Blacksmith Iridium Upgrades" + farming = "Farming" + fishing = "Fishing" + egg_festival = "Egg Festival" + flower_dance = "Flower Dance" + luau = "Luau" + moonlight_jellies = "Dance of the Moonlight Jellies" + fair = "Stardew Valley Fair" + spirit_eve = "Spirit's Eve" + festival_of_ice = "Festival of Ice" + night_market = "Night Market" + winter_star = "Feast of the Winter Star" class DeepWoodsRegion: @@ -180,3 +216,91 @@ class AyeishaRegion: class RileyRegion: riley_house = "Riley's House" + + +class SVERegion: + grandpas_shed = "Grandpa's Shed" + grandpas_shed_front_door = "Grandpa's Shed Front Door" + grandpas_shed_interior = "Grandpa's Shed Interior" + grandpas_shed_upstairs = "Grandpa's Shed Upstairs" + grove_outpost_warp = "Grove Outpost Warp" + grove_wizard_warp = "Grove Wizard Warp" + grove_farm_warp = "Grove Farm Warp" + grove_aurora_warp = "Grove Aurora Vineyard Warp" + grove_guild_warp = "Grove Guild Warp" + grove_junimo_warp = "Grove Junimo Woods Warp" + grove_spring_warp = "Grove Sprite Spring Warp" + marnies_shed = "Marnie's Shed" + fairhaven_farm = "Fairhaven Farm" + blue_moon_vineyard = "Blue Moon Vineyard" + sophias_house = "Sophia's House" + jenkins_residence = "Jenkins' Residence" + jenkins_cellar = "Jenkins' Cellar" + unclaimed_plot = "Unclaimed Plot" + shearwater = "Shearwater Bridge" + guild_summit = "Guild Summit" + fable_reef = "Fable Reef" + first_slash_guild = "First Slash Guild" + highlands_outside = "Highlands Outside" + highlands_cavern = "Highlands Cavern" + dwarf_prison = "Highlands Cavern Prison" + lances_house = "Lance's House Main" + lances_ladder = "Lance's House Ladder" + forest_west = "Forest West" + aurora_vineyard = "Aurora Vineyard" + aurora_vineyard_basement = "Aurora Vineyard Basement" + bear_shop = "Bear Shop" + sprite_spring = "Sprite Spring" + lost_woods = "Lost Woods" + junimo_woods = "Junimo Woods" + purple_junimo_shop = "Purple Junimo Shop" + enchanted_grove = "Enchanted Grove" + galmoran_outpost = "Galmoran Outpost" + badlands_entrance = "Badlands Entrance" + crimson_badlands = "Crimson Badlands" + alesia_shop = "Alesia Shop" + isaac_shop = "Isaac Shop" + summit = "Summit" + susans_house = "Susan's House" + marlon_boat = "Marlon's Boat" + badlands_cave = "Badlands Cave" + outpost_roof = "Galmoran Outpost Roof" + grampleton_station = "Grampleton Station" + grampleton_suburbs = "Grampleton Suburbs" + scarlett_house = "Scarlett's House" + first_slash_hallway = "First Slash Hallway" + first_slash_spare_room = "First Slash Spare Room" + sprite_spring_cave = "Sprite Spring Cave" + willy_bedroom = "Willy's Bedroom" + gunther_bedroom = "Gunther's Bedroom" + + +class AlectoRegion: + witch_attic = "Witch's Attic" + + +class LaceyRegion: + hat_house = "Mouse House" + + +class BoardingHouseRegion: + boarding_house_plateau = "Boarding House Outside" + boarding_house_first = "Boarding House - First Floor" + boarding_house_second = "Boarding House - Second Floor" + abandoned_mines_entrance = "Abandoned Mines Entrance" + abandoned_mines_1a = "Abandoned Mines - 1A" + abandoned_mines_1b = "Abandoned Mines - 1B" + abandoned_mines_2a = "Abandoned Mines - 2A" + abandoned_mines_2b = "Abandoned Mines - 2B" + abandoned_mines_3 = "Abandoned Mines - 3" + abandoned_mines_4 = "Abandoned Mines - 4" + abandoned_mines_5 = "Abandoned Mines - 5" + the_lost_valley = "The Lost Valley" + gregory_tent = "Gregory's Tent" + lost_valley_ruins = "Lost Valley Ruins" + lost_valley_minecart = "Lost Valley Minecart" + lost_valley_house_1 = "Lost Valley Ruins - First House" + lost_valley_house_2 = "Lost Valley Ruins - Second House" + buffalo_ranch = "Buffalo's Ranch" + + diff --git a/worlds/stardew_valley/strings/season_names.py b/worlds/stardew_valley/strings/season_names.py index 93c58fceb26c..f3659bc87fe0 100644 --- a/worlds/stardew_valley/strings/season_names.py +++ b/worlds/stardew_valley/strings/season_names.py @@ -3,4 +3,6 @@ class Season: summer = "Summer" fall = "Fall" winter = "Winter" - progressive = "Progressive Season" \ No newline at end of file + progressive = "Progressive Season" + + not_winter = (spring, summer, fall,) diff --git a/worlds/stardew_valley/strings/seed_names.py b/worlds/stardew_valley/strings/seed_names.py index 080bdf854006..398b370f2745 100644 --- a/worlds/stardew_valley/strings/seed_names.py +++ b/worlds/stardew_valley/strings/seed_names.py @@ -1,9 +1,37 @@ class Seed: - sunflower = "Sunflower Seeds" - tomato = "Tomato Seeds" - melon = "Melon Seeds" - wheat = "Wheat Seeds" + coffee = "Coffee Bean" garlic = "Garlic Seeds" + jazz = "Jazz Seeds" + melon = "Melon Seeds" + mixed = "Mixed Seeds" pineapple = "Pineapple Seeds" + poppy = "Poppy Seeds" + qi_bean = "Qi Bean" + spangle = "Spangle Seeds" + sunflower = "Sunflower Seeds" taro = "Taro Tuber" - coffee = "Coffee Bean" + tomato = "Tomato Seeds" + tulip = "Tulip Bulb" + wheat = "Wheat Seeds" + + +class TreeSeed: + acorn = "Acorn" + maple = "Maple Seed" + pine = "Pine Cone" + mahogany = "Mahogany Seed" + mushroom = "Mushroom Tree Seed" + + +class SVESeed: + stalk_seed = "Stalk Seed" + fungus_seed = "Fungus Seed" + slime_seed = "Slime Seed" + void_seed = "Void Seed" + shrub_seed = "Shrub Seed" + ancient_ferns_seed = "Ancient Ferns Seed" + + +class DistantLandsSeed: + void_mint = "Void Mint Seeds" + vile_ancient_fruit = "Vile Ancient Fruit Seeds" diff --git a/worlds/stardew_valley/strings/skill_names.py b/worlds/stardew_valley/strings/skill_names.py index 7e7fdb798122..bae4c26fd716 100644 --- a/worlds/stardew_valley/strings/skill_names.py +++ b/worlds/stardew_valley/strings/skill_names.py @@ -13,3 +13,6 @@ class ModSkill: cooking = "Cooking" magic = "Magic" socializing = "Socializing" + + +all_mod_skills = {ModSkill.luck, ModSkill.binning, ModSkill.archaeology, ModSkill.cooking, ModSkill.magic, ModSkill.socializing} diff --git a/worlds/stardew_valley/strings/special_order_names.py b/worlds/stardew_valley/strings/special_order_names.py index 04eec828c0b0..9802c01532c1 100644 --- a/worlds/stardew_valley/strings/special_order_names.py +++ b/worlds/stardew_valley/strings/special_order_names.py @@ -13,7 +13,7 @@ class SpecialOrder: pierres_prime_produce = "Pierre's Prime Produce" robins_project = "Robin's Project" robins_resource_rush = "Robin's Resource Rush" - juicy_bugs_wanted_yum = "Juicy Bugs Wanted!" + juicy_bugs_wanted = "Juicy Bugs Wanted!" tropical_fish = "Tropical Fish" a_curious_substance = "A Curious Substance" prismatic_jelly = "Prismatic Jelly" @@ -31,3 +31,10 @@ class SpecialOrder: class ModSpecialOrder: junas_monster_mash = "Juna's Monster Mash" + andys_cellar = "Andy's Cellar" + a_mysterious_venture = "A Mysterious Venture" + an_elegant_reception = "An Elegant Reception" + fairy_garden = "Fairy Garden" + homemade_fertilizer = "Homemade Fertilizer" + geode_order = "Geode Order" + dwarf_scroll = "Dwarven Scrolls" diff --git a/worlds/stardew_valley/strings/spells.py b/worlds/stardew_valley/strings/spells.py index fd2a515db9ff..ef5545c56902 100644 --- a/worlds/stardew_valley/strings/spells.py +++ b/worlds/stardew_valley/strings/spells.py @@ -9,7 +9,7 @@ class MagicSpell: buff = "Spell: Buff" shockwave = "Spell: Shockwave" fireball = "Spell: Fireball" - frostbite = "Spell: Frostbite" + frostbite = "Spell: Frostbolt" teleport = "Spell: Teleport" lantern = "Spell: Lantern" tendrils = "Spell: Tendrils" diff --git a/worlds/stardew_valley/strings/villager_names.py b/worlds/stardew_valley/strings/villager_names.py index 5bf13ea8dd7e..7e87be64f1ea 100644 --- a/worlds/stardew_valley/strings/villager_names.py +++ b/worlds/stardew_valley/strings/villager_names.py @@ -46,4 +46,24 @@ class ModNPC: riley = "Riley" shiko = "Shiko" wellwick = "Wellwick" - yoba = "Yoba" \ No newline at end of file + yoba = "Yoba" + lance = "Lance" + apples = "Apples" + claire = "Claire" + olivia = "Olivia" + sophia = "Sophia" + victor = "Victor" + andy = "Andy" + gunther = "Gunther" + martin = "Martin" + marlon = "Marlon" + morgan = "Morgan" + morris = "Morris" + scarlett = "Scarlett" + susan = "Susan" + alecto = "Alecto" + goblin = "Zic" + lacey = "Lacey" + gregory = "Gregory" + sheila = "Sheila" + joel = "Joel" diff --git a/worlds/stardew_valley/strings/wallet_item_names.py b/worlds/stardew_valley/strings/wallet_item_names.py index 31026ebbaeae..28f09b0558fc 100644 --- a/worlds/stardew_valley/strings/wallet_item_names.py +++ b/worlds/stardew_valley/strings/wallet_item_names.py @@ -1,5 +1,10 @@ class Wallet: + metal_detector = "Traveling Merchant Metal Detector" + iridium_snake_milk = "Iridium Snake Milk" + bears_knowledge = "Bear's Knowledge" + dwarvish_translation_guide = "Dwarvish Translation Guide" magnifying_glass = "Magnifying Glass" rusty_key = "Rusty Key" skull_key = "Skull Key" dark_talisman = "Dark Talisman" + club_card = "Club Card" diff --git a/worlds/stardew_valley/strings/weapon_names.py b/worlds/stardew_valley/strings/weapon_names.py index 009cd6df0d6f..1c3e508cfa99 100644 --- a/worlds/stardew_valley/strings/weapon_names.py +++ b/worlds/stardew_valley/strings/weapon_names.py @@ -1,4 +1,3 @@ class Weapon: slingshot = "Slingshot" master_slingshot = "Master Slingshot" - any_slingshot = "Any Slingshot" diff --git a/worlds/stardew_valley/test/TestBundles.py b/worlds/stardew_valley/test/TestBundles.py index a13829eb67ea..cd6828cd79e5 100644 --- a/worlds/stardew_valley/test/TestBundles.py +++ b/worlds/stardew_valley/test/TestBundles.py @@ -1,30 +1,29 @@ import unittest -from ..data.bundle_data import all_bundle_items, quality_crops_items +from ..data.bundle_data import all_bundle_items_except_money, quality_crops_items_thematic +from ..strings.crop_names import Fruit +from ..strings.quality_names import CropQuality class TestBundles(unittest.TestCase): def test_all_bundle_items_have_3_parts(self): - for bundle_item in all_bundle_items: - with self.subTest(bundle_item.item.name): - self.assertGreater(len(bundle_item.item.name), 0) - id = bundle_item.item.item_id - self.assertGreaterEqual(id, -1) - self.assertNotEqual(id, 0) + for bundle_item in all_bundle_items_except_money: + with self.subTest(bundle_item.item_name): + self.assertGreater(len(bundle_item.item_name), 0) self.assertGreater(bundle_item.amount, 0) - self.assertGreaterEqual(bundle_item.quality, 0) + self.assertTrue(bundle_item.quality) def test_quality_crops_have_correct_amounts(self): - for bundle_item in quality_crops_items: - with self.subTest(bundle_item.item.name): - name = bundle_item.item.name - if name == "Sweet Gem Berry" or name == "Ancient Fruit": + for bundle_item in quality_crops_items_thematic: + with self.subTest(bundle_item.item_name): + name = bundle_item.item_name + if name == Fruit.sweet_gem_berry or name == Fruit.ancient_fruit: self.assertEqual(bundle_item.amount, 1) else: self.assertEqual(bundle_item.amount, 5) def test_quality_crops_have_correct_quality(self): - for bundle_item in quality_crops_items: - with self.subTest(bundle_item.item.name): - self.assertEqual(bundle_item.quality, 2) + for bundle_item in quality_crops_items_thematic: + with self.subTest(bundle_item.item_name): + self.assertEqual(bundle_item.quality, CropQuality.gold) diff --git a/worlds/stardew_valley/test/TestCrops.py b/worlds/stardew_valley/test/TestCrops.py new file mode 100644 index 000000000000..38b736367b80 --- /dev/null +++ b/worlds/stardew_valley/test/TestCrops.py @@ -0,0 +1,20 @@ +from . import SVTestBase +from .. import options + + +class TestCropsanityRules(SVTestBase): + options = { + options.Cropsanity.internal_name: options.Cropsanity.option_enabled + } + + def test_need_greenhouse_for_cactus(self): + harvest_cactus = self.world.logic.region.can_reach_location("Harvest Cactus Fruit") + self.assert_rule_false(harvest_cactus, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Cactus Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Shipping Bin"), event=False) + self.multiworld.state.collect(self.world.create_item("Desert Obelisk"), event=False) + self.assert_rule_false(harvest_cactus, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Greenhouse"), event=False) + self.assert_rule_true(harvest_cactus, self.multiworld.state) diff --git a/worlds/stardew_valley/test/TestDynamicGoals.py b/worlds/stardew_valley/test/TestDynamicGoals.py new file mode 100644 index 000000000000..fe1bfb5f3044 --- /dev/null +++ b/worlds/stardew_valley/test/TestDynamicGoals.py @@ -0,0 +1,108 @@ +from typing import List, Tuple + +from . import SVTestBase +from .assertion import WorldAssertMixin +from .. import options, StardewItem +from ..strings.ap_names.ap_weapon_names import APWeapon +from ..strings.ap_names.transport_names import Transportation +from ..strings.fish_names import Fish +from ..strings.tool_names import APTool +from ..strings.wallet_item_names import Wallet + + +def collect_fishing_abilities(tester: SVTestBase): + for i in range(4): + tester.multiworld.state.collect(tester.world.create_item(APTool.fishing_rod), event=False) + tester.multiworld.state.collect(tester.world.create_item(APTool.pickaxe), event=False) + tester.multiworld.state.collect(tester.world.create_item(APTool.axe), event=False) + tester.multiworld.state.collect(tester.world.create_item(APWeapon.weapon), event=False) + for i in range(10): + tester.multiworld.state.collect(tester.world.create_item("Fishing Level"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Combat Level"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Mining Level"), event=False) + for i in range(17): + tester.multiworld.state.collect(tester.world.create_item("Progressive Mine Elevator"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Spring"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Summer"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Fall"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Winter"), event=False) + tester.multiworld.state.collect(tester.world.create_item(Transportation.desert_obelisk), event=False) + tester.multiworld.state.collect(tester.world.create_item("Railroad Boulder Removed"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Island North Turtle"), event=False) + tester.multiworld.state.collect(tester.world.create_item("Island West Turtle"), event=False) + + +def create_and_collect(tester: SVTestBase, item_name: str) -> StardewItem: + item = tester.world.create_item(item_name) + tester.multiworld.state.collect(item, event=False) + return item + + +def create_and_collect_fishing_access_items(tester: SVTestBase) -> List[Tuple[StardewItem, str]]: + items = [(create_and_collect(tester, Wallet.dark_talisman), Fish.void_salmon), + (create_and_collect(tester, Wallet.rusty_key), Fish.slimejack), + (create_and_collect(tester, "Progressive Mine Elevator"), Fish.lava_eel), + (create_and_collect(tester, Transportation.island_obelisk), Fish.lionfish), + (create_and_collect(tester, "Island Resort"), Fish.stingray)] + return items + + +class TestMasterAnglerNoFishsanity(WorldAssertMixin, SVTestBase): + options = { + options.Goal.internal_name: options.Goal.option_master_angler, + options.Fishsanity.internal_name: options.Fishsanity.option_none, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false + } + + def test_need_all_fish_to_win(self): + collect_fishing_abilities(self) + self.assert_cannot_reach_victory(self.multiworld) + critical_items = create_and_collect_fishing_access_items(self) + self.assert_can_reach_victory(self.multiworld) + for item, fish in critical_items: + with self.subTest(f"Needed: {fish}"): + self.assert_item_was_necessary_for_victory(item, self.multiworld) + + +class TestMasterAnglerNoFishsanityNoGingerIsland(WorldAssertMixin, SVTestBase): + options = { + options.Goal.internal_name: options.Goal.option_master_angler, + options.Fishsanity.internal_name: options.Fishsanity.option_none, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true + } + + def test_need_fish_to_win(self): + collect_fishing_abilities(self) + self.assert_cannot_reach_victory(self.multiworld) + items = create_and_collect_fishing_access_items(self) + self.assert_can_reach_victory(self.multiworld) + unecessary_items = [(item, fish) for (item, fish) in items if fish in [Fish.lionfish, Fish.stingray]] + necessary_items = [(item, fish) for (item, fish) in items if (item, fish) not in unecessary_items] + for item, fish in necessary_items: + with self.subTest(f"Needed: {fish}"): + self.assert_item_was_necessary_for_victory(item, self.multiworld) + for item, fish in unecessary_items: + with self.subTest(f"Not Needed: {fish}"): + self.assert_item_was_not_necessary_for_victory(item, self.multiworld) + + +class TestMasterAnglerFishsanityNoHardFish(WorldAssertMixin, SVTestBase): + options = { + options.Goal.internal_name: options.Goal.option_master_angler, + options.Fishsanity.internal_name: options.Fishsanity.option_exclude_hard_fish, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false + } + + def test_need_fish_to_win(self): + collect_fishing_abilities(self) + self.assert_cannot_reach_victory(self.multiworld) + items = create_and_collect_fishing_access_items(self) + self.assert_can_reach_victory(self.multiworld) + unecessary_items = [(item, fish) for (item, fish) in items if fish in [Fish.void_salmon, Fish.stingray, Fish.lava_eel]] + necessary_items = [(item, fish) for (item, fish) in items if (item, fish) not in unecessary_items] + for item, fish in necessary_items: + with self.subTest(f"Needed: {fish}"): + self.assert_item_was_necessary_for_victory(item, self.multiworld) + for item, fish in unecessary_items: + with self.subTest(f"Not Needed: {fish}"): + self.assert_item_was_not_necessary_for_victory(item, self.multiworld) diff --git a/worlds/stardew_valley/test/TestGeneration.py b/worlds/stardew_valley/test/TestGeneration.py index 46c6685ad536..55ad4f07544b 100644 --- a/worlds/stardew_valley/test/TestGeneration.py +++ b/worlds/stardew_valley/test/TestGeneration.py @@ -1,28 +1,26 @@ -import typing +from typing import List -from BaseClasses import ItemClassification, MultiWorld -from . import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_with_mods, \ - allsanity_options_without_mods, minimal_locations_maximal_items -from .. import locations, items, location_table, options +from BaseClasses import ItemClassification, Item +from . import SVTestBase, allsanity_options_without_mods, \ + allsanity_options_with_mods, minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, get_minsanity_options, default_options +from .. import items, location_table, options from ..data.villagers_data import all_villagers_by_name, all_villagers_by_mod_by_name -from ..items import items_by_group, Group +from ..items import Group, item_table from ..locations import LocationTags from ..mods.mod_data import ModNames - - -def get_real_locations(tester: typing.Union[SVTestBase, SVTestCase], multiworld: MultiWorld): - return [location for location in multiworld.get_locations(tester.player) if not location.event] - - -def get_real_location_names(tester: typing.Union[SVTestBase, SVTestCase], multiworld: MultiWorld): - return [location.name for location in multiworld.get_locations(tester.player) if not location.event] +from ..options import Friendsanity, SpecialOrderLocations, Shipsanity, Chefsanity, SeasonRandomization, Craftsanity, ExcludeGingerIsland, ToolProgression, \ + FriendsanityHeartSize +from ..strings.region_names import Region class TestBaseItemGeneration(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive, - options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi, + Friendsanity.internal_name: Friendsanity.option_all_with_marriage, + SeasonRandomization.internal_name: SeasonRandomization.option_progressive, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, + Shipsanity.internal_name: Shipsanity.option_everything, + Chefsanity.internal_name: Chefsanity.option_all, + Craftsanity.internal_name: Craftsanity.option_all, } def test_all_progression_items_are_added_to_the_pool(self): @@ -30,21 +28,19 @@ def test_all_progression_items_are_added_to_the_pool(self): # Ignore all the stuff that the algorithm chooses one of, instead of all, to fulfill logical progression items_to_ignore = [event.name for event in items.events] items_to_ignore.extend(item.name for item in items.all_items if item.mod_name is not None) + items_to_ignore.extend(deprecated.name for deprecated in items.items_by_group[Group.DEPRECATED]) items_to_ignore.extend(season.name for season in items.items_by_group[Group.SEASON]) items_to_ignore.extend(weapon.name for weapon in items.items_by_group[Group.WEAPON]) - items_to_ignore.extend(footwear.name for footwear in items.items_by_group[Group.FOOTWEAR]) items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY]) items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK]) - progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression - and item.name not in items_to_ignore] + items_to_ignore.append("The Gateway Gazette") + progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore] for progression_item in progression_items: with self.subTest(f"{progression_item.name}"): self.assertIn(progression_item.name, all_created_items) def test_creates_as_many_item_as_non_event_locations(self): - non_event_locations = [location for location in get_real_locations(self, self.multiworld) if - not location.event] - + non_event_locations = self.get_real_locations() self.assertEqual(len(non_event_locations), len(self.multiworld.itempool)) def test_does_not_create_deprecated_items(self): @@ -69,9 +65,12 @@ def test_does_not_create_exactly_two_items(self): class TestNoGingerIslandItemGeneration(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive, - options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true + Friendsanity.internal_name: Friendsanity.option_all_with_marriage, + SeasonRandomization.internal_name: SeasonRandomization.option_progressive, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + Shipsanity.internal_name: Shipsanity.option_everything, + Chefsanity.internal_name: Chefsanity.option_all, + Craftsanity.internal_name: Craftsanity.option_all, } def test_all_progression_items_except_island_are_added_to_the_pool(self): @@ -79,12 +78,12 @@ def test_all_progression_items_except_island_are_added_to_the_pool(self): # Ignore all the stuff that the algorithm chooses one of, instead of all, to fulfill logical progression items_to_ignore = [event.name for event in items.events] items_to_ignore.extend(item.name for item in items.all_items if item.mod_name is not None) + items_to_ignore.extend(deprecated.name for deprecated in items.items_by_group[Group.DEPRECATED]) items_to_ignore.extend(season.name for season in items.items_by_group[Group.SEASON]) items_to_ignore.extend(season.name for season in items.items_by_group[Group.WEAPON]) - items_to_ignore.extend(season.name for season in items.items_by_group[Group.FOOTWEAR]) items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY]) - progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression - and item.name not in items_to_ignore] + items_to_ignore.append("The Gateway Gazette") + progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore] for progression_item in progression_items: with self.subTest(f"{progression_item.name}"): if Group.GINGER_ISLAND in progression_item.groups: @@ -93,8 +92,7 @@ def test_all_progression_items_except_island_are_added_to_the_pool(self): self.assertIn(progression_item.name, all_created_items) def test_creates_as_many_item_as_non_event_locations(self): - non_event_locations = [location for location in get_real_locations(self, self.multiworld) if - not location.event] + non_event_locations = self.get_real_locations() self.assertEqual(len(non_event_locations), len(self.multiworld.itempool)) @@ -118,34 +116,154 @@ def test_does_not_create_exactly_two_items(self): self.assertTrue(count == 0 or count == 2) -class TestRemixedMineRewards(SVTestBase): - def test_when_generate_world_then_one_reward_is_added_per_chest(self): - # assert self.world.create_item("Rusty Sword") in self.multiworld.itempool - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_10])) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_20])) - self.assertIn(self.world.create_item("Slingshot"), self.multiworld.itempool) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_50])) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_60])) - self.assertIn(self.world.create_item("Master Slingshot"), self.multiworld.itempool) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_80])) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_90])) - self.assertIn(self.world.create_item("Stardrop"), self.multiworld.itempool) - self.assertTrue(any(self.world.create_item(item) in self.multiworld.itempool - for item in items_by_group[Group.MINES_FLOOR_110])) - self.assertIn(self.world.create_item("Skull Key"), self.multiworld.itempool) - - # This test has a 1/90,000 chance to fail... Sorry in advance - def test_when_generate_world_then_rewards_are_not_all_vanilla(self): - self.assertFalse(all(self.world.create_item(item) in self.multiworld.itempool - for item in - ["Leather Boots", "Steel Smallsword", "Tundra Boots", "Crystal Dagger", "Firewalker Boots", - "Obsidian Edge", "Space Boots"])) +class TestMonstersanityNone(SVTestBase): + options = {options.Monstersanity.internal_name: options.Monstersanity.option_none} + + def test_when_generate_world_then_5_generic_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Weapon"), 5) + + def test_when_generate_world_then_zero_specific_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Sword"), 0) + self.assertEqual(item_pool.count("Progressive Club"), 0) + self.assertEqual(item_pool.count("Progressive Dagger"), 0) + + def test_when_generate_world_then_2_slingshots_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Slingshot"), 2) + + def test_when_generate_world_then_3_shoes_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Footwear"), 3) + + +class TestMonstersanityGoals(SVTestBase): + options = {options.Monstersanity.internal_name: options.Monstersanity.option_goals} + + def test_when_generate_world_then_no_generic_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Weapon"), 0) + + def test_when_generate_world_then_5_specific_weapons_of_each_type_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Sword"), 5) + self.assertEqual(item_pool.count("Progressive Club"), 5) + self.assertEqual(item_pool.count("Progressive Dagger"), 5) + + def test_when_generate_world_then_2_slingshots_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Slingshot"), 2) + + def test_when_generate_world_then_4_shoes_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Footwear"), 4) + + def test_when_generate_world_then_all_monster_checks_are_inaccessible(self): + for location in self.get_real_locations(): + if LocationTags.MONSTERSANITY not in location_table[location.name].tags: + continue + with self.subTest(location.name): + self.assertFalse(location.can_reach(self.multiworld.state)) + + +class TestMonstersanityOnePerCategory(SVTestBase): + options = {options.Monstersanity.internal_name: options.Monstersanity.option_one_per_category} + + def test_when_generate_world_then_no_generic_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Weapon"), 0) + + def test_when_generate_world_then_5_specific_weapons_of_each_type_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Sword"), 5) + self.assertEqual(item_pool.count("Progressive Club"), 5) + self.assertEqual(item_pool.count("Progressive Dagger"), 5) + + def test_when_generate_world_then_2_slingshots_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Slingshot"), 2) + + def test_when_generate_world_then_4_shoes_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Footwear"), 4) + + def test_when_generate_world_then_all_monster_checks_are_inaccessible(self): + for location in self.get_real_locations(): + if LocationTags.MONSTERSANITY not in location_table[location.name].tags: + continue + with self.subTest(location.name): + self.assertFalse(location.can_reach(self.multiworld.state)) + + +class TestMonstersanityProgressive(SVTestBase): + options = {options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals} + + def test_when_generate_world_then_no_generic_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Weapon"), 0) + + def test_when_generate_world_then_5_specific_weapons_of_each_type_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Sword"), 5) + self.assertEqual(item_pool.count("Progressive Club"), 5) + self.assertEqual(item_pool.count("Progressive Dagger"), 5) + + def test_when_generate_world_then_2_slingshots_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Slingshot"), 2) + + def test_when_generate_world_then_4_shoes_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Footwear"), 4) + + def test_when_generate_world_then_many_rings_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertIn("Hot Java Ring", item_pool) + self.assertIn("Wedding Ring", item_pool) + self.assertIn("Slime Charmer Ring", item_pool) + + def test_when_generate_world_then_all_monster_checks_are_inaccessible(self): + for location in self.get_real_locations(): + if LocationTags.MONSTERSANITY not in location_table[location.name].tags: + continue + with self.subTest(location.name): + self.assertFalse(location.can_reach(self.multiworld.state)) + + +class TestMonstersanitySplit(SVTestBase): + options = {options.Monstersanity.internal_name: options.Monstersanity.option_split_goals} + + def test_when_generate_world_then_no_generic_weapons_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Weapon"), 0) + + def test_when_generate_world_then_5_specific_weapons_of_each_type_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Sword"), 5) + self.assertEqual(item_pool.count("Progressive Club"), 5) + self.assertEqual(item_pool.count("Progressive Dagger"), 5) + + def test_when_generate_world_then_2_slingshots_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Slingshot"), 2) + + def test_when_generate_world_then_4_shoes_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertEqual(item_pool.count("Progressive Footwear"), 4) + + def test_when_generate_world_then_many_rings_in_the_pool(self): + item_pool = [item.name for item in self.multiworld.itempool] + self.assertIn("Hot Java Ring", item_pool) + self.assertIn("Wedding Ring", item_pool) + self.assertIn("Slime Charmer Ring", item_pool) + + def test_when_generate_world_then_all_monster_checks_are_inaccessible(self): + for location in self.get_real_locations(): + if LocationTags.MONSTERSANITY not in location_table[location.name].tags: + continue + with self.subTest(location.name): + self.assertFalse(location.can_reach(self.multiworld.state)) class TestProgressiveElevator(SVTestBase): @@ -155,57 +273,173 @@ class TestProgressiveElevator(SVTestBase): options.SkillProgression.internal_name: options.SkillProgression.option_progressive, } - def test_given_access_to_floor_115_when_find_another_elevator_then_has_access_to_floor_120(self): - self.collect([self.get_item_by_name("Progressive Pickaxe")] * 2) - self.collect([self.get_item_by_name("Progressive Mine Elevator")] * 22) - self.collect(self.multiworld.create_item("Bone Sword", self.player)) - self.collect([self.get_item_by_name("Combat Level")] * 4) - self.collect(self.get_item_by_name("Adventurer's Guild")) + def test_given_elevator_to_floor_105_when_find_another_elevator_then_has_access_to_floor_120(self): + items_for_115 = self.generate_items_for_mine_115() + last_elevator = self.get_item_by_name("Progressive Mine Elevator") + self.collect(items_for_115) + floor_115 = self.multiworld.get_region("The Mines - Floor 115", self.player) + floor_120 = self.multiworld.get_region("The Mines - Floor 120", self.player) + + self.assertTrue(floor_115.can_reach(self.multiworld.state)) + self.assertFalse(floor_120.can_reach(self.multiworld.state)) - self.assertFalse(self.multiworld.get_region("The Mines - Floor 120", self.player).can_reach(self.multiworld.state)) + self.collect(last_elevator) - self.collect(self.get_item_by_name("Progressive Mine Elevator")) + self.assertTrue(floor_120.can_reach(self.multiworld.state)) - self.assertTrue(self.multiworld.get_region("The Mines - Floor 120", self.player).can_reach(self.multiworld.state)) + def generate_items_for_mine_115(self) -> List[Item]: + pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 2 + elevators = [self.get_item_by_name("Progressive Mine Elevator")] * 21 + swords = [self.get_item_by_name("Progressive Sword")] * 3 + combat_levels = [self.get_item_by_name("Combat Level")] * 4 + mining_levels = [self.get_item_by_name("Mining Level")] * 4 + return [*combat_levels, *mining_levels, *elevators, *pickaxes, *swords] - def test_given_access_to_floor_115_when_find_another_pickaxe_and_sword_then_has_access_to_floor_120(self): - self.collect([self.get_item_by_name("Progressive Pickaxe")] * 2) - self.collect([self.get_item_by_name("Progressive Mine Elevator")] * 22) - self.collect(self.multiworld.create_item("Bone Sword", self.player)) - self.collect([self.get_item_by_name("Combat Level")] * 4) - self.collect(self.get_item_by_name("Adventurer's Guild")) + def generate_items_for_extra_mine_levels(self, weapon_name: str) -> List[Item]: + last_pickaxe = self.get_item_by_name("Progressive Pickaxe") + last_weapon = self.multiworld.create_item(weapon_name, self.player) + second_last_combat_level = self.get_item_by_name("Combat Level") + last_combat_level = self.get_item_by_name("Combat Level") + second_last_mining_level = self.get_item_by_name("Mining Level") + last_mining_level = self.get_item_by_name("Mining Level") + return [last_pickaxe, last_weapon, second_last_combat_level, last_combat_level, second_last_mining_level, last_mining_level] - self.assertFalse(self.multiworld.get_region("The Mines - Floor 120", self.player).can_reach(self.multiworld.state)) - self.collect(self.get_item_by_name("Progressive Pickaxe")) - self.collect(self.multiworld.create_item("Steel Falchion", self.player)) - self.collect(self.get_item_by_name("Combat Level")) - self.collect(self.get_item_by_name("Combat Level")) +class TestSkullCavernLogic(SVTestBase): + options = { + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla, + ToolProgression.internal_name: ToolProgression.option_progressive, + options.SkillProgression.internal_name: options.SkillProgression.option_progressive, + } - self.assertTrue(self.multiworld.get_region("The Mines - Floor 120", self.player).can_reach(self.multiworld.state)) + def test_given_access_to_floor_115_when_find_more_tools_then_has_access_to_skull_cavern_25(self): + items_for_115 = self.generate_items_for_mine_115() + items_for_skull_50 = self.generate_items_for_skull_50() + items_for_skull_100 = self.generate_items_for_skull_100() + self.collect(items_for_115) + floor_115 = self.multiworld.get_region(Region.mines_floor_115, self.player) + skull_25 = self.multiworld.get_region(Region.skull_cavern_25, self.player) + skull_75 = self.multiworld.get_region(Region.skull_cavern_75, self.player) + + self.assertTrue(floor_115.can_reach(self.multiworld.state)) + self.assertFalse(skull_25.can_reach(self.multiworld.state)) + self.assertFalse(skull_75.can_reach(self.multiworld.state)) + + self.remove(items_for_115) + self.collect(items_for_skull_50) + + self.assertTrue(floor_115.can_reach(self.multiworld.state)) + self.assertTrue(skull_25.can_reach(self.multiworld.state)) + self.assertFalse(skull_75.can_reach(self.multiworld.state)) + + self.remove(items_for_skull_50) + self.collect(items_for_skull_100) + + self.assertTrue(floor_115.can_reach(self.multiworld.state)) + self.assertTrue(skull_25.can_reach(self.multiworld.state)) + self.assertTrue(skull_75.can_reach(self.multiworld.state)) + + def generate_items_for_mine_115(self) -> List[Item]: + pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 2 + swords = [self.get_item_by_name("Progressive Sword")] * 3 + combat_levels = [self.get_item_by_name("Combat Level")] * 4 + mining_levels = [self.get_item_by_name("Mining Level")] * 4 + bus = self.get_item_by_name("Bus Repair") + skull_key = self.get_item_by_name("Skull Key") + return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key] + + def generate_items_for_skull_50(self) -> List[Item]: + pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 3 + swords = [self.get_item_by_name("Progressive Sword")] * 4 + combat_levels = [self.get_item_by_name("Combat Level")] * 6 + mining_levels = [self.get_item_by_name("Mining Level")] * 6 + bus = self.get_item_by_name("Bus Repair") + skull_key = self.get_item_by_name("Skull Key") + return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key] + + def generate_items_for_skull_100(self) -> List[Item]: + pickaxes = [self.get_item_by_name("Progressive Pickaxe")] * 4 + swords = [self.get_item_by_name("Progressive Sword")] * 5 + combat_levels = [self.get_item_by_name("Combat Level")] * 8 + mining_levels = [self.get_item_by_name("Mining Level")] * 8 + bus = self.get_item_by_name("Bus Repair") + skull_key = self.get_item_by_name("Skull Key") + return [*combat_levels, *mining_levels, *pickaxes, *swords, bus, skull_key] class TestLocationGeneration(SVTestBase): def test_all_location_created_are_in_location_table(self): - for location in get_real_locations(self, self.multiworld): + for location in self.get_real_locations(): if not location.event: self.assertIn(location.name, location_table) -class TestLocationAndItemCount(SVTestCase): +class TestMinLocationAndMaxItem(SVTestBase): + options = minimal_locations_maximal_items() + + # They do not pass and I don't know why. + skip_base_tests = True def test_minimal_location_maximal_items_still_valid(self): - min_max_options = minimal_locations_maximal_items() - multiworld = setup_solo_multiworld(min_max_options) - valid_locations = get_real_locations(self, multiworld) - self.assertGreaterEqual(len(valid_locations), len(multiworld.itempool)) + valid_locations = self.get_real_locations() + number_locations = len(valid_locations) + number_items = len([item for item in self.multiworld.itempool + if Group.RESOURCE_PACK not in item_table[item.name].groups and Group.TRAP not in item_table[item.name].groups]) + self.assertGreaterEqual(number_locations, number_items) + print(f"Stardew Valley - Minimum Locations: {number_locations}, Maximum Items: {number_items} [ISLAND EXCLUDED]") + + +class TestMinLocationAndMaxItemWithIsland(SVTestBase): + options = minimal_locations_maximal_items_with_island() + + def test_minimal_location_maximal_items_with_island_still_valid(self): + valid_locations = self.get_real_locations() + number_locations = len(valid_locations) + number_items = len([item for item in self.multiworld.itempool + if Group.RESOURCE_PACK not in item_table[item.name].groups and Group.TRAP not in item_table[item.name].groups]) + self.assertGreaterEqual(number_locations, number_items) + print(f"Stardew Valley - Minimum Locations: {number_locations}, Maximum Items: {number_items} [ISLAND INCLUDED]") + + +class TestMinSanityHasAllExpectedLocations(SVTestBase): + options = get_minsanity_options() + + def test_minsanity_has_fewer_than_locations(self): + expected_locations = 76 + real_locations = self.get_real_locations() + number_locations = len(real_locations) + self.assertLessEqual(number_locations, expected_locations) + print(f"Stardew Valley - Minsanity Locations: {number_locations}") + if number_locations != expected_locations: + print(f"\tDisappeared Locations Detected!" + f"\n\tPlease update test_minsanity_has_fewer_than_locations" + f"\n\t\tExpected: {expected_locations}" + f"\n\t\tActual: {number_locations}") + + +class TestDefaultSettingsHasAllExpectedLocations(SVTestBase): + options = default_options() + + def test_default_settings_has_exactly_locations(self): + expected_locations = 422 + real_locations = self.get_real_locations() + number_locations = len(real_locations) + print(f"Stardew Valley - Default options locations: {number_locations}") + if number_locations != expected_locations: + print(f"\tNew locations detected!" + f"\n\tPlease update test_default_settings_has_exactly_locations" + f"\n\t\tExpected: {expected_locations}" + f"\n\t\tActual: {number_locations}") + + +class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase): + options = allsanity_options_without_mods() def test_allsanity_without_mods_has_at_least_locations(self): - expected_locations = 994 - allsanity_options = allsanity_options_without_mods() - multiworld = setup_solo_multiworld(allsanity_options) - number_locations = len(get_real_locations(self, multiworld)) + expected_locations = 1956 + real_locations = self.get_real_locations() + number_locations = len(real_locations) self.assertGreaterEqual(number_locations, expected_locations) print(f"Stardew Valley - Allsanity Locations without mods: {number_locations}") if number_locations != expected_locations: @@ -214,11 +448,14 @@ def test_allsanity_without_mods_has_at_least_locations(self): f"\n\t\tExpected: {expected_locations}" f"\n\t\tActual: {number_locations}") + +class TestAllSanityWithModsSettingsHasAllExpectedLocations(SVTestBase): + options = allsanity_options_with_mods() + def test_allsanity_with_mods_has_at_least_locations(self): - expected_locations = 1246 - allsanity_options = allsanity_options_with_mods() - multiworld = setup_solo_multiworld(allsanity_options) - number_locations = len(get_real_locations(self, multiworld)) + expected_locations = 2804 + real_locations = self.get_real_locations() + number_locations = len(real_locations) self.assertGreaterEqual(number_locations, expected_locations) print(f"\nStardew Valley - Allsanity Locations with all mods: {number_locations}") if number_locations != expected_locations: @@ -230,7 +467,7 @@ def test_allsanity_with_mods_has_at_least_locations(self): class TestFriendsanityNone(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_none, + Friendsanity.internal_name: Friendsanity.option_none, } @property @@ -238,34 +475,46 @@ def run_default_tests(self) -> bool: # None is default return False - def test_no_friendsanity_items(self): + def test_friendsanity_none(self): + with self.subTest("No Items"): + self.check_no_friendsanity_items() + with self.subTest("No Locations"): + self.check_no_friendsanity_locations() + + def check_no_friendsanity_items(self): for item in self.multiworld.itempool: self.assertFalse(item.name.endswith(" <3")) - def test_no_friendsanity_locations(self): - for location_name in get_real_location_names(self, self.multiworld): + def check_no_friendsanity_locations(self): + for location_name in self.get_real_location_names(): self.assertFalse(location_name.startswith("Friendsanity")) class TestFriendsanityBachelors(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_bachelors, - options.FriendsanityHeartSize.internal_name: 1, + Friendsanity.internal_name: Friendsanity.option_bachelors, + FriendsanityHeartSize.internal_name: 1, } bachelors = {"Harvey", "Elliott", "Sam", "Alex", "Shane", "Sebastian", "Emily", "Haley", "Leah", "Abigail", "Penny", "Maru"} - def test_friendsanity_only_bachelor_items(self): + def test_friendsanity_only_bachelors(self): + with self.subTest("Items are valid"): + self.check_only_bachelors_items() + with self.subTest("Locations are valid"): + self.check_only_bachelors_locations() + + def check_only_bachelors_items(self): suffix = " <3" for item in self.multiworld.itempool: if item.name.endswith(suffix): villager_name = item.name[:item.name.index(suffix)] self.assertIn(villager_name, self.bachelors) - def test_friendsanity_only_bachelor_locations(self): + def check_only_bachelors_locations(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): + for location_name in self.get_real_location_names(): if location_name.startswith(prefix): name_no_prefix = location_name[len(prefix):] name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] @@ -278,22 +527,28 @@ def test_friendsanity_only_bachelor_locations(self): class TestFriendsanityStartingNpcs(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_starting_npcs, - options.FriendsanityHeartSize.internal_name: 1, + Friendsanity.internal_name: Friendsanity.option_starting_npcs, + FriendsanityHeartSize.internal_name: 1, } excluded_npcs = {"Leo", "Krobus", "Dwarf", "Sandy", "Kent"} - def test_friendsanity_only_starting_npcs_items(self): + def test_friendsanity_only_starting_npcs(self): + with self.subTest("Items are valid"): + self.check_only_starting_npcs_items() + with self.subTest("Locations are valid"): + self.check_only_starting_npcs_locations() + + def check_only_starting_npcs_items(self): suffix = " <3" for item in self.multiworld.itempool: if item.name.endswith(suffix): villager_name = item.name[:item.name.index(suffix)] self.assertNotIn(villager_name, self.excluded_npcs) - def test_friendsanity_only_starting_npcs_locations(self): + def check_only_starting_npcs_locations(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): + for location_name in self.get_real_location_names(): if location_name.startswith(prefix): name_no_prefix = location_name[len(prefix):] name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] @@ -312,44 +567,71 @@ def test_friendsanity_only_starting_npcs_locations(self): class TestFriendsanityAllNpcs(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all, - options.FriendsanityHeartSize.internal_name: 1, + Friendsanity.internal_name: Friendsanity.option_all, + FriendsanityHeartSize.internal_name: 4, } - def test_friendsanity_all_items(self): + def test_friendsanity_all_npcs(self): + with self.subTest("Items are valid"): + self.check_items_are_valid() + with self.subTest("Correct number of items"): + self.check_correct_number_of_items() + with self.subTest("Locations are valid"): + self.check_locations_are_valid() + + def check_items_are_valid(self): suffix = " <3" for item in self.multiworld.itempool: if item.name.endswith(suffix): villager_name = item.name[:item.name.index(suffix)] self.assertTrue(villager_name in all_villagers_by_mod_by_name[ModNames.vanilla] or villager_name == "Pet") - def test_friendsanity_all_locations(self): + def check_correct_number_of_items(self): + suffix = " <3" + item_names = [item.name for item in self.multiworld.itempool] + for villager_name in all_villagers_by_mod_by_name[ModNames.vanilla]: + heart_item_name = f"{villager_name}{suffix}" + number_heart_items = item_names.count(heart_item_name) + if all_villagers_by_name[villager_name].bachelor: + self.assertEqual(number_heart_items, 2) + else: + self.assertEqual(number_heart_items, 3) + self.assertEqual(item_names.count("Pet <3"), 2) + + def check_locations_are_valid(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): - if location_name.startswith(prefix): - name_no_prefix = location_name[len(prefix):] - name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] - parts = name_trimmed.split(" ") - name = parts[0] - hearts = parts[1] - self.assertTrue(name in all_villagers_by_mod_by_name[ModNames.vanilla] or name == "Pet") - if name == "Pet": - self.assertLessEqual(int(hearts), 5) - elif all_villagers_by_name[name].bachelor: - self.assertLessEqual(int(hearts), 8) - else: - self.assertLessEqual(int(hearts), 10) + for location_name in self.get_real_location_names(): + if not location_name.startswith(prefix): + continue + name_no_prefix = location_name[len(prefix):] + name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] + parts = name_trimmed.split(" ") + name = parts[0] + hearts = int(parts[1]) + self.assertTrue(name in all_villagers_by_mod_by_name[ModNames.vanilla] or name == "Pet") + if name == "Pet": + self.assertTrue(hearts == 4 or hearts == 5) + elif all_villagers_by_name[name].bachelor: + self.assertTrue(hearts == 4 or hearts == 8 or hearts == 12 or hearts == 14) + else: + self.assertTrue(hearts == 4 or hearts == 8 or hearts == 10) class TestFriendsanityAllNpcsExcludingGingerIsland(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all, - options.FriendsanityHeartSize.internal_name: 1, - options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true + Friendsanity.internal_name: Friendsanity.option_all, + FriendsanityHeartSize.internal_name: 4, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true } - def test_friendsanity_all_items(self): + def test_friendsanity_all_npcs_exclude_island(self): + with self.subTest("Items"): + self.check_items() + with self.subTest("Locations"): + self.check_locations() + + def check_items(self): suffix = " <3" for item in self.multiworld.itempool: if item.name.endswith(suffix): @@ -357,10 +639,10 @@ def test_friendsanity_all_items(self): self.assertNotEqual(villager_name, "Leo") self.assertTrue(villager_name in all_villagers_by_mod_by_name[ModNames.vanilla] or villager_name == "Pet") - def test_friendsanity_all_locations(self): + def check_locations(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): + for location_name in self.get_real_location_names(): if location_name.startswith(prefix): name_no_prefix = location_name[len(prefix):] name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] @@ -377,84 +659,28 @@ def test_friendsanity_all_locations(self): self.assertLessEqual(int(hearts), 10) -class TestFriendsanityAllNpcsWithMarriage(SVTestBase): +class TestFriendsanityHeartSize3(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 1, + Friendsanity.internal_name: Friendsanity.option_all_with_marriage, + FriendsanityHeartSize.internal_name: 3, } - def test_friendsanity_all_with_marriage_items(self): + def test_friendsanity_all_npcs_with_marriage(self): + with self.subTest("Items are valid"): + self.check_items_are_valid() + with self.subTest("Correct number of items"): + self.check_correct_number_of_items() + with self.subTest("Locations are valid"): + self.check_locations_are_valid() + + def check_items_are_valid(self): suffix = " <3" for item in self.multiworld.itempool: if item.name.endswith(suffix): villager_name = item.name[:item.name.index(suffix)] self.assertTrue(villager_name in all_villagers_by_mod_by_name[ModNames.vanilla] or villager_name == "Pet") - def test_friendsanity_all_with_marriage_locations(self): - prefix = "Friendsanity: " - suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): - if location_name.startswith(prefix): - name_no_prefix = location_name[len(prefix):] - name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] - parts = name_trimmed.split(" ") - name = parts[0] - hearts = parts[1] - self.assertTrue(name in all_villagers_by_mod_by_name[ModNames.vanilla] or name == "Pet") - if name == "Pet": - self.assertLessEqual(int(hearts), 5) - elif all_villagers_by_name[name].bachelor: - self.assertLessEqual(int(hearts), 14) - else: - self.assertLessEqual(int(hearts), 10) - - -""" # Assuming math is correct if we check 2 points -class TestFriendsanityAllNpcsWithMarriageHeartSize2(SVTestBase): - options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 2, - } - - def test_friendsanity_all_with_marriage_items(self): - suffix = " <3" - item_names = [item.name for item in self.multiworld.itempool] - for villager_name in all_villagers_by_mod_by_name[ModNames.vanilla]: - heart_item_name = f"{villager_name}{suffix}" - number_heart_items = item_names.count(heart_item_name) - if all_villagers_by_name[villager_name].bachelor: - self.assertEqual(number_heart_items, 7) - else: - self.assertEqual(number_heart_items, 5) - self.assertEqual(item_names.count("Pet <3"), 3) - - def test_friendsanity_all_with_marriage_locations(self): - prefix = "Friendsanity: " - suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): - if not location_name.startswith(prefix): - continue - name_no_prefix = location_name[len(prefix):] - name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] - parts = name_trimmed.split(" ") - name = parts[0] - hearts = int(parts[1]) - self.assertTrue(name in all_villagers_by_mod_by_name[ModNames.vanilla] or name == "Pet") - if name == "Pet": - self.assertTrue(hearts == 2 or hearts == 4 or hearts == 5) - elif all_villagers_by_name[name].bachelor: - self.assertTrue(hearts == 2 or hearts == 4 or hearts == 6 or hearts == 8 or hearts == 10 or hearts == 12 or hearts == 14) - else: - self.assertTrue(hearts == 2 or hearts == 4 or hearts == 6 or hearts == 8 or hearts == 10) - - -class TestFriendsanityAllNpcsWithMarriageHeartSize3(SVTestBase): - options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 3, - } - - def test_friendsanity_all_with_marriage_items(self): + def check_correct_number_of_items(self): suffix = " <3" item_names = [item.name for item in self.multiworld.itempool] for villager_name in all_villagers_by_mod_by_name[ModNames.vanilla]: @@ -466,10 +692,10 @@ def test_friendsanity_all_with_marriage_items(self): self.assertEqual(number_heart_items, 4) self.assertEqual(item_names.count("Pet <3"), 2) - def test_friendsanity_all_with_marriage_locations(self): + def check_locations_are_valid(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): + for location_name in self.get_real_location_names(): if not location_name.startswith(prefix): continue name_no_prefix = location_name[len(prefix):] @@ -486,52 +712,28 @@ def test_friendsanity_all_with_marriage_locations(self): self.assertTrue(hearts == 3 or hearts == 6 or hearts == 9 or hearts == 10) -class TestFriendsanityAllNpcsWithMarriageHeartSize4(SVTestBase): +class TestFriendsanityHeartSize5(SVTestBase): options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 4, + Friendsanity.internal_name: Friendsanity.option_all_with_marriage, + FriendsanityHeartSize.internal_name: 5, } - def test_friendsanity_all_with_marriage_items(self): - suffix = " <3" - item_names = [item.name for item in self.multiworld.itempool] - for villager_name in all_villagers_by_mod_by_name[ModNames.vanilla]: - heart_item_name = f"{villager_name}{suffix}" - number_heart_items = item_names.count(heart_item_name) - if all_villagers_by_name[villager_name].bachelor: - self.assertEqual(number_heart_items, 4) - else: - self.assertEqual(number_heart_items, 3) - self.assertEqual(item_names.count("Pet <3"), 2) + def test_friendsanity_all_npcs_with_marriage(self): + with self.subTest("Items are valid"): + self.check_items_are_valid() + with self.subTest("Correct number of items"): + self.check_correct_number_of_items() + with self.subTest("Locations are valid"): + self.check_locations_are_valid() - def test_friendsanity_all_with_marriage_locations(self): - prefix = "Friendsanity: " + def check_items_are_valid(self): suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): - if not location_name.startswith(prefix): - continue - name_no_prefix = location_name[len(prefix):] - name_trimmed = name_no_prefix[:name_no_prefix.index(suffix)] - parts = name_trimmed.split(" ") - name = parts[0] - hearts = int(parts[1]) - self.assertTrue(name in all_villagers_by_mod_by_name[ModNames.vanilla] or name == "Pet") - if name == "Pet": - self.assertTrue(hearts == 4 or hearts == 5) - elif all_villagers_by_name[name].bachelor: - self.assertTrue(hearts == 4 or hearts == 8 or hearts == 12 or hearts == 14) - else: - self.assertTrue(hearts == 4 or hearts == 8 or hearts == 10) -""" - - -class TestFriendsanityAllNpcsWithMarriageHeartSize5(SVTestBase): - options = { - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 5, - } + for item in self.multiworld.itempool: + if item.name.endswith(suffix): + villager_name = item.name[:item.name.index(suffix)] + self.assertTrue(villager_name in all_villagers_by_mod_by_name[ModNames.vanilla] or villager_name == "Pet") - def test_friendsanity_all_with_marriage_items(self): + def check_correct_number_of_items(self): suffix = " <3" item_names = [item.name for item in self.multiworld.itempool] for villager_name in all_villagers_by_mod_by_name[ModNames.vanilla]: @@ -543,10 +745,10 @@ def test_friendsanity_all_with_marriage_items(self): self.assertEqual(number_heart_items, 2) self.assertEqual(item_names.count("Pet <3"), 1) - def test_friendsanity_all_with_marriage_locations(self): + def check_locations_are_valid(self): prefix = "Friendsanity: " suffix = " <3" - for location_name in get_real_location_names(self, self.multiworld): + for location_name in self.get_real_location_names(): if not location_name.startswith(prefix): continue name_no_prefix = location_name[len(prefix):] @@ -561,3 +763,341 @@ def test_friendsanity_all_with_marriage_locations(self): self.assertTrue(hearts == 5 or hearts == 10 or hearts == 14) else: self.assertTrue(hearts == 5 or hearts == 10) + + +class TestShipsanityNone(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_none + } + + def test_no_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event: + with self.subTest(location.name): + self.assertFalse("Shipsanity" in location.name) + self.assertNotIn(LocationTags.SHIPSANITY, location_table[location.name].tags) + + +class TestShipsanityCrops(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_crops, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi + } + + def test_only_crop_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_CROP, location_table[location.name].tags) + + def test_include_island_crop_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + self.assertIn("Shipsanity: Qi Fruit", location_names) + + +class TestShipsanityCropsExcludeIsland(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_crops, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + } + + def test_only_crop_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_CROP, location_table[location.name].tags) + + def test_only_mainland_crop_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertNotIn("Shipsanity: Banana", location_names) + self.assertNotIn("Shipsanity: Mango", location_names) + self.assertNotIn("Shipsanity: Pineapple", location_names) + self.assertNotIn("Shipsanity: Taro Root", location_names) + self.assertNotIn("Shipsanity: Ginger", location_names) + self.assertNotIn("Shipsanity: Magma Cap", location_names) + self.assertNotIn("Shipsanity: Qi Fruit", location_names) + + +class TestShipsanityCropsNoQiCropWithoutSpecialOrders(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_crops, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_only + } + + def test_only_crop_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_CROP, location_table[location.name].tags) + + def test_island_crops_without_qi_fruit_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + self.assertNotIn("Shipsanity: Qi Fruit", location_names) + + +class TestShipsanityFish(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_fish, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi + } + + def test_only_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_include_island_fish_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Blue Discus", location_names) + self.assertIn("Shipsanity: Lionfish", location_names) + self.assertIn("Shipsanity: Stingray", location_names) + self.assertIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertIn("Shipsanity: Legend II", location_names) + self.assertIn("Shipsanity: Ms. Angler", location_names) + self.assertIn("Shipsanity: Radioactive Carp", location_names) + self.assertIn("Shipsanity: Son of Crimsonfish", location_names) + + +class TestShipsanityFishExcludeIsland(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_fish, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + } + + def test_only_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_exclude_island_fish_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertNotIn("Shipsanity: Blue Discus", location_names) + self.assertNotIn("Shipsanity: Lionfish", location_names) + self.assertNotIn("Shipsanity: Stingray", location_names) + self.assertNotIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertNotIn("Shipsanity: Legend II", location_names) + self.assertNotIn("Shipsanity: Ms. Angler", location_names) + self.assertNotIn("Shipsanity: Radioactive Carp", location_names) + self.assertNotIn("Shipsanity: Son of Crimsonfish", location_names) + + +class TestShipsanityFishExcludeQiOrders(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_fish, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_only + } + + def test_only_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_include_island_fish_no_extended_family_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Blue Discus", location_names) + self.assertIn("Shipsanity: Lionfish", location_names) + self.assertIn("Shipsanity: Stingray", location_names) + self.assertNotIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertNotIn("Shipsanity: Legend II", location_names) + self.assertNotIn("Shipsanity: Ms. Angler", location_names) + self.assertNotIn("Shipsanity: Radioactive Carp", location_names) + self.assertNotIn("Shipsanity: Son of Crimsonfish", location_names) + + +class TestShipsanityFullShipment(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi + } + + def test_only_full_shipment_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FULL_SHIPMENT, location_table[location.name].tags) + self.assertNotIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_include_island_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Cinder Shard", location_names) + self.assertIn("Shipsanity: Bone Fragment", location_names) + self.assertIn("Shipsanity: Radioactive Ore", location_names) + self.assertIn("Shipsanity: Radioactive Bar", location_names) + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + + +class TestShipsanityFullShipmentExcludeIsland(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + } + + def test_only_full_shipment_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FULL_SHIPMENT, location_table[location.name].tags) + self.assertNotIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_exclude_island_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertNotIn("Shipsanity: Cinder Shard", location_names) + self.assertNotIn("Shipsanity: Radioactive Ore", location_names) + self.assertNotIn("Shipsanity: Radioactive Bar", location_names) + self.assertNotIn("Shipsanity: Banana", location_names) + self.assertNotIn("Shipsanity: Mango", location_names) + self.assertNotIn("Shipsanity: Pineapple", location_names) + self.assertNotIn("Shipsanity: Taro Root", location_names) + self.assertNotIn("Shipsanity: Ginger", location_names) + self.assertNotIn("Shipsanity: Magma Cap", location_names) + + +class TestShipsanityFullShipmentExcludeQiBoard(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled + } + + def test_only_full_shipment_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertIn(LocationTags.SHIPSANITY_FULL_SHIPMENT, location_table[location.name].tags) + self.assertNotIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + def test_exclude_qi_board_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Cinder Shard", location_names) + self.assertIn("Shipsanity: Bone Fragment", location_names) + self.assertNotIn("Shipsanity: Radioactive Ore", location_names) + self.assertNotIn("Shipsanity: Radioactive Bar", location_names) + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + + +class TestShipsanityFullShipmentWithFish(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment_with_fish, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi + } + + def test_only_full_shipment_and_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertTrue(LocationTags.SHIPSANITY_FULL_SHIPMENT in location_table[location.name].tags or + LocationTags.SHIPSANITY_FISH in location_table[location.name].tags) + + def test_include_island_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Cinder Shard", location_names) + self.assertIn("Shipsanity: Bone Fragment", location_names) + self.assertIn("Shipsanity: Radioactive Ore", location_names) + self.assertIn("Shipsanity: Radioactive Bar", location_names) + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + self.assertIn("Shipsanity: Blue Discus", location_names) + self.assertIn("Shipsanity: Lionfish", location_names) + self.assertIn("Shipsanity: Stingray", location_names) + self.assertIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertIn("Shipsanity: Legend II", location_names) + self.assertIn("Shipsanity: Ms. Angler", location_names) + self.assertIn("Shipsanity: Radioactive Carp", location_names) + self.assertIn("Shipsanity: Son of Crimsonfish", location_names) + + +class TestShipsanityFullShipmentWithFishExcludeIsland(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment_with_fish, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + } + + def test_only_full_shipment_and_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertTrue(LocationTags.SHIPSANITY_FULL_SHIPMENT in location_table[location.name].tags or + LocationTags.SHIPSANITY_FISH in location_table[location.name].tags) + + def test_exclude_island_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertNotIn("Shipsanity: Cinder Shard", location_names) + self.assertNotIn("Shipsanity: Radioactive Ore", location_names) + self.assertNotIn("Shipsanity: Radioactive Bar", location_names) + self.assertNotIn("Shipsanity: Banana", location_names) + self.assertNotIn("Shipsanity: Mango", location_names) + self.assertNotIn("Shipsanity: Pineapple", location_names) + self.assertNotIn("Shipsanity: Taro Root", location_names) + self.assertNotIn("Shipsanity: Ginger", location_names) + self.assertNotIn("Shipsanity: Magma Cap", location_names) + self.assertNotIn("Shipsanity: Blue Discus", location_names) + self.assertNotIn("Shipsanity: Lionfish", location_names) + self.assertNotIn("Shipsanity: Stingray", location_names) + self.assertNotIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertNotIn("Shipsanity: Legend II", location_names) + self.assertNotIn("Shipsanity: Ms. Angler", location_names) + self.assertNotIn("Shipsanity: Radioactive Carp", location_names) + self.assertNotIn("Shipsanity: Son of Crimsonfish", location_names) + + +class TestShipsanityFullShipmentWithFishExcludeQiBoard(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment_with_fish, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_only + } + + def test_only_full_shipment_and_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + with self.subTest(location.name): + self.assertTrue(LocationTags.SHIPSANITY_FULL_SHIPMENT in location_table[location.name].tags or + LocationTags.SHIPSANITY_FISH in location_table[location.name].tags) + + def test_exclude_qi_board_items_shipsanity_locations(self): + location_names = [location.name for location in self.multiworld.get_locations(self.player)] + self.assertIn("Shipsanity: Cinder Shard", location_names) + self.assertIn("Shipsanity: Bone Fragment", location_names) + self.assertNotIn("Shipsanity: Radioactive Ore", location_names) + self.assertNotIn("Shipsanity: Radioactive Bar", location_names) + self.assertIn("Shipsanity: Banana", location_names) + self.assertIn("Shipsanity: Mango", location_names) + self.assertIn("Shipsanity: Pineapple", location_names) + self.assertIn("Shipsanity: Taro Root", location_names) + self.assertIn("Shipsanity: Ginger", location_names) + self.assertIn("Shipsanity: Magma Cap", location_names) + self.assertIn("Shipsanity: Blue Discus", location_names) + self.assertIn("Shipsanity: Lionfish", location_names) + self.assertIn("Shipsanity: Stingray", location_names) + self.assertNotIn("Shipsanity: Glacierfish Jr.", location_names) + self.assertNotIn("Shipsanity: Legend II", location_names) + self.assertNotIn("Shipsanity: Ms. Angler", location_names) + self.assertNotIn("Shipsanity: Radioactive Carp", location_names) + self.assertNotIn("Shipsanity: Son of Crimsonfish", location_names) diff --git a/worlds/stardew_valley/test/TestItemLink.py b/worlds/stardew_valley/test/TestItemLink.py index f55ab8ca347d..39bf553cab2d 100644 --- a/worlds/stardew_valley/test/TestItemLink.py +++ b/worlds/stardew_valley/test/TestItemLink.py @@ -9,7 +9,7 @@ class TestItemLinksEverythingIncluded(SVTestBase): options.TrapItems.internal_name: options.TrapItems.option_medium} def test_filler_of_all_types_generated(self): - max_number_filler = 115 + max_number_filler = 114 filler_generated = [] at_least_one_trap = False at_least_one_island = False @@ -60,7 +60,7 @@ class TestItemLinksNoTraps(SVTestBase): options.TrapItems.internal_name: options.TrapItems.option_no_traps} def test_filler_has_no_traps_but_has_island(self): - max_number_filler = 100 + max_number_filler = 99 filler_generated = [] at_least_one_island = False for i in range(0, max_iterations): diff --git a/worlds/stardew_valley/test/TestItems.py b/worlds/stardew_valley/test/TestItems.py index 38f59c74904f..48bc1b152138 100644 --- a/worlds/stardew_valley/test/TestItems.py +++ b/worlds/stardew_valley/test/TestItems.py @@ -1,14 +1,16 @@ -import itertools -import math import sys -import unittest import random -from typing import Set +import sys -from BaseClasses import ItemClassification, MultiWorld -from . import setup_solo_multiworld, SVTestCase, allsanity_options_without_mods -from .. import ItemData, StardewValleyWorld +from BaseClasses import MultiWorld, get_seed +from . import setup_solo_multiworld, SVTestCase, allsanity_options_without_mods, get_minsanity_options +from .. import StardewValleyWorld from ..items import Group, item_table +from ..options import Friendsanity, SeasonRandomization, Museumsanity, Shipsanity, Goal +from ..strings.wallet_item_names import Wallet + +all_seasons = ["Spring", "Summer", "Fall", "Winter"] +all_farms = ["Standard Farm", "Riverland Farm", "Forest Farm", "Hill-top Farm", "Wilderness Farm", "Four Corners Farm", "Beach Farm"] class TestItems(SVTestCase): @@ -33,20 +35,106 @@ def test_items_table_footprint_is_between_717000_and_737000(self): def test_babies_come_in_all_shapes_and_sizes(self): baby_permutations = set() + options = {Friendsanity.internal_name: Friendsanity.option_bachelors} for attempt_number in range(50): if len(baby_permutations) >= 4: print(f"Already got all 4 baby permutations, breaking early [{attempt_number} generations]") break - seed = random.randrange(sys.maxsize) - multiworld = setup_solo_multiworld(seed=seed) + seed = get_seed() + multiworld = setup_solo_multiworld(options, seed=seed, _cache={}) baby_items = [item for item in multiworld.get_items() if "Baby" in item.name] self.assertEqual(len(baby_items), 2) baby_permutations.add(f"{baby_items[0]} - {baby_items[1]}") self.assertEqual(len(baby_permutations), 4) def test_correct_number_of_stardrops(self): - seed = random.randrange(sys.maxsize) allsanity_options = allsanity_options_without_mods() - multiworld = setup_solo_multiworld(allsanity_options, seed=seed) + multiworld = setup_solo_multiworld(allsanity_options) stardrop_items = [item for item in multiworld.get_items() if "Stardrop" in item.name] - self.assertEqual(len(stardrop_items), 5) + self.assertEqual(len(stardrop_items), 7) + + def test_no_duplicate_rings(self): + allsanity_options = allsanity_options_without_mods() + multiworld = setup_solo_multiworld(allsanity_options) + ring_items = [item.name for item in multiworld.get_items() if Group.RING in item_table[item.name].groups] + self.assertEqual(len(ring_items), len(set(ring_items))) + + def test_can_start_in_any_season(self): + starting_seasons_rolled = set() + options = {SeasonRandomization.internal_name: SeasonRandomization.option_randomized} + for attempt_number in range(50): + if len(starting_seasons_rolled) >= 4: + print(f"Already got all 4 starting seasons, breaking early [{attempt_number} generations]") + break + seed = get_seed() + multiworld = setup_solo_multiworld(options, seed=seed, _cache={}) + starting_season_items = [item for item in multiworld.precollected_items[1] if item.name in all_seasons] + season_items = [item for item in multiworld.get_items() if item.name in all_seasons] + self.assertEqual(len(starting_season_items), 1) + self.assertEqual(len(season_items), 3) + starting_seasons_rolled.add(f"{starting_season_items[0]}") + self.assertEqual(len(starting_seasons_rolled), 4) + + def test_can_start_on_any_farm(self): + starting_farms_rolled = set() + for attempt_number in range(60): + if len(starting_farms_rolled) >= 7: + print(f"Already got all 7 farm types, breaking early [{attempt_number} generations]") + break + seed = random.randrange(sys.maxsize) + multiworld = setup_solo_multiworld(seed=seed, _cache={}) + starting_farm = multiworld.worlds[1].fill_slot_data()["farm_type"] + starting_farms_rolled.add(starting_farm) + self.assertEqual(len(starting_farms_rolled), 7) + + +class TestMetalDetectors(SVTestCase): + def test_minsanity_1_metal_detector(self): + options = get_minsanity_options() + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 1) + + def test_museumsanity_2_metal_detector(self): + options = get_minsanity_options().copy() + options[Museumsanity.internal_name] = Museumsanity.option_all + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 2) + + def test_shipsanity_full_shipment_1_metal_detector(self): + options = get_minsanity_options().copy() + options[Shipsanity.internal_name] = Shipsanity.option_full_shipment + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 1) + + def test_shipsanity_everything_2_metal_detector(self): + options = get_minsanity_options().copy() + options[Shipsanity.internal_name] = Shipsanity.option_everything + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 2) + + def test_complete_collection_2_metal_detector(self): + options = get_minsanity_options().copy() + options[Goal.internal_name] = Goal.option_complete_collection + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 2) + + def test_perfection_2_metal_detector(self): + options = get_minsanity_options().copy() + options[Goal.internal_name] = Goal.option_perfection + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 2) + + def test_maxsanity_4_metal_detector(self): + options = get_minsanity_options().copy() + options[Museumsanity.internal_name] = Museumsanity.option_all + options[Shipsanity.internal_name] = Shipsanity.option_everything + options[Goal.internal_name] = Goal.option_perfection + multiworld = setup_solo_multiworld(options) + items = [item.name for item in multiworld.get_items() if item.name == Wallet.metal_detector] + self.assertEquals(len(items), 4) diff --git a/worlds/stardew_valley/test/TestLogic.py b/worlds/stardew_valley/test/TestLogic.py index 7965d05b57be..84d38ffeb449 100644 --- a/worlds/stardew_valley/test/TestLogic.py +++ b/worlds/stardew_valley/test/TestLogic.py @@ -1,11 +1,10 @@ -import unittest +from unittest import TestCase -from test.general import setup_solo_multiworld -from .. import StardewValleyWorld, StardewLocation -from ..data.bundle_data import BundleItem, all_bundle_items_except_money -from ..stardew_rule import MISSING_ITEM, False_ +from . import setup_solo_multiworld, allsanity_options_with_mods +from .assertion import RuleAssertMixin +from ..data.bundle_data import all_bundle_items_except_money -multi_world = setup_solo_multiworld(StardewValleyWorld) +multi_world = setup_solo_multiworld(allsanity_options_with_mods(), _cache={}) world = multi_world.worlds[1] logic = world.logic @@ -18,85 +17,74 @@ def collect_all(mw): collect_all(multi_world) -class TestLogic(unittest.TestCase): +class TestLogic(RuleAssertMixin, TestCase): def test_given_bundle_item_then_is_available_in_logic(self): for bundle_item in all_bundle_items_except_money: - with self.subTest(msg=bundle_item.item.name): - self.assertIn(bundle_item.item.name, logic.item_rules) + with self.subTest(msg=bundle_item.item_name): + self.assertIn(bundle_item.item_name, logic.registry.item_rules) def test_given_item_rule_then_can_be_resolved(self): - for item in logic.item_rules.keys(): + for item in logic.registry.item_rules.keys(): with self.subTest(msg=item): - rule = logic.item_rules[item] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve item rule for {item} {rule}") + rule = logic.registry.item_rules[item] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_building_rule_then_can_be_resolved(self): - for building in logic.building_rules.keys(): + for building in logic.registry.building_rules.keys(): with self.subTest(msg=building): - rule = logic.building_rules[building] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve building rule for {building} {rule}") + rule = logic.registry.building_rules[building] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_quest_rule_then_can_be_resolved(self): - for quest in logic.quest_rules.keys(): + for quest in logic.registry.quest_rules.keys(): with self.subTest(msg=quest): - rule = logic.quest_rules[quest] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve quest rule for {quest} {rule}") + rule = logic.registry.quest_rules[quest] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_special_order_rule_then_can_be_resolved(self): - for special_order in logic.special_order_rules.keys(): + for special_order in logic.registry.special_order_rules.keys(): with self.subTest(msg=special_order): - rule = logic.special_order_rules[special_order] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve special order rule for {special_order} {rule}") + rule = logic.registry.special_order_rules[special_order] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_tree_fruit_rule_then_can_be_resolved(self): - for tree_fruit in logic.tree_fruit_rules.keys(): + for tree_fruit in logic.registry.tree_fruit_rules.keys(): with self.subTest(msg=tree_fruit): - rule = logic.tree_fruit_rules[tree_fruit] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve tree fruit rule for {tree_fruit} {rule}") + rule = logic.registry.tree_fruit_rules[tree_fruit] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_seed_rule_then_can_be_resolved(self): - for seed in logic.seed_rules.keys(): + for seed in logic.registry.seed_rules.keys(): with self.subTest(msg=seed): - rule = logic.seed_rules[seed] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve seed rule for {seed} {rule}") + rule = logic.registry.seed_rules[seed] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_crop_rule_then_can_be_resolved(self): - for crop in logic.crop_rules.keys(): + for crop in logic.registry.crop_rules.keys(): with self.subTest(msg=crop): - rule = logic.crop_rules[crop] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve crop rule for {crop} {rule}") + rule = logic.registry.crop_rules[crop] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_fish_rule_then_can_be_resolved(self): - for fish in logic.fish_rules.keys(): + for fish in logic.registry.fish_rules.keys(): with self.subTest(msg=fish): - rule = logic.fish_rules[fish] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve fish rule for {fish} {rule}") + rule = logic.registry.fish_rules[fish] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_museum_rule_then_can_be_resolved(self): - for donation in logic.museum_rules.keys(): + for donation in logic.registry.museum_rules.keys(): with self.subTest(msg=donation): - rule = logic.museum_rules[donation] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve museum rule for {donation} {rule}") + rule = logic.registry.museum_rules[donation] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_cooking_rule_then_can_be_resolved(self): - for cooking_rule in logic.cooking_rules.keys(): + for cooking_rule in logic.registry.cooking_rules.keys(): with self.subTest(msg=cooking_rule): - rule = logic.cooking_rules[cooking_rule] - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve cooking rule for {cooking_rule} {rule}") + rule = logic.registry.cooking_rules[cooking_rule] + self.assert_rule_can_be_resolved(rule, multi_world.state) def test_given_location_rule_then_can_be_resolved(self): for location in multi_world.get_locations(1): with self.subTest(msg=location.name): rule = location.access_rule - self.assertNotIn(MISSING_ITEM, repr(rule)) - self.assertTrue(rule == False_() or rule(multi_world.state), f"Could not resolve location rule for {location} {rule}") + self.assert_rule_can_be_resolved(rule, multi_world.state) diff --git a/worlds/stardew_valley/test/TestLogicSimplification.py b/worlds/stardew_valley/test/TestLogicSimplification.py deleted file mode 100644 index 3f02643b83dc..000000000000 --- a/worlds/stardew_valley/test/TestLogicSimplification.py +++ /dev/null @@ -1,57 +0,0 @@ -import unittest -from .. import True_ -from ..logic import Received, Has, False_, And, Or - - -class TestSimplification(unittest.TestCase): - def test_simplify_true_in_and(self): - rules = { - "Wood": True_(), - "Rock": True_(), - } - summer = Received("Summer", 0, 1) - self.assertEqual((Has("Wood", rules) & summer & Has("Rock", rules)).simplify(), - summer) - - def test_simplify_false_in_or(self): - rules = { - "Wood": False_(), - "Rock": False_(), - } - summer = Received("Summer", 0, 1) - self.assertEqual((Has("Wood", rules) | summer | Has("Rock", rules)).simplify(), - summer) - - def test_simplify_and_in_and(self): - rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)), - And(Received('Winter', 0, 1), Received('Spring', 0, 1))) - self.assertEqual(rule.simplify(), - And(Received('Summer', 0, 1), Received('Fall', 0, 1), - Received('Winter', 0, 1), Received('Spring', 0, 1))) - - def test_simplify_duplicated_and(self): - rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)), - And(Received('Summer', 0, 1), Received('Fall', 0, 1))) - self.assertEqual(rule.simplify(), - And(Received('Summer', 0, 1), Received('Fall', 0, 1))) - - def test_simplify_or_in_or(self): - rule = Or(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)), - Or(Received('Winter', 0, 1), Received('Spring', 0, 1))) - self.assertEqual(rule.simplify(), - Or(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1), - Received('Spring', 0, 1))) - - def test_simplify_duplicated_or(self): - rule = And(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)), - Or(Received('Summer', 0, 1), Received('Fall', 0, 1))) - self.assertEqual(rule.simplify(), - Or(Received('Summer', 0, 1), Received('Fall', 0, 1))) - - def test_simplify_true_in_or(self): - rule = Or(True_(), Received('Summer', 0, 1)) - self.assertEqual(rule.simplify(), True_()) - - def test_simplify_false_in_and(self): - rule = And(False_(), Received('Summer', 0, 1)) - self.assertEqual(rule.simplify(), False_()) diff --git a/worlds/stardew_valley/test/TestMultiplePlayers.py b/worlds/stardew_valley/test/TestMultiplePlayers.py new file mode 100644 index 000000000000..39be7d6f7ab2 --- /dev/null +++ b/worlds/stardew_valley/test/TestMultiplePlayers.py @@ -0,0 +1,92 @@ +from . import SVTestCase, setup_multiworld +from .. import True_ +from ..options import FestivalLocations, StartingMoney +from ..strings.festival_check_names import FestivalCheck + + +def get_access_rule(multiworld, player: int, location_name: str): + return multiworld.get_location(location_name, player).access_rule + + +class TestDifferentSettings(SVTestCase): + + def test_different_festival_settings(self): + options_no_festivals = {FestivalLocations.internal_name: FestivalLocations.option_disabled} + options_easy_festivals = {FestivalLocations.internal_name: FestivalLocations.option_easy} + options_hard_festivals = {FestivalLocations.internal_name: FestivalLocations.option_hard} + + multiplayer_options = [options_no_festivals, options_easy_festivals, options_hard_festivals] + multiworld = setup_multiworld(multiplayer_options) + + self.check_location_rule(multiworld, 1, FestivalCheck.egg_hunt, False) + self.check_location_rule(multiworld, 2, FestivalCheck.egg_hunt, True, False) + self.check_location_rule(multiworld, 3, FestivalCheck.egg_hunt, True, True) + + def test_different_money_settings(self): + options_no_festivals_unlimited_money = {FestivalLocations.internal_name: FestivalLocations.option_disabled, + StartingMoney.internal_name: -1} + options_no_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_disabled, + StartingMoney.internal_name: 5000} + options_easy_festivals_unlimited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy, + StartingMoney.internal_name: -1} + options_easy_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy, + StartingMoney.internal_name: 5000} + options_hard_festivals_unlimited_money = {FestivalLocations.internal_name: FestivalLocations.option_hard, + StartingMoney.internal_name: -1} + options_hard_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_hard, + StartingMoney.internal_name: 5000} + + multiplayer_options = [options_no_festivals_unlimited_money, options_no_festivals_limited_money, + options_easy_festivals_unlimited_money, options_easy_festivals_limited_money, + options_hard_festivals_unlimited_money, options_hard_festivals_limited_money] + multiworld = setup_multiworld(multiplayer_options) + + self.check_location_rule(multiworld, 1, FestivalCheck.rarecrow_4, False) + self.check_location_rule(multiworld, 2, FestivalCheck.rarecrow_4, False) + + self.check_location_rule(multiworld, 3, FestivalCheck.rarecrow_4, True, True) + self.check_location_rule(multiworld, 4, FestivalCheck.rarecrow_4, True, False) + + self.check_location_rule(multiworld, 5, FestivalCheck.rarecrow_4, True, True) + self.check_location_rule(multiworld, 6, FestivalCheck.rarecrow_4, True, False) + + def test_money_rule_caching(self): + options_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy, + StartingMoney.internal_name: 5000} + options_festivals_limited_money = {FestivalLocations.internal_name: FestivalLocations.option_easy, + StartingMoney.internal_name: 5000} + + multiplayer_options = [options_festivals_limited_money, options_festivals_limited_money] + multiworld = setup_multiworld(multiplayer_options) + + player_1_rarecrow_2 = get_access_rule(multiworld, 1, FestivalCheck.rarecrow_2) + player_1_rarecrow_4 = get_access_rule(multiworld, 1, FestivalCheck.rarecrow_4) + player_2_rarecrow_2 = get_access_rule(multiworld, 2, FestivalCheck.rarecrow_2) + player_2_rarecrow_4 = get_access_rule(multiworld, 2, FestivalCheck.rarecrow_4) + + with self.subTest("Rules are not cached between players"): + self.assertNotEqual(id(player_1_rarecrow_2), id(player_2_rarecrow_2)) + self.assertNotEqual(id(player_1_rarecrow_4), id(player_2_rarecrow_4)) + + with self.subTest("Rules are cached for the same player"): + self.assertEqual(id(player_1_rarecrow_2), id(player_1_rarecrow_4)) + self.assertEqual(id(player_2_rarecrow_2), id(player_2_rarecrow_4)) + + def check_location_rule(self, multiworld, player: int, location_name: str, should_exist: bool, should_be_true: bool = False): + has = "has" if should_exist else "doesn't have" + rule = "without access rule" if should_be_true else f"with access rule" + rule_text = f" {rule}" if should_exist else "" + with self.subTest(f"Player {player} {has} {location_name}{rule_text}"): + locations = multiworld.get_locations(player) + locations_names = {location.name for location in locations} + if not should_exist: + self.assertNotIn(location_name, locations_names) + return None + + self.assertIn(location_name, locations_names) + access_rule = get_access_rule(multiworld, player, location_name) + if should_be_true: + self.assertEqual(access_rule, True_()) + else: + self.assertNotEqual(access_rule, True_()) + return access_rule diff --git a/worlds/stardew_valley/test/TestOptionFlags.py b/worlds/stardew_valley/test/TestOptionFlags.py new file mode 100644 index 000000000000..05e52b40c4bd --- /dev/null +++ b/worlds/stardew_valley/test/TestOptionFlags.py @@ -0,0 +1,105 @@ +from . import SVTestBase +from .. import BuildingProgression +from ..options import ToolProgression + + +class TestBitFlagsVanilla(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_vanilla, + BuildingProgression.internal_name: BuildingProgression.option_vanilla} + + def test_options_are_not_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertFalse(tool_progressive) + self.assertFalse(building_progressive) + + def test_tools_and_buildings_not_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertNotIn("Progressive Coop", item_names) + self.assertNotIn("Progressive Pickaxe", item_names) + + +class TestBitFlagsVanillaCheap(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_vanilla_cheap, + BuildingProgression.internal_name: BuildingProgression.option_vanilla_cheap} + + def test_options_are_not_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertFalse(tool_progressive) + self.assertFalse(building_progressive) + + def test_tools_and_buildings_not_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertNotIn("Progressive Coop", item_names) + self.assertNotIn("Progressive Pickaxe", item_names) + + +class TestBitFlagsVanillaVeryCheap(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_vanilla_very_cheap, + BuildingProgression.internal_name: BuildingProgression.option_vanilla_very_cheap} + + def test_options_are_not_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertFalse(tool_progressive) + self.assertFalse(building_progressive) + + def test_tools_and_buildings_not_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertNotIn("Progressive Coop", item_names) + self.assertNotIn("Progressive Pickaxe", item_names) + + +class TestBitFlagsProgressive(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_progressive, + BuildingProgression.internal_name: BuildingProgression.option_progressive} + + def test_options_are_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertTrue(tool_progressive) + self.assertTrue(building_progressive) + + def test_tools_and_buildings_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertIn("Progressive Coop", item_names) + self.assertIn("Progressive Pickaxe", item_names) + + +class TestBitFlagsProgressiveCheap(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_progressive_cheap, + BuildingProgression.internal_name: BuildingProgression.option_progressive_cheap} + + def test_options_are_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertTrue(tool_progressive) + self.assertTrue(building_progressive) + + def test_tools_and_buildings_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertIn("Progressive Coop", item_names) + self.assertIn("Progressive Pickaxe", item_names) + + +class TestBitFlagsProgressiveVeryCheap(SVTestBase): + options = {ToolProgression.internal_name: ToolProgression.option_progressive_very_cheap, + BuildingProgression.internal_name: BuildingProgression.option_progressive_very_cheap} + + def test_options_are_detected_as_progressive(self): + world_options = self.world.options + tool_progressive = world_options.tool_progression & ToolProgression.option_progressive + building_progressive = world_options.building_progression & BuildingProgression.option_progressive + self.assertTrue(tool_progressive) + self.assertTrue(building_progressive) + + def test_tools_and_buildings_in_pool(self): + item_names = [item.name for item in self.multiworld.itempool] + self.assertIn("Progressive Coop", item_names) + self.assertIn("Progressive Pickaxe", item_names) diff --git a/worlds/stardew_valley/test/TestOptions.py b/worlds/stardew_valley/test/TestOptions.py index ccffc2848a80..d13f9b8a051a 100644 --- a/worlds/stardew_valley/test/TestOptions.py +++ b/worlds/stardew_valley/test/TestOptions.py @@ -1,12 +1,10 @@ import itertools -import unittest -from random import random -from typing import Dict -from BaseClasses import ItemClassification, MultiWorld from Options import NamedRange -from . import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_without_mods, allsanity_options_with_mods -from .. import StardewItem, items_by_group, Group, StardewValleyWorld +from . import setup_solo_multiworld, SVTestCase, allsanity_options_without_mods, allsanity_options_with_mods +from .assertion import WorldAssertMixin +from .long.option_names import all_option_choices +from .. import items_by_group, Group, StardewValleyWorld from ..locations import locations_by_tag, LocationTags, location_table from ..options import ExcludeGingerIsland, ToolProgression, Goal, SeasonRandomization, TrapItems, SpecialOrderLocations, ArcadeMachineLocations from ..strings.goal_names import Goal as GoalName @@ -18,60 +16,26 @@ TOOLS = {"Hoe", "Pickaxe", "Axe", "Watering Can", "Trash Can", "Fishing Rod"} -def assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld): - for item in multiworld.get_items(): - multiworld.state.collect(item) - - tester.assertTrue(multiworld.find_item("Victory", 1).can_reach(multiworld.state)) - - -def basic_checks(tester: unittest.TestCase, multiworld: MultiWorld): - tester.assertIn(StardewItem("Victory", ItemClassification.progression, None, 1), multiworld.get_items()) - assert_can_win(tester, multiworld) - non_event_locations = [location for location in multiworld.get_locations() if not location.event] - tester.assertEqual(len(multiworld.itempool), len(non_event_locations)) - - -def check_no_ginger_island(tester: unittest.TestCase, multiworld: MultiWorld): - ginger_island_items = [item_data.name for item_data in items_by_group[Group.GINGER_ISLAND]] - ginger_island_locations = [location_data.name for location_data in locations_by_tag[LocationTags.GINGER_ISLAND]] - for item in multiworld.get_items(): - tester.assertNotIn(item.name, ginger_island_items) - for location in multiworld.get_locations(): - tester.assertNotIn(location.name, ginger_island_locations) - - -def get_option_choices(option) -> Dict[str, int]: - if issubclass(option, NamedRange): - return option.special_range_names - elif option.options: - return option.options - return {} - - -class TestGenerateDynamicOptions(SVTestCase): +class TestGenerateDynamicOptions(WorldAssertMixin, SVTestCase): def test_given_special_range_when_generate_then_basic_checks(self): options = StardewValleyWorld.options_dataclass.type_hints for option_name, option in options.items(): - if not isinstance(option, NamedRange): + if not issubclass(option, NamedRange): continue for value in option.special_range_names: - with self.subTest(f"{option_name}: {value}"): - choices = {option_name: option.special_range_names[value]} - multiworld = setup_solo_multiworld(choices) - basic_checks(self, multiworld) + world_options = {option_name: option.special_range_names[value]} + with self.solo_world_sub_test(f"{option_name}: {value}", world_options, dirty_state=True) as (multiworld, _): + self.assert_basic_checks(multiworld) def test_given_choice_when_generate_then_basic_checks(self): - seed = int(random() * pow(10, 18) - 1) options = StardewValleyWorld.options_dataclass.type_hints for option_name, option in options.items(): if not option.options: continue for value in option.options: - with self.subTest(f"{option_name}: {value} [Seed: {seed}]"): - world_options = {option_name: option.options[value]} - multiworld = setup_solo_multiworld(world_options, seed) - basic_checks(self, multiworld) + world_options = {option_name: option.options[value]} + with self.solo_world_sub_test(f"{option_name}: {value}", world_options, dirty_state=True) as (multiworld, _): + self.assert_basic_checks(multiworld) class TestGoal(SVTestCase): @@ -84,9 +48,8 @@ def test_given_goal_when_generate_then_victory_is_in_correct_location(self): ("complete_collection", GoalName.complete_museum), ("full_house", GoalName.full_house), ("perfection", GoalName.perfection)]: - with self.subTest(msg=f"Goal: {goal}, Location: {location}"): - world_options = {Goal.internal_name: Goal.options[goal]} - multi_world = setup_solo_multiworld(world_options) + world_options = {Goal.internal_name: Goal.options[goal]} + with self.solo_world_sub_test(f"Goal: {goal}, Location: {location}", world_options) as (multi_world, _): victory = multi_world.find_item("Victory", 1) self.assertEqual(victory.name, location) @@ -148,54 +111,45 @@ def test_given_progressive_when_generate_then_tool_upgrades_are_locations(self): self.assertIn("Purchase Iridium Rod", locations) -class TestGenerateAllOptionsWithExcludeGingerIsland(SVTestCase): - def test_given_special_range_when_generate_exclude_ginger_island(self): - options = StardewValleyWorld.options_dataclass.type_hints - for option_name, option in options.items(): - if not isinstance(option, NamedRange) or option_name == ExcludeGingerIsland.internal_name: - continue - for value in option.special_range_names: - with self.subTest(f"{option_name}: {value}"): - multiworld = setup_solo_multiworld( - {ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, - option_name: option.special_range_names[value]}) - check_no_ginger_island(self, multiworld) +class TestGenerateAllOptionsWithExcludeGingerIsland(WorldAssertMixin, SVTestCase): def test_given_choice_when_generate_exclude_ginger_island(self): - seed = int(random() * pow(10, 18) - 1) - options = StardewValleyWorld.options_dataclass.type_hints - for option_name, option in options.items(): - if not option.options or option_name == ExcludeGingerIsland.internal_name: + for option, option_choice in all_option_choices: + if option is ExcludeGingerIsland: continue - for value in option.options: - with self.subTest(f"{option_name}: {value} [Seed: {seed}]"): - multiworld = setup_solo_multiworld( - {ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, - option_name: option.options[value]}, seed) - stardew_world: StardewValleyWorld = multiworld.worlds[self.player] - if stardew_world.options.exclude_ginger_island != ExcludeGingerIsland.option_true: - continue - basic_checks(self, multiworld) - check_no_ginger_island(self, multiworld) + + world_options = { + ExcludeGingerIsland: ExcludeGingerIsland.option_true, + option: option_choice + } + + with self.solo_world_sub_test(f"{option.internal_name}: {option_choice}", world_options, dirty_state=True) as (multiworld, stardew_world): + + # Some options, like goals, will force Ginger island back in the game. We want to skip testing those. + if stardew_world.options.exclude_ginger_island != ExcludeGingerIsland.option_true: + continue + + self.assert_basic_checks(multiworld) + self.assert_no_ginger_island_content(multiworld) def test_given_island_related_goal_then_override_exclude_ginger_island(self): - island_goals = [value for value in Goal.options if value in ["walnut_hunter", "perfection"]] - island_option = ExcludeGingerIsland - for goal in island_goals: - for value in island_option.options: - with self.subTest(f"Goal: {goal}, {island_option.internal_name}: {value}"): - multiworld = setup_solo_multiworld( - {Goal.internal_name: Goal.options[goal], - island_option.internal_name: island_option.options[value]}) - stardew_world: StardewValleyWorld = multiworld.worlds[self.player] - self.assertEqual(stardew_world.options.exclude_ginger_island, island_option.option_false) - basic_checks(self, multiworld) + island_goals = ["greatest_walnut_hunter", "perfection"] + for goal, exclude_island in itertools.product(island_goals, ExcludeGingerIsland.options): + world_options = { + Goal: goal, + ExcludeGingerIsland: exclude_island + } + + with self.solo_world_sub_test(f"Goal: {goal}, {ExcludeGingerIsland.internal_name}: {exclude_island}", world_options, dirty_state=True) \ + as (multiworld, stardew_world): + self.assertEqual(stardew_world.options.exclude_ginger_island, ExcludeGingerIsland.option_false) + self.assert_basic_checks(multiworld) class TestTraps(SVTestCase): def test_given_no_traps_when_generate_then_no_trap_in_pool(self): - world_options = allsanity_options_without_mods() - world_options.update({TrapItems.internal_name: TrapItems.option_no_traps}) + world_options = allsanity_options_without_mods().copy() + world_options[TrapItems.internal_name] = TrapItems.option_no_traps multi_world = setup_solo_multiworld(world_options) trap_items = [item_data.name for item_data in items_by_group[Group.TRAP]] diff --git a/worlds/stardew_valley/test/TestOptionsPairs.py b/worlds/stardew_valley/test/TestOptionsPairs.py new file mode 100644 index 000000000000..9109c39562ee --- /dev/null +++ b/worlds/stardew_valley/test/TestOptionsPairs.py @@ -0,0 +1,56 @@ +from . import SVTestBase +from .assertion import WorldAssertMixin +from .. import options +from ..options import Goal, QuestLocations + + +class TestCrypticNoteNoQuests(WorldAssertMixin, SVTestBase): + options = { + Goal.internal_name: Goal.option_cryptic_note, + QuestLocations.internal_name: "none" + } + + def test_given_option_pair_then_basic_checks(self): + self.assert_basic_checks(self.multiworld) + + +class TestCompleteCollectionNoQuests(WorldAssertMixin, SVTestBase): + options = { + Goal.internal_name: Goal.option_complete_collection, + QuestLocations.internal_name: "none" + } + + def test_given_option_pair_then_basic_checks(self): + self.assert_basic_checks(self.multiworld) + + +class TestProtectorOfTheValleyNoQuests(WorldAssertMixin, SVTestBase): + options = { + Goal.internal_name: Goal.option_protector_of_the_valley, + QuestLocations.internal_name: "none" + } + + def test_given_option_pair_then_basic_checks(self): + self.assert_basic_checks(self.multiworld) + + +class TestCraftMasterNoQuests(WorldAssertMixin, SVTestBase): + options = { + Goal.internal_name: Goal.option_craft_master, + QuestLocations.internal_name: "none" + } + + def test_given_option_pair_then_basic_checks(self): + self.assert_basic_checks(self.multiworld) + + +class TestCraftMasterNoSpecialOrder(WorldAssertMixin, SVTestBase): + options = { + options.Goal.internal_name: Goal.option_craft_master, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_disabled, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true, + options.Craftsanity.internal_name: options.Craftsanity.option_none + } + + def test_given_option_pair_then_basic_checks(self): + self.assert_basic_checks(self.multiworld) diff --git a/worlds/stardew_valley/test/TestPresets.py b/worlds/stardew_valley/test/TestPresets.py new file mode 100644 index 000000000000..2bb1c7fbaeaf --- /dev/null +++ b/worlds/stardew_valley/test/TestPresets.py @@ -0,0 +1,21 @@ +import builtins +import inspect + +from Options import PerGameCommonOptions, OptionSet +from . import SVTestCase +from .. import sv_options_presets, StardewValleyOptions + + +class TestPresets(SVTestCase): + def test_all_presets_explicitly_set_all_options(self): + all_option_names = {option_key for option_key in StardewValleyOptions.type_hints} + omitted_option_names = {option_key for option_key in PerGameCommonOptions.type_hints} + mandatory_option_names = {option_key for option_key in all_option_names + if option_key not in omitted_option_names and + not issubclass(StardewValleyOptions.type_hints[option_key], OptionSet)} + + for preset_name in sv_options_presets: + with self.subTest(f"{preset_name}"): + for option_name in mandatory_option_names: + with self.subTest(f"{preset_name} -> {option_name}"): + self.assertIn(option_name, sv_options_presets[preset_name]) \ No newline at end of file diff --git a/worlds/stardew_valley/test/TestRegions.py b/worlds/stardew_valley/test/TestRegions.py index 7ebbcece5c2c..0137bab9148b 100644 --- a/worlds/stardew_valley/test/TestRegions.py +++ b/worlds/stardew_valley/test/TestRegions.py @@ -1,11 +1,13 @@ import random -import sys import unittest +from typing import Set -from . import SVTestCase, setup_solo_multiworld -from .. import options, StardewValleyWorld, StardewValleyOptions +from BaseClasses import get_seed +from . import SVTestCase, complete_options_with_default from ..options import EntranceRandomization, ExcludeGingerIsland -from ..regions import vanilla_regions, vanilla_connections, randomize_connections, RandomizationFlag +from ..regions import vanilla_regions, vanilla_connections, randomize_connections, RandomizationFlag, create_final_connections_and_regions +from ..strings.entrance_names import Entrance as EntranceName +from ..strings.region_names import Region as RegionName connections_by_name = {connection.name for connection in vanilla_connections} regions_by_name = {region.name for region in vanilla_regions} @@ -26,78 +28,118 @@ def test_connection_lead_somewhere(self): f"{connection.name} is leading to {connection.destination} but it does not exist.") -class TestEntranceRando(unittest.TestCase): +def explore_connections_tree_up_to_blockers(blocked_entrances: Set[str], connections_by_name, regions_by_name): + explored_entrances = set() + explored_regions = set() + entrances_to_explore = set() + current_node_name = "Menu" + current_node = regions_by_name[current_node_name] + entrances_to_explore.update(current_node.exits) + while entrances_to_explore: + current_entrance_name = entrances_to_explore.pop() + current_entrance = connections_by_name[current_entrance_name] + current_node_name = current_entrance.destination + + explored_entrances.add(current_entrance_name) + explored_regions.add(current_node_name) + + if current_entrance_name in blocked_entrances: + continue + + current_node = regions_by_name[current_node_name] + entrances_to_explore.update({entrance for entrance in current_node.exits if entrance not in explored_entrances}) + return explored_regions + + +class TestEntranceRando(SVTestCase): def test_entrance_randomization(self): - for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), - (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), - (options.EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: - # option = options.EntranceRandomization.option_buildings - # flag = RandomizationFlag.BUILDINGS - # for i in range(0, 100000): - seed = random.randrange(sys.maxsize) + for option, flag in [(EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), + (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), + (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: + sv_options = complete_options_with_default({ + EntranceRandomization.internal_name: option, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false + }) + seed = get_seed() + rand = random.Random(seed) with self.subTest(flag=flag, msg=f"Seed: {seed}"): - rand = random.Random(seed) - world_options = {EntranceRandomization.internal_name: option, - ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false} - multiworld = setup_solo_multiworld(world_options) - regions_by_name = {region.name: region for region in vanilla_regions} - - _, randomized_connections = randomize_connections(rand, multiworld.worlds[1].options, regions_by_name) + entrances, regions = create_final_connections_and_regions(sv_options) + _, randomized_connections = randomize_connections(rand, sv_options, regions, entrances) for connection in vanilla_connections: if flag in connection.flag: connection_in_randomized = connection.name in randomized_connections reverse_in_randomized = connection.reverse in randomized_connections - self.assertTrue(connection_in_randomized, - f"Connection {connection.name} should be randomized but it is not in the output. Seed = {seed}") - self.assertTrue(reverse_in_randomized, - f"Connection {connection.reverse} should be randomized but it is not in the output. Seed = {seed}") + self.assertTrue(connection_in_randomized, f"Connection {connection.name} should be randomized but it is not in the output.") + self.assertTrue(reverse_in_randomized, f"Connection {connection.reverse} should be randomized but it is not in the output.") self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()), - f"Connections are duplicated in randomization. Seed = {seed}") + f"Connections are duplicated in randomization.") def test_entrance_randomization_without_island(self): - for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), - (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), - (options.EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: - with self.subTest(option=option, flag=flag): - seed = random.randrange(sys.maxsize) - rand = random.Random(seed) - world_options = {EntranceRandomization.internal_name: option, - ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true} - multiworld = setup_solo_multiworld(world_options) - regions_by_name = {region.name: region for region in vanilla_regions} - - _, randomized_connections = randomize_connections(rand, multiworld.worlds[1].options, regions_by_name) + for option, flag in [(EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), + (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), + (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: + + sv_options = complete_options_with_default({ + EntranceRandomization.internal_name: option, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + }) + seed = get_seed() + rand = random.Random(seed) + with self.subTest(option=option, flag=flag, seed=seed): + entrances, regions = create_final_connections_and_regions(sv_options) + _, randomized_connections = randomize_connections(rand, sv_options, regions, entrances) for connection in vanilla_connections: if flag in connection.flag: if RandomizationFlag.GINGER_ISLAND in connection.flag: self.assertNotIn(connection.name, randomized_connections, - f"Connection {connection.name} should not be randomized but it is in the output. Seed = {seed}") + f"Connection {connection.name} should not be randomized but it is in the output.") self.assertNotIn(connection.reverse, randomized_connections, - f"Connection {connection.reverse} should not be randomized but it is in the output. Seed = {seed}") + f"Connection {connection.reverse} should not be randomized but it is in the output.") else: self.assertIn(connection.name, randomized_connections, - f"Connection {connection.name} should be randomized but it is not in the output. Seed = {seed}") + f"Connection {connection.name} should be randomized but it is not in the output.") self.assertIn(connection.reverse, randomized_connections, - f"Connection {connection.reverse} should be randomized but it is not in the output. Seed = {seed}") + f"Connection {connection.reverse} should be randomized but it is not in the output.") self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()), - f"Connections are duplicated in randomization. Seed = {seed}") + f"Connections are duplicated in randomization.") + + def test_cannot_put_island_access_on_island(self): + sv_options = complete_options_with_default({ + EntranceRandomization.internal_name: EntranceRandomization.option_buildings, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false + }) + + for i in range(0, 100 if self.skip_long_tests else 10000): + seed = get_seed() + rand = random.Random(seed) + with self.subTest(msg=f"Seed: {seed}"): + entrances, regions = create_final_connections_and_regions(sv_options) + randomized_connections, randomized_data = randomize_connections(rand, sv_options, regions, entrances) + connections_by_name = {connection.name: connection for connection in randomized_connections} + + blocked_entrances = {EntranceName.use_island_obelisk, EntranceName.boat_to_ginger_island} + required_regions = {RegionName.wizard_tower, RegionName.boat_tunnel} + self.assert_can_reach_any_region_before_blockers(required_regions, blocked_entrances, connections_by_name, regions) + + def assert_can_reach_any_region_before_blockers(self, required_regions, blocked_entrances, connections_by_name, regions_by_name): + explored_regions = explore_connections_tree_up_to_blockers(blocked_entrances, connections_by_name, regions_by_name) + self.assertTrue(any(region in explored_regions for region in required_regions)) class TestEntranceClassifications(SVTestCase): def test_non_progression_are_all_accessible_with_empty_inventory(self): - for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), - (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION)]: - seed = random.randrange(sys.maxsize) - with self.subTest(flag=flag, msg=f"Seed: {seed}"): - multiworld_options = {options.EntranceRandomization.internal_name: option} - multiworld = setup_solo_multiworld(multiworld_options, seed) - sv_world: StardewValleyWorld = multiworld.worlds[1] + for option, flag in [(EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), + (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION)]: + world_options = { + EntranceRandomization.internal_name: option + } + with self.solo_world_sub_test(world_options=world_options, flag=flag) as (multiworld, sv_world): ap_entrances = {entrance.name: entrance for entrance in multiworld.get_entrances()} for randomized_entrance in sv_world.randomized_entrances: if randomized_entrance in ap_entrances: @@ -106,3 +148,16 @@ def test_non_progression_are_all_accessible_with_empty_inventory(self): if sv_world.randomized_entrances[randomized_entrance] in ap_entrances: ap_entrance_destination = multiworld.get_entrance(sv_world.randomized_entrances[randomized_entrance], 1) self.assertTrue(ap_entrance_destination.access_rule(multiworld.state)) + + def test_no_ginger_island_entrances_when_excluded(self): + world_options = { + EntranceRandomization.internal_name: EntranceRandomization.option_disabled, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true + } + with self.solo_world_sub_test(world_options=world_options) as (multiworld, _): + ap_entrances = {entrance.name: entrance for entrance in multiworld.get_entrances()} + entrance_data_by_name = {entrance.name: entrance for entrance in vanilla_connections} + for entrance_name in ap_entrances: + entrance_data = entrance_data_by_name[entrance_name] + with self.subTest(f"{entrance_name}: {entrance_data.flag}"): + self.assertFalse(entrance_data.flag & RandomizationFlag.GINGER_ISLAND) diff --git a/worlds/stardew_valley/test/TestRules.py b/worlds/stardew_valley/test/TestRules.py index 0749b1a8f153..0d2fc38a19a3 100644 --- a/worlds/stardew_valley/test/TestRules.py +++ b/worlds/stardew_valley/test/TestRules.py @@ -1,167 +1,166 @@ from collections import Counter from . import SVTestBase -from .. import options +from .. import options, HasProgressionPercent +from ..data.craftable_data import all_crafting_recipes_by_name from ..locations import locations_by_tag, LocationTags, location_table -from ..strings.animal_names import Animal -from ..strings.animal_product_names import AnimalProduct -from ..strings.artisan_good_names import ArtisanGood -from ..strings.crop_names import Vegetable +from ..options import ToolProgression, BuildingProgression, ExcludeGingerIsland, Chefsanity, Craftsanity, Shipsanity, SeasonRandomization, Friendsanity, \ + FriendsanityHeartSize, BundleRandomization, SkillProgression from ..strings.entrance_names import Entrance -from ..strings.food_names import Meal -from ..strings.ingredient_names import Ingredient -from ..strings.machine_names import Machine from ..strings.region_names import Region -from ..strings.season_names import Season -from ..strings.seed_names import Seed class TestProgressiveToolsLogic(SVTestBase): options = { - options.ToolProgression.internal_name: options.ToolProgression.option_progressive, - options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized, + ToolProgression.internal_name: ToolProgression.option_progressive, + SeasonRandomization.internal_name: SeasonRandomization.option_randomized, } - def setUp(self): - super().setUp() + def test_sturgeon(self): self.multiworld.state.prog_items = {1: Counter()} - def test_sturgeon(self): - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + sturgeon_rule = self.world.logic.has("Sturgeon") + self.assert_rule_false(sturgeon_rule, self.multiworld.state) summer = self.world.create_item("Summer") - self.multiworld.state.collect(summer, event=True) - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.multiworld.state.collect(summer, event=False) + self.assert_rule_false(sturgeon_rule, self.multiworld.state) fishing_rod = self.world.create_item("Progressive Fishing Rod") - self.multiworld.state.collect(fishing_rod, event=True) - self.multiworld.state.collect(fishing_rod, event=True) - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.multiworld.state.collect(fishing_rod, event=False) + self.multiworld.state.collect(fishing_rod, event=False) + self.assert_rule_false(sturgeon_rule, self.multiworld.state) fishing_level = self.world.create_item("Fishing Level") - self.multiworld.state.collect(fishing_level, event=True) - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.multiworld.state.collect(fishing_level, event=False) + self.assert_rule_false(sturgeon_rule, self.multiworld.state) - self.multiworld.state.collect(fishing_level, event=True) - self.multiworld.state.collect(fishing_level, event=True) - self.multiworld.state.collect(fishing_level, event=True) - self.multiworld.state.collect(fishing_level, event=True) - self.multiworld.state.collect(fishing_level, event=True) - self.assertTrue(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.multiworld.state.collect(fishing_level, event=False) + self.multiworld.state.collect(fishing_level, event=False) + self.multiworld.state.collect(fishing_level, event=False) + self.multiworld.state.collect(fishing_level, event=False) + self.multiworld.state.collect(fishing_level, event=False) + self.assert_rule_true(sturgeon_rule, self.multiworld.state) self.remove(summer) - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.assert_rule_false(sturgeon_rule, self.multiworld.state) winter = self.world.create_item("Winter") - self.multiworld.state.collect(winter, event=True) - self.assertTrue(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.multiworld.state.collect(winter, event=False) + self.assert_rule_true(sturgeon_rule, self.multiworld.state) self.remove(fishing_rod) - self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state)) + self.assert_rule_false(sturgeon_rule, self.multiworld.state) def test_old_master_cannoli(self): - self.multiworld.state.collect(self.world.create_item("Progressive Axe"), event=True) - self.multiworld.state.collect(self.world.create_item("Progressive Axe"), event=True) - self.multiworld.state.collect(self.world.create_item("Summer"), event=True) + self.multiworld.state.prog_items = {1: Counter()} - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.multiworld.state.collect(self.world.create_item("Progressive Axe"), event=False) + self.multiworld.state.collect(self.world.create_item("Progressive Axe"), event=False) + self.multiworld.state.collect(self.world.create_item("Summer"), event=False) + self.collect_lots_of_money() + + rule = self.world.logic.region.can_reach_location("Old Master Cannoli") + self.assert_rule_false(rule, self.multiworld.state) fall = self.world.create_item("Fall") - self.multiworld.state.collect(fall, event=True) - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.multiworld.state.collect(fall, event=False) + self.assert_rule_false(rule, self.multiworld.state) tuesday = self.world.create_item("Traveling Merchant: Tuesday") - self.multiworld.state.collect(tuesday, event=True) - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.multiworld.state.collect(tuesday, event=False) + self.assert_rule_false(rule, self.multiworld.state) rare_seed = self.world.create_item("Rare Seed") - self.multiworld.state.collect(rare_seed, event=True) - self.assertTrue(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.multiworld.state.collect(rare_seed, event=False) + self.assert_rule_true(rule, self.multiworld.state) self.remove(fall) - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) self.remove(tuesday) green_house = self.world.create_item("Greenhouse") - self.multiworld.state.collect(green_house, event=True) - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.multiworld.state.collect(green_house, event=False) + self.assert_rule_false(rule, self.multiworld.state) friday = self.world.create_item("Traveling Merchant: Friday") - self.multiworld.state.collect(friday, event=True) + self.multiworld.state.collect(friday, event=False) self.assertTrue(self.multiworld.get_location("Old Master Cannoli", 1).access_rule(self.multiworld.state)) self.remove(green_house) - self.assertFalse(self.world.logic.can_reach_location("Old Master Cannoli")(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) self.remove(friday) class TestBundlesLogic(SVTestBase): options = { + BundleRandomization.internal_name: BundleRandomization.option_vanilla } def test_vault_2500g_bundle(self): - self.assertTrue(self.world.logic.can_reach_location("2,500g Bundle")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("2,500g Bundle")(self.multiworld.state)) + + self.collect_lots_of_money() + self.assertTrue(self.world.logic.region.can_reach_location("2,500g Bundle")(self.multiworld.state)) class TestBuildingLogic(SVTestBase): options = { - options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive_early_shipping_bin + BuildingProgression.internal_name: BuildingProgression.option_progressive } def test_coop_blueprint(self): - self.assertFalse(self.world.logic.can_reach_location("Coop Blueprint")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Coop Blueprint")(self.multiworld.state)) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.assertTrue(self.world.logic.can_reach_location("Coop Blueprint")(self.multiworld.state)) + self.collect_lots_of_money() + self.assertTrue(self.world.logic.region.can_reach_location("Coop Blueprint")(self.multiworld.state)) def test_big_coop_blueprint(self): - self.assertFalse(self.world.logic.can_reach_location("Big Coop Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") + big_coop_blueprint_rule = self.world.logic.region.can_reach_location("Big Coop Blueprint") + self.assertFalse(big_coop_blueprint_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.assertFalse(self.world.logic.can_reach_location("Big Coop Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") + self.collect_lots_of_money() + self.assertFalse(big_coop_blueprint_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") - self.multiworld.state.collect(self.world.create_item("Progressive Coop"), event=True) - self.assertTrue(self.world.logic.can_reach_location("Big Coop Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") + self.multiworld.state.collect(self.world.create_item("Can Construct Buildings"), event=True) + self.assertFalse(big_coop_blueprint_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") + + self.multiworld.state.collect(self.world.create_item("Progressive Coop"), event=False) + self.assertTrue(big_coop_blueprint_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Coop Blueprint', self.player).access_rule)}") def test_deluxe_coop_blueprint(self): - self.assertFalse(self.world.logic.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.assertFalse(self.world.logic.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) + self.collect_lots_of_money() + self.multiworld.state.collect(self.world.create_item("Can Construct Buildings"), event=True) + self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) self.multiworld.state.collect(self.world.create_item("Progressive Coop"), event=True) - self.assertFalse(self.world.logic.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) self.multiworld.state.collect(self.world.create_item("Progressive Coop"), event=True) - self.assertTrue(self.world.logic.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach_location("Deluxe Coop Blueprint")(self.multiworld.state)) def test_big_shed_blueprint(self): - self.assertFalse(self.world.logic.can_reach_location("Big Shed Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") - - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.multiworld.state.collect(self.world.create_item("Month End"), event=True) - self.assertFalse(self.world.logic.can_reach_location("Big Shed Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") + big_shed_rule = self.world.logic.region.can_reach_location("Big Shed Blueprint") + self.assertFalse(big_shed_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") + + self.collect_lots_of_money() + self.assertFalse(big_shed_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") + + self.multiworld.state.collect(self.world.create_item("Can Construct Buildings"), event=True) + self.assertFalse(big_shed_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") self.multiworld.state.collect(self.world.create_item("Progressive Shed"), event=True) - self.assertTrue(self.world.logic.can_reach_location("Big Shed Blueprint")(self.multiworld.state), - f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") + self.assertTrue(big_shed_rule(self.multiworld.state), + f"Rule is {repr(self.multiworld.get_location('Big Shed Blueprint', self.player).access_rule)}") class TestArcadeMachinesLogic(SVTestBase): @@ -170,10 +169,10 @@ class TestArcadeMachinesLogic(SVTestBase): } def test_prairie_king(self): - self.assertFalse(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) boots = self.world.create_item("JotPK: Progressive Boots") gun = self.world.create_item("JotPK: Progressive Gun") @@ -183,19 +182,19 @@ def test_prairie_king(self): self.multiworld.state.collect(boots, event=True) self.multiworld.state.collect(gun, event=True) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) self.remove(boots) self.remove(gun) self.multiworld.state.collect(boots, event=True) self.multiworld.state.collect(boots, event=True) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) self.remove(boots) self.remove(boots) @@ -203,10 +202,10 @@ def test_prairie_king(self): self.multiworld.state.collect(gun, event=True) self.multiworld.state.collect(ammo, event=True) self.multiworld.state.collect(life, event=True) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) self.remove(boots) self.remove(gun) self.remove(ammo) @@ -219,10 +218,10 @@ def test_prairie_king(self): self.multiworld.state.collect(ammo, event=True) self.multiworld.state.collect(life, event=True) self.multiworld.state.collect(drop, event=True) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertFalse(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) self.remove(boots) self.remove(gun) self.remove(gun) @@ -242,10 +241,10 @@ def test_prairie_king(self): self.multiworld.state.collect(ammo, event=True) self.multiworld.state.collect(life, event=True) self.multiworld.state.collect(drop, event=True) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 1")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 2")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_region("JotPK World 3")(self.multiworld.state)) - self.assertTrue(self.world.logic.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 1")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 2")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach("JotPK World 3")(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach_location("Journey of the Prairie King Victory")(self.multiworld.state)) self.remove(boots) self.remove(boots) self.remove(gun) @@ -261,116 +260,272 @@ def test_prairie_king(self): class TestWeaponsLogic(SVTestBase): options = { - options.ToolProgression.internal_name: options.ToolProgression.option_progressive, + ToolProgression.internal_name: ToolProgression.option_progressive, options.SkillProgression.internal_name: options.SkillProgression.option_progressive, } def test_mine(self): - self.collect(self.world.create_item("Adventurer's Guild")) self.multiworld.state.collect(self.world.create_item("Progressive Pickaxe"), event=True) self.multiworld.state.collect(self.world.create_item("Progressive Pickaxe"), event=True) self.multiworld.state.collect(self.world.create_item("Progressive Pickaxe"), event=True) self.multiworld.state.collect(self.world.create_item("Progressive Pickaxe"), event=True) self.collect([self.world.create_item("Combat Level")] * 10) + self.collect([self.world.create_item("Mining Level")] * 10) self.collect([self.world.create_item("Progressive Mine Elevator")] * 24) self.multiworld.state.collect(self.world.create_item("Bus Repair"), event=True) self.multiworld.state.collect(self.world.create_item("Skull Key"), event=True) - self.GiveItemAndCheckReachableMine("Rusty Sword", 1) - self.GiveItemAndCheckReachableMine("Wooden Blade", 1) - self.GiveItemAndCheckReachableMine("Elf Blade", 1) + self.GiveItemAndCheckReachableMine("Progressive Sword", 1) + self.GiveItemAndCheckReachableMine("Progressive Dagger", 1) + self.GiveItemAndCheckReachableMine("Progressive Club", 1) - self.GiveItemAndCheckReachableMine("Silver Saber", 2) - self.GiveItemAndCheckReachableMine("Crystal Dagger", 2) + self.GiveItemAndCheckReachableMine("Progressive Sword", 2) + self.GiveItemAndCheckReachableMine("Progressive Dagger", 2) + self.GiveItemAndCheckReachableMine("Progressive Club", 2) - self.GiveItemAndCheckReachableMine("Claymore", 3) - self.GiveItemAndCheckReachableMine("Obsidian Edge", 3) - self.GiveItemAndCheckReachableMine("Bone Sword", 3) + self.GiveItemAndCheckReachableMine("Progressive Sword", 3) + self.GiveItemAndCheckReachableMine("Progressive Dagger", 3) + self.GiveItemAndCheckReachableMine("Progressive Club", 3) - self.GiveItemAndCheckReachableMine("The Slammer", 4) - self.GiveItemAndCheckReachableMine("Lava Katana", 4) + self.GiveItemAndCheckReachableMine("Progressive Sword", 4) + self.GiveItemAndCheckReachableMine("Progressive Dagger", 4) + self.GiveItemAndCheckReachableMine("Progressive Club", 4) - self.GiveItemAndCheckReachableMine("Galaxy Sword", 5) - self.GiveItemAndCheckReachableMine("Galaxy Hammer", 5) - self.GiveItemAndCheckReachableMine("Galaxy Dagger", 5) + self.GiveItemAndCheckReachableMine("Progressive Sword", 5) + self.GiveItemAndCheckReachableMine("Progressive Dagger", 5) + self.GiveItemAndCheckReachableMine("Progressive Club", 5) def GiveItemAndCheckReachableMine(self, item_name: str, reachable_level: int): item = self.multiworld.create_item(item_name, self.player) self.multiworld.state.collect(item, event=True) + rule = self.world.logic.mine.can_mine_in_the_mines_floor_1_40() if reachable_level > 0: - self.assertTrue(self.world.logic.can_mine_in_the_mines_floor_1_40()(self.multiworld.state)) + self.assert_rule_true(rule, self.multiworld.state) else: - self.assertFalse(self.world.logic.can_mine_in_the_mines_floor_1_40()(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) + rule = self.world.logic.mine.can_mine_in_the_mines_floor_41_80() if reachable_level > 1: - self.assertTrue(self.world.logic.can_mine_in_the_mines_floor_41_80()(self.multiworld.state)) + self.assert_rule_true(rule, self.multiworld.state) else: - self.assertFalse(self.world.logic.can_mine_in_the_mines_floor_41_80()(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) + rule = self.world.logic.mine.can_mine_in_the_mines_floor_81_120() if reachable_level > 2: - self.assertTrue(self.world.logic.can_mine_in_the_mines_floor_81_120()(self.multiworld.state)) + self.assert_rule_true(rule, self.multiworld.state) else: - self.assertFalse(self.world.logic.can_mine_in_the_mines_floor_81_120()(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) + rule = self.world.logic.mine.can_mine_in_the_skull_cavern() if reachable_level > 3: - self.assertTrue(self.world.logic.can_mine_in_the_skull_cavern()(self.multiworld.state)) + self.assert_rule_true(rule, self.multiworld.state) else: - self.assertFalse(self.world.logic.can_mine_in_the_skull_cavern()(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) + rule = self.world.logic.ability.can_mine_perfectly_in_the_skull_cavern() if reachable_level > 4: - self.assertTrue(self.world.logic.can_mine_perfectly_in_the_skull_cavern()(self.multiworld.state)) + self.assert_rule_true(rule, self.multiworld.state) else: - self.assertFalse(self.world.logic.can_mine_perfectly_in_the_skull_cavern()(self.multiworld.state)) + self.assert_rule_false(rule, self.multiworld.state) - self.remove(item) +class TestRecipeLearnLogic(SVTestBase): + options = { + BuildingProgression.internal_name: BuildingProgression.option_progressive, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.Cooksanity.internal_name: options.Cooksanity.option_all, + Chefsanity.internal_name: Chefsanity.option_none, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + } -class TestRecipeLogic(SVTestBase): + def test_can_learn_qos_recipe(self): + location = "Cook Radish Salad" + rule = self.world.logic.region.can_reach_location(location) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Progressive House"), event=False) + self.multiworld.state.collect(self.world.create_item("Radish Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Spring"), event=False) + self.multiworld.state.collect(self.world.create_item("Summer"), event=False) + self.collect_lots_of_money() + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("The Queen of Sauce"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + +class TestRecipeReceiveLogic(SVTestBase): options = { - options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive, - options.SkillProgression.internal_name: options.SkillProgression.option_progressive, + BuildingProgression.internal_name: BuildingProgression.option_progressive, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.Cooksanity.internal_name: options.Cooksanity.option_all, + Chefsanity.internal_name: Chefsanity.option_all, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + } + + def test_can_learn_qos_recipe(self): + location = "Cook Radish Salad" + rule = self.world.logic.region.can_reach_location(location) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Progressive House"), event=False) + self.multiworld.state.collect(self.world.create_item("Radish Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Summer"), event=False) + self.collect_lots_of_money() + self.assert_rule_false(rule, self.multiworld.state) + + spring = self.world.create_item("Spring") + qos = self.world.create_item("The Queen of Sauce") + self.multiworld.state.collect(spring, event=False) + self.multiworld.state.collect(qos, event=False) + self.assert_rule_false(rule, self.multiworld.state) + self.multiworld.state.remove(spring) + self.multiworld.state.remove(qos) + + self.multiworld.state.collect(self.world.create_item("Radish Salad Recipe"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + def test_get_chefsanity_check_recipe(self): + location = "Radish Salad Recipe" + rule = self.world.logic.region.can_reach_location(location) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Spring"), event=False) + self.collect_lots_of_money() + self.assert_rule_false(rule, self.multiworld.state) + + seeds = self.world.create_item("Radish Seeds") + summer = self.world.create_item("Summer") + house = self.world.create_item("Progressive House") + self.multiworld.state.collect(seeds, event=False) + self.multiworld.state.collect(summer, event=False) + self.multiworld.state.collect(house, event=False) + self.assert_rule_false(rule, self.multiworld.state) + self.multiworld.state.remove(seeds) + self.multiworld.state.remove(summer) + self.multiworld.state.remove(house) + + self.multiworld.state.collect(self.world.create_item("The Queen of Sauce"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + +class TestCraftsanityLogic(SVTestBase): + options = { + BuildingProgression.internal_name: BuildingProgression.option_progressive, options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + Craftsanity.internal_name: Craftsanity.option_all, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, } - # I wanted to make a test for different ways to obtain a pizza, but I'm stuck not knowing how to block the immediate purchase from Gus - # def test_pizza(self): - # world = self.world - # logic = world.logic - # multiworld = self.multiworld - # - # self.assertTrue(logic.has(Ingredient.wheat_flour)(multiworld.state)) - # self.assertTrue(logic.can_spend_money_at(Region.saloon, 150)(multiworld.state)) - # self.assertFalse(logic.has(Meal.pizza)(multiworld.state)) - # - # self.assertFalse(logic.can_cook()(multiworld.state)) - # self.collect(world.create_item("Progressive House")) - # self.assertTrue(logic.can_cook()(multiworld.state)) - # self.assertFalse(logic.has(Meal.pizza)(multiworld.state)) - # - # self.assertFalse(logic.has(Seed.tomato)(multiworld.state)) - # self.collect(world.create_item(Seed.tomato)) - # self.assertTrue(logic.has(Seed.tomato)(multiworld.state)) - # self.assertFalse(logic.has(Meal.pizza)(multiworld.state)) - # - # self.assertFalse(logic.has(Vegetable.tomato)(multiworld.state)) - # self.collect(world.create_item(Season.summer)) - # self.assertTrue(logic.has(Vegetable.tomato)(multiworld.state)) - # self.assertFalse(logic.has(Meal.pizza)(multiworld.state)) - # - # self.assertFalse(logic.has(Animal.cow)(multiworld.state)) - # self.assertFalse(logic.has(AnimalProduct.cow_milk)(multiworld.state)) - # self.collect(world.create_item("Progressive Barn")) - # self.assertTrue(logic.has(Animal.cow)(multiworld.state)) - # self.assertTrue(logic.has(AnimalProduct.cow_milk)(multiworld.state)) - # self.assertFalse(logic.has(Meal.pizza)(multiworld.state)) - # - # self.assertFalse(logic.has(Machine.cheese_press)(self.multiworld.state)) - # self.assertFalse(logic.has(ArtisanGood.cheese)(self.multiworld.state)) - # self.collect(world.create_item(item) for item in ["Farming Level"] * 6) - # self.collect(world.create_item(item) for item in ["Progressive Axe"] * 2) - # self.assertTrue(logic.has(Machine.cheese_press)(self.multiworld.state)) - # self.assertTrue(logic.has(ArtisanGood.cheese)(self.multiworld.state)) - # self.assertTrue(logic.has(Meal.pizza)(self.multiworld.state)) + def test_can_craft_recipe(self): + location = "Craft Marble Brazier" + rule = self.world.logic.region.can_reach_location(location) + self.collect([self.world.create_item("Progressive Pickaxe")] * 4) + self.collect([self.world.create_item("Progressive Fishing Rod")] * 4) + self.collect([self.world.create_item("Progressive Sword")] * 4) + self.collect([self.world.create_item("Progressive Mine Elevator")] * 24) + self.collect([self.world.create_item("Mining Level")] * 10) + self.collect([self.world.create_item("Combat Level")] * 10) + self.collect([self.world.create_item("Fishing Level")] * 10) + self.collect_all_the_money() + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Marble Brazier Recipe"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + def test_can_learn_crafting_recipe(self): + location = "Marble Brazier Recipe" + rule = self.world.logic.region.can_reach_location(location) + self.assert_rule_false(rule, self.multiworld.state) + + self.collect_lots_of_money() + self.assert_rule_true(rule, self.multiworld.state) + + def test_can_craft_festival_recipe(self): + recipe = all_crafting_recipes_by_name["Jack-O-Lantern"] + self.multiworld.state.collect(self.world.create_item("Pumpkin Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Torch Recipe"), event=False) + self.collect_lots_of_money() + rule = self.world.logic.crafting.can_craft(recipe) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Fall"), event=False) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Jack-O-Lantern Recipe"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + +class TestCraftsanityWithFestivalsLogic(SVTestBase): + options = { + BuildingProgression.internal_name: BuildingProgression.option_progressive, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.FestivalLocations.internal_name: options.FestivalLocations.option_easy, + Craftsanity.internal_name: Craftsanity.option_all, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + } + + def test_can_craft_festival_recipe(self): + recipe = all_crafting_recipes_by_name["Jack-O-Lantern"] + self.multiworld.state.collect(self.world.create_item("Pumpkin Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Fall"), event=False) + self.collect_lots_of_money() + rule = self.world.logic.crafting.can_craft(recipe) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Jack-O-Lantern Recipe"), event=False) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Torch Recipe"), event=False) + self.assert_rule_true(rule, self.multiworld.state) + + +class TestNoCraftsanityLogic(SVTestBase): + options = { + BuildingProgression.internal_name: BuildingProgression.option_progressive, + SeasonRandomization.internal_name: SeasonRandomization.option_progressive, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.FestivalLocations.internal_name: options.FestivalLocations.option_disabled, + Craftsanity.internal_name: Craftsanity.option_none, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + } + + def test_can_craft_recipe(self): + recipe = all_crafting_recipes_by_name["Wood Floor"] + rule = self.world.logic.crafting.can_craft(recipe) + self.assert_rule_true(rule, self.multiworld.state) + + def test_can_craft_festival_recipe(self): + recipe = all_crafting_recipes_by_name["Jack-O-Lantern"] + self.multiworld.state.collect(self.world.create_item("Pumpkin Seeds"), event=False) + self.collect_lots_of_money() + rule = self.world.logic.crafting.can_craft(recipe) + result = rule(self.multiworld.state) + self.assertFalse(result) + + self.collect([self.world.create_item("Progressive Season")] * 2) + self.assert_rule_true(rule, self.multiworld.state) + + +class TestNoCraftsanityWithFestivalsLogic(SVTestBase): + options = { + BuildingProgression.internal_name: BuildingProgression.option_progressive, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.FestivalLocations.internal_name: options.FestivalLocations.option_easy, + Craftsanity.internal_name: Craftsanity.option_none, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, + } + + def test_can_craft_festival_recipe(self): + recipe = all_crafting_recipes_by_name["Jack-O-Lantern"] + self.multiworld.state.collect(self.world.create_item("Pumpkin Seeds"), event=False) + self.multiworld.state.collect(self.world.create_item("Fall"), event=False) + self.collect_lots_of_money() + rule = self.world.logic.crafting.can_craft(recipe) + self.assert_rule_false(rule, self.multiworld.state) + + self.multiworld.state.collect(self.world.create_item("Jack-O-Lantern Recipe"), event=False) + self.assert_rule_true(rule, self.multiworld.state) class TestDonationLogicAll(SVTestBase): @@ -379,17 +534,17 @@ class TestDonationLogicAll(SVTestBase): } def test_cannot_make_any_donation_without_museum_access(self): - guild_item = "Adventurer's Guild" - swap_museum_and_guild(self.multiworld, self.player) - collect_all_except(self.multiworld, guild_item) + railroad_item = "Railroad Boulder Removed" + swap_museum_and_bathhouse(self.multiworld, self.player) + collect_all_except(self.multiworld, railroad_item) for donation in locations_by_tag[LocationTags.MUSEUM_DONATIONS]: - self.assertFalse(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) - self.multiworld.state.collect(self.world.create_item(guild_item), event=True) + self.multiworld.state.collect(self.world.create_item(railroad_item), event=False) for donation in locations_by_tag[LocationTags.MUSEUM_DONATIONS]: - self.assertTrue(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) class TestDonationLogicRandomized(SVTestBase): @@ -398,18 +553,19 @@ class TestDonationLogicRandomized(SVTestBase): } def test_cannot_make_any_donation_without_museum_access(self): - guild_item = "Adventurer's Guild" - swap_museum_and_guild(self.multiworld, self.player) - collect_all_except(self.multiworld, guild_item) - donation_locations = [location for location in self.multiworld.get_locations() if not location.event and LocationTags.MUSEUM_DONATIONS in location_table[location.name].tags] + railroad_item = "Railroad Boulder Removed" + swap_museum_and_bathhouse(self.multiworld, self.player) + collect_all_except(self.multiworld, railroad_item) + donation_locations = [location for location in self.multiworld.get_locations() if + not location.event and LocationTags.MUSEUM_DONATIONS in location_table[location.name].tags] for donation in donation_locations: - self.assertFalse(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) - self.multiworld.state.collect(self.world.create_item(guild_item), event=True) + self.multiworld.state.collect(self.world.create_item(railroad_item), event=False) for donation in donation_locations: - self.assertTrue(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) class TestDonationLogicMilestones(SVTestBase): @@ -418,26 +574,26 @@ class TestDonationLogicMilestones(SVTestBase): } def test_cannot_make_any_donation_without_museum_access(self): - guild_item = "Adventurer's Guild" - swap_museum_and_guild(self.multiworld, self.player) - collect_all_except(self.multiworld, guild_item) + railroad_item = "Railroad Boulder Removed" + swap_museum_and_bathhouse(self.multiworld, self.player) + collect_all_except(self.multiworld, railroad_item) for donation in locations_by_tag[LocationTags.MUSEUM_MILESTONES]: - self.assertFalse(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertFalse(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) - self.multiworld.state.collect(self.world.create_item(guild_item), event=True) + self.multiworld.state.collect(self.world.create_item(railroad_item), event=False) for donation in locations_by_tag[LocationTags.MUSEUM_MILESTONES]: - self.assertTrue(self.world.logic.can_reach_location(donation.name)(self.multiworld.state)) + self.assertTrue(self.world.logic.region.can_reach_location(donation.name)(self.multiworld.state)) -def swap_museum_and_guild(multiworld, player): +def swap_museum_and_bathhouse(multiworld, player): museum_region = multiworld.get_region(Region.museum, player) - guild_region = multiworld.get_region(Region.adventurer_guild, player) + bathhouse_region = multiworld.get_region(Region.bathhouse_entrance, player) museum_entrance = multiworld.get_entrance(Entrance.town_to_museum, player) - guild_entrance = multiworld.get_entrance(Entrance.mountain_to_adventurer_guild, player) - museum_entrance.connect(guild_region) - guild_entrance.connect(museum_region) + bathhouse_entrance = multiworld.get_entrance(Entrance.enter_bathhouse_entrance, player) + museum_entrance.connect(bathhouse_region) + bathhouse_entrance.connect(museum_region) def collect_all_except(multiworld, item_to_not_collect: str): @@ -448,22 +604,19 @@ def collect_all_except(multiworld, item_to_not_collect: str): class TestFriendsanityDatingRules(SVTestBase): options = { - options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized_not_winter, - options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, - options.FriendsanityHeartSize.internal_name: 3 + SeasonRandomization.internal_name: SeasonRandomization.option_randomized_not_winter, + Friendsanity.internal_name: Friendsanity.option_all_with_marriage, + FriendsanityHeartSize.internal_name: 3 } def test_earning_dating_heart_requires_dating(self): - month_name = "Month End" - for i in range(12): - month_item = self.world.create_item(month_name) - self.multiworld.state.collect(month_item, event=True) + self.collect_all_the_money() + self.multiworld.state.collect(self.world.create_item("Fall"), event=False) self.multiworld.state.collect(self.world.create_item("Beach Bridge"), event=False) self.multiworld.state.collect(self.world.create_item("Progressive House"), event=False) - self.multiworld.state.collect(self.world.create_item("Adventurer's Guild"), event=False) - self.multiworld.state.collect(self.world.create_item("Galaxy Hammer"), event=False) for i in range(3): self.multiworld.state.collect(self.world.create_item("Progressive Pickaxe"), event=False) + self.multiworld.state.collect(self.world.create_item("Progressive Weapon"), event=False) self.multiworld.state.collect(self.world.create_item("Progressive Axe"), event=False) self.multiworld.state.collect(self.world.create_item("Progressive Barn"), event=False) for i in range(10): @@ -495,12 +648,102 @@ def assert_can_reach_heart_up_to(self, npc: str, max_reachable: int, step: int): if i % step != 0 and i != 14: continue location = f"{prefix}{npc} {i}{suffix}" - can_reach = self.world.logic.can_reach_location(location)(self.multiworld.state) + can_reach = self.world.logic.region.can_reach_location(location)(self.multiworld.state) self.assertTrue(can_reach, f"Should be able to earn relationship up to {i} hearts") for i in range(max_reachable + 1, 14 + 1): if i % step != 0 and i != 14: continue location = f"{prefix}{npc} {i}{suffix}" - can_reach = self.world.logic.can_reach_location(location)(self.multiworld.state) + can_reach = self.world.logic.region.can_reach_location(location)(self.multiworld.state) self.assertFalse(can_reach, f"Should not be able to earn relationship up to {i} hearts") + +class TestShipsanityNone(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_none + } + + def test_no_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event: + self.assertFalse("Shipsanity" in location.name) + self.assertNotIn(LocationTags.SHIPSANITY, location_table[location.name].tags) + + +class TestShipsanityCrops(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_crops + } + + def test_only_crop_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + self.assertIn(LocationTags.SHIPSANITY_CROP, location_table[location.name].tags) + + +class TestShipsanityFish(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_fish + } + + def test_only_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + self.assertIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + +class TestShipsanityFullShipment(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment + } + + def test_only_full_shipment_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + self.assertIn(LocationTags.SHIPSANITY_FULL_SHIPMENT, location_table[location.name].tags) + self.assertNotIn(LocationTags.SHIPSANITY_FISH, location_table[location.name].tags) + + +class TestShipsanityFullShipmentWithFish(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_full_shipment_with_fish + } + + def test_only_full_shipment_and_fish_shipsanity_locations(self): + for location in self.multiworld.get_locations(self.player): + if not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags: + self.assertTrue(LocationTags.SHIPSANITY_FULL_SHIPMENT in location_table[location.name].tags or + LocationTags.SHIPSANITY_FISH in location_table[location.name].tags) + + +class TestShipsanityEverything(SVTestBase): + options = { + Shipsanity.internal_name: Shipsanity.option_everything, + BuildingProgression.internal_name: BuildingProgression.option_progressive + } + + def test_all_shipsanity_locations_require_shipping_bin(self): + bin_name = "Shipping Bin" + collect_all_except(self.multiworld, bin_name) + shipsanity_locations = [location for location in self.multiworld.get_locations() if + not location.event and LocationTags.SHIPSANITY in location_table[location.name].tags] + bin_item = self.world.create_item(bin_name) + for location in shipsanity_locations: + with self.subTest(location.name): + self.remove(bin_item) + self.assertFalse(self.world.logic.region.can_reach_location(location.name)(self.multiworld.state)) + self.multiworld.state.collect(bin_item, event=False) + shipsanity_rule = self.world.logic.region.can_reach_location(location.name) + self.assert_rule_true(shipsanity_rule, self.multiworld.state) + self.remove(bin_item) + + +class TestVanillaSkillLogicSimplification(SVTestBase): + options = { + SkillProgression.internal_name: SkillProgression.option_vanilla, + ToolProgression.internal_name: ToolProgression.option_progressive, + } + + def test_skill_logic_has_level_only_uses_one_has_progression_percent(self): + rule = self.multiworld.worlds[1].logic.skill.has_level("Farming", 8) + self.assertEqual(1, sum(1 for i in rule.current_rules if type(i) == HasProgressionPercent)) diff --git a/worlds/stardew_valley/test/TestStardewRule.py b/worlds/stardew_valley/test/TestStardewRule.py new file mode 100644 index 000000000000..89317d90e4e2 --- /dev/null +++ b/worlds/stardew_valley/test/TestStardewRule.py @@ -0,0 +1,244 @@ +import unittest +from unittest.mock import MagicMock, Mock + +from ..stardew_rule import Received, And, Or, HasProgressionPercent, false_, true_ + + +class TestSimplification(unittest.TestCase): + """ + Those feature of simplifying the rules when they are built have proven to improve the fill speed considerably. + """ + + def test_simplify_and_and_and(self): + rule = And(Received('Summer', 0, 1), Received('Fall', 0, 1)) & And(Received('Winter', 0, 1), Received('Spring', 0, 1)) + + self.assertEqual(And(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1), Received('Spring', 0, 1)), rule) + + def test_simplify_and_in_and(self): + rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)), And(Received('Winter', 0, 1), Received('Spring', 0, 1))) + self.assertEqual(And(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1), Received('Spring', 0, 1)), rule) + + def test_simplify_duplicated_and(self): + # This only works because "Received"s are combinable. + rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)), And(Received('Summer', 0, 1), Received('Fall', 0, 1))) + self.assertEqual(And(Received('Summer', 0, 1), Received('Fall', 0, 1)), rule) + + def test_simplify_or_or_or(self): + rule = Or(Received('Summer', 0, 1), Received('Fall', 0, 1)) | Or(Received('Winter', 0, 1), Received('Spring', 0, 1)) + self.assertEqual(Or(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1), Received('Spring', 0, 1)), rule) + + def test_simplify_or_in_or(self): + rule = Or(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)), Or(Received('Winter', 0, 1), Received('Spring', 0, 1))) + self.assertEqual(Or(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1), Received('Spring', 0, 1)), rule) + + def test_simplify_duplicated_or(self): + rule = Or(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)), Or(Received('Summer', 0, 1), Received('Fall', 0, 1))) + self.assertEqual(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)), rule) + + +class TestHasProgressionPercentSimplification(unittest.TestCase): + def test_has_progression_percent_and_uses_max(self): + rule = HasProgressionPercent(1, 20) & HasProgressionPercent(1, 10) + self.assertEqual(rule, HasProgressionPercent(1, 20)) + + def test_has_progression_percent_or_uses_min(self): + rule = HasProgressionPercent(1, 20) | HasProgressionPercent(1, 10) + self.assertEqual(rule, HasProgressionPercent(1, 10)) + + def test_and_between_progression_percent_and_other_progression_percent_uses_max(self): + cases = [ + And(HasProgressionPercent(1, 10)) & HasProgressionPercent(1, 20), + HasProgressionPercent(1, 10) & And(HasProgressionPercent(1, 20)), + And(HasProgressionPercent(1, 20)) & And(HasProgressionPercent(1, 10)), + ] + for i, case in enumerate(cases): + with self.subTest(f"{i} {repr(case)}"): + self.assertEqual(case, And(HasProgressionPercent(1, 20))) + + def test_or_between_progression_percent_and_other_progression_percent_uses_max(self): + cases = [ + Or(HasProgressionPercent(1, 10)) | HasProgressionPercent(1, 20), + HasProgressionPercent(1, 10) | Or(HasProgressionPercent(1, 20)), + Or(HasProgressionPercent(1, 20)) | Or(HasProgressionPercent(1, 10)) + ] + for i, case in enumerate(cases): + with self.subTest(f"{i} {repr(case)}"): + self.assertEqual(case, Or(HasProgressionPercent(1, 10))) + + +class TestEvaluateWhileSimplifying(unittest.TestCase): + def test_propagate_evaluate_while_simplifying(self): + expected_result = True + collection_state = MagicMock() + other_rule = MagicMock() + other_rule.evaluate_while_simplifying = Mock(return_value=(other_rule, expected_result)) + rule = And(Or(other_rule)) + + _, actual_result = rule.evaluate_while_simplifying(collection_state) + + other_rule.evaluate_while_simplifying.assert_called_with(collection_state) + self.assertEqual(expected_result, actual_result) + + def test_return_complement_when_its_found(self): + expected_simplified = false_ + expected_result = False + collection_state = MagicMock() + rule = And(expected_simplified) + + actual_simplified, actual_result = rule.evaluate_while_simplifying(collection_state) + + self.assertEqual(expected_result, actual_result) + self.assertEqual(expected_simplified, actual_simplified) + + def test_short_circuit_when_complement_found(self): + collection_state = MagicMock() + other_rule = MagicMock() + rule = Or(true_, ) + + rule.evaluate_while_simplifying(collection_state) + + other_rule.evaluate_while_simplifying.assert_not_called() + + def test_short_circuit_when_combinable_rules_is_false(self): + collection_state = MagicMock() + other_rule = MagicMock() + rule = And(HasProgressionPercent(1, 10), other_rule) + + rule.evaluate_while_simplifying(collection_state) + + other_rule.evaluate_while_simplifying.assert_not_called() + + def test_identity_is_removed_from_other_rules(self): + collection_state = MagicMock() + rule = Or(false_, HasProgressionPercent(1, 10)) + + rule.evaluate_while_simplifying(collection_state) + + self.assertEqual(1, len(rule.current_rules)) + self.assertIn(HasProgressionPercent(1, 10), rule.current_rules) + + def test_complement_replaces_combinable_rules(self): + collection_state = MagicMock() + rule = Or(HasProgressionPercent(1, 10), true_) + + rule.evaluate_while_simplifying(collection_state) + + self.assertTrue(rule.current_rules) + + def test_simplifying_to_complement_propagates_complement(self): + expected_simplified = true_ + expected_result = True + collection_state = MagicMock() + rule = Or(Or(expected_simplified), HasProgressionPercent(1, 10)) + + actual_simplified, actual_result = rule.evaluate_while_simplifying(collection_state) + + self.assertEqual(expected_result, actual_result) + self.assertEqual(expected_simplified, actual_simplified) + self.assertTrue(rule.current_rules) + + def test_already_simplified_rules_are_not_simplified_again(self): + collection_state = MagicMock() + other_rule = MagicMock() + other_rule.evaluate_while_simplifying = Mock(return_value=(other_rule, False)) + rule = Or(other_rule, HasProgressionPercent(1, 10)) + + rule.evaluate_while_simplifying(collection_state) + other_rule.assert_not_called() + other_rule.evaluate_while_simplifying.reset_mock() + + rule.evaluate_while_simplifying(collection_state) + other_rule.assert_called_with(collection_state) + other_rule.evaluate_while_simplifying.assert_not_called() + + def test_continue_simplification_after_short_circuited(self): + collection_state = MagicMock() + a_rule = MagicMock() + a_rule.evaluate_while_simplifying = Mock(return_value=(a_rule, False)) + another_rule = MagicMock() + another_rule.evaluate_while_simplifying = Mock(return_value=(another_rule, False)) + rule = And(a_rule, another_rule) + + rule.evaluate_while_simplifying(collection_state) + # This test is completely messed up because sets are used internally and order of the rules cannot be ensured. + not_yet_simplified, already_simplified = (another_rule, a_rule) if a_rule.evaluate_while_simplifying.called else (a_rule, another_rule) + not_yet_simplified.evaluate_while_simplifying.assert_not_called() + already_simplified.return_value = True + + rule.evaluate_while_simplifying(collection_state) + not_yet_simplified.evaluate_while_simplifying.assert_called_with(collection_state) + + +class TestEvaluateWhileSimplifyingDoubleCalls(unittest.TestCase): + """ + So, there is a situation where a rule kind of calls itself while it's being evaluated, because its evaluation triggers a region cache refresh. + + The region cache check every entrance, so if a rule is also used in an entrances, it can be reevaluated. + + For instance, but not limited to + Has Melon -> (Farm & Summer) | Greenhouse -> Greenhouse triggers an update of the region cache + -> Every entrance are evaluated, for instance "can start farming" -> Look that any crop can be grown (calls Has Melon). + """ + + def test_nested_call_in_the_internal_rule_being_evaluated_does_check_the_internal_rule(self): + collection_state = MagicMock() + internal_rule = MagicMock() + rule = Or(internal_rule) + + called_once = False + internal_call_result = None + + def first_call_to_internal_rule(state): + nonlocal internal_call_result + nonlocal called_once + if called_once: + return internal_rule, True + called_once = True + + _, internal_call_result = rule.evaluate_while_simplifying(state) + internal_rule.evaluate_while_simplifying = Mock(return_value=(internal_rule, True)) + return internal_rule, True + + internal_rule.evaluate_while_simplifying = first_call_to_internal_rule + + rule.evaluate_while_simplifying(collection_state) + + self.assertTrue(called_once) + self.assertTrue(internal_call_result) + + def test_nested_call_to_already_simplified_rule_does_not_steal_rule_to_simplify_from_parent_call(self): + collection_state = MagicMock() + an_internal_rule = MagicMock() + an_internal_rule.evaluate_while_simplifying = Mock(return_value=(an_internal_rule, True)) + another_internal_rule = MagicMock() + another_internal_rule.evaluate_while_simplifying = Mock(return_value=(another_internal_rule, True)) + rule = Or(an_internal_rule, another_internal_rule) + + rule.evaluate_while_simplifying(collection_state) + # This test is completely messed up because sets are used internally and order of the rules cannot be ensured. + if an_internal_rule.evaluate_while_simplifying.called: + not_yet_simplified, already_simplified = another_internal_rule, an_internal_rule + else: + not_yet_simplified, already_simplified = an_internal_rule, another_internal_rule + + called_once = False + internal_call_result = None + + def call_to_already_simplified(state): + nonlocal internal_call_result + nonlocal called_once + if called_once: + return False + called_once = True + + _, internal_call_result = rule.evaluate_while_simplifying(state) + return False + + already_simplified.side_effect = call_to_already_simplified + not_yet_simplified.return_value = True + + _, actual_result = rule.evaluate_while_simplifying(collection_state) + + self.assertTrue(called_once) + self.assertTrue(internal_call_result) + self.assertTrue(actual_result) diff --git a/worlds/stardew_valley/test/TestStartInventory.py b/worlds/stardew_valley/test/TestStartInventory.py new file mode 100644 index 000000000000..826f49b1ac83 --- /dev/null +++ b/worlds/stardew_valley/test/TestStartInventory.py @@ -0,0 +1,41 @@ +from . import SVTestBase +from .assertion import WorldAssertMixin +from .. import options + + +class TestStartInventoryAllsanity(WorldAssertMixin, SVTestBase): + options = { + "accessibility": "items", + options.Goal.internal_name: options.Goal.option_allsanity, + options.BundleRandomization.internal_name: options.BundleRandomization.option_remixed, + options.BundlePrice.internal_name: options.BundlePrice.option_minimum, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.ToolProgression.internal_name: options.ToolProgression.option_progressive_very_cheap, + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive_from_previous_floor, + options.SkillProgression.internal_name: options.SkillProgression.option_progressive, + options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive_very_cheap, + options.FestivalLocations.internal_name: options.FestivalLocations.option_easy, + options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_only, + options.QuestLocations.internal_name: -1, + options.Fishsanity.internal_name: options.Fishsanity.option_only_easy_fish, + options.Museumsanity.internal_name: options.Museumsanity.option_randomized, + options.Monstersanity.internal_name: options.Monstersanity.option_one_per_category, + options.Shipsanity.internal_name: options.Shipsanity.option_crops, + options.Cooksanity.internal_name: options.Cooksanity.option_queen_of_sauce, + options.Chefsanity.internal_name: 0b1001, + options.Craftsanity.internal_name: options.Craftsanity.option_all, + options.Friendsanity.internal_name: options.Friendsanity.option_bachelors, + options.FriendsanityHeartSize.internal_name: 3, + options.NumberOfMovementBuffs.internal_name: 10, + options.NumberOfLuckBuffs.internal_name: 12, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false, + options.Mods.internal_name: ["Tractor Mod", "Bigger Backpack", "Luck Skill", "Magic", "Socializing Skill", "Archaeology", "Cooking Skill", + "Binning Skill"], + "start_inventory": {"Movement Speed Bonus": 2} + } + + def test_start_inventory_movement_speed(self): + self.assert_basic_checks_with_subtests(self.multiworld) + self.assert_can_win(self.multiworld) diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py index 948fb83b0bec..5eddb7e280b0 100644 --- a/worlds/stardew_valley/test/__init__.py +++ b/worlds/stardew_valley/test/__init__.py @@ -1,139 +1,385 @@ import os import unittest from argparse import Namespace -from typing import Dict, FrozenSet, Tuple, Any, ClassVar +from contextlib import contextmanager +from typing import Dict, ClassVar, Iterable, Hashable, Tuple, Optional, List, Union, Any -from BaseClasses import MultiWorld +from BaseClasses import MultiWorld, CollectionState, get_seed, Location +from Options import VerifyKeys from Utils import cache_argsless -from test.TestBase import WorldTestBase +from test.bases import WorldTestBase from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld -from .. import StardewValleyWorld -from ..mods.mod_data import ModNames from worlds.AutoWorld import call_all -from ..options import Cropsanity, SkillProgression, SpecialOrderLocations, Friendsanity, NumberOfLuckBuffs, SeasonRandomization, ToolProgression, \ - ElevatorProgression, Museumsanity, BackpackProgression, BuildingProgression, ArcadeMachineLocations, HelpWantedLocations, Fishsanity, NumberOfMovementBuffs, \ - BundleRandomization, BundlePrice, FestivalLocations, FriendsanityHeartSize, ExcludeGingerIsland, TrapItems, Goal, Mods +from .assertion import RuleAssertMixin +from .. import StardewValleyWorld, options +from ..mods.mod_data import all_mods +from ..options import StardewValleyOptions, StardewValleyOption +DEFAULT_TEST_SEED = get_seed() -class SVTestCase(unittest.TestCase): - player: ClassVar[int] = 1 - """Set to False to not skip some 'extra' tests""" - skip_extra_tests: bool = True - """Set to False to run tests that take long""" - skip_long_tests: bool = True +# TODO is this caching really changing anything? +@cache_argsless +def disable_5_x_x_options(): + return { + options.Monstersanity.internal_name: options.Monstersanity.option_none, + options.Shipsanity.internal_name: options.Shipsanity.option_none, + options.Cooksanity.internal_name: options.Cooksanity.option_none, + options.Chefsanity.internal_name: options.Chefsanity.option_none, + options.Craftsanity.internal_name: options.Craftsanity.option_none + } -class SVTestBase(WorldTestBase, SVTestCase): - game = "Stardew Valley" - world: StardewValleyWorld - def world_setup(self, *args, **kwargs): - super().world_setup(*args, **kwargs) - long_tests_key = "long" - if long_tests_key in os.environ: - self.skip_long_tests = not bool(os.environ[long_tests_key]) - if self.constructed: - self.world = self.multiworld.worlds[self.player] # noqa +@cache_argsless +def default_4_x_x_options(): + option_dict = default_options().copy() + option_dict.update(disable_5_x_x_options()) + option_dict.update({ + options.BundleRandomization.internal_name: options.BundleRandomization.option_shuffled, + }) + return option_dict - @property - def run_default_tests(self) -> bool: - # world_setup is overridden, so it'd always run default tests when importing SVTestBase - is_not_stardew_test = type(self) is not SVTestBase - should_run_default_tests = is_not_stardew_test and super().run_default_tests - return should_run_default_tests + +@cache_argsless +def default_options(): + return {} + + +@cache_argsless +def get_minsanity_options(): + return { + options.Goal.internal_name: options.Goal.option_bottom_of_the_mines, + options.BundleRandomization.internal_name: options.BundleRandomization.option_vanilla, + options.BundlePrice.internal_name: options.BundlePrice.option_very_cheap, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_disabled, + options.Cropsanity.internal_name: options.Cropsanity.option_disabled, + options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla, + options.ToolProgression.internal_name: options.ToolProgression.option_vanilla, + options.SkillProgression.internal_name: options.SkillProgression.option_vanilla, + options.BuildingProgression.internal_name: options.BuildingProgression.option_vanilla, + options.FestivalLocations.internal_name: options.FestivalLocations.option_disabled, + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla, + options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_disabled, + options.QuestLocations.internal_name: -1, + options.Fishsanity.internal_name: options.Fishsanity.option_none, + options.Museumsanity.internal_name: options.Museumsanity.option_none, + options.Monstersanity.internal_name: options.Monstersanity.option_none, + options.Shipsanity.internal_name: options.Shipsanity.option_none, + options.Cooksanity.internal_name: options.Cooksanity.option_none, + options.Chefsanity.internal_name: options.Chefsanity.option_none, + options.Craftsanity.internal_name: options.Craftsanity.option_none, + options.Friendsanity.internal_name: options.Friendsanity.option_none, + options.FriendsanityHeartSize.internal_name: 8, + options.NumberOfMovementBuffs.internal_name: 0, + options.NumberOfLuckBuffs.internal_name: 0, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true, + options.TrapItems.internal_name: options.TrapItems.option_no_traps, + options.Mods.internal_name: frozenset(), + } @cache_argsless def minimal_locations_maximal_items(): min_max_options = { - SeasonRandomization.internal_name: SeasonRandomization.option_randomized, - Cropsanity.internal_name: Cropsanity.option_enabled, - BackpackProgression.internal_name: BackpackProgression.option_vanilla, - ToolProgression.internal_name: ToolProgression.option_vanilla, - SkillProgression.internal_name: SkillProgression.option_vanilla, - BuildingProgression.internal_name: BuildingProgression.option_vanilla, - ElevatorProgression.internal_name: ElevatorProgression.option_vanilla, - ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled, - SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled, - HelpWantedLocations.internal_name: 0, - Fishsanity.internal_name: Fishsanity.option_none, - Museumsanity.internal_name: Museumsanity.option_none, - Friendsanity.internal_name: Friendsanity.option_none, - NumberOfMovementBuffs.internal_name: 12, - NumberOfLuckBuffs.internal_name: 12, + options.Goal.internal_name: options.Goal.option_craft_master, + options.BundleRandomization.internal_name: options.BundleRandomization.option_shuffled, + options.BundlePrice.internal_name: options.BundlePrice.option_expensive, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized, + options.Cropsanity.internal_name: options.Cropsanity.option_disabled, + options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla, + options.ToolProgression.internal_name: options.ToolProgression.option_vanilla, + options.SkillProgression.internal_name: options.SkillProgression.option_vanilla, + options.BuildingProgression.internal_name: options.BuildingProgression.option_vanilla, + options.FestivalLocations.internal_name: options.FestivalLocations.option_disabled, + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla, + options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_disabled, + options.QuestLocations.internal_name: -1, + options.Fishsanity.internal_name: options.Fishsanity.option_none, + options.Museumsanity.internal_name: options.Museumsanity.option_none, + options.Monstersanity.internal_name: options.Monstersanity.option_none, + options.Shipsanity.internal_name: options.Shipsanity.option_none, + options.Cooksanity.internal_name: options.Cooksanity.option_none, + options.Chefsanity.internal_name: options.Chefsanity.option_none, + options.Craftsanity.internal_name: options.Craftsanity.option_none, + options.Friendsanity.internal_name: options.Friendsanity.option_none, + options.FriendsanityHeartSize.internal_name: 8, + options.NumberOfMovementBuffs.internal_name: 12, + options.NumberOfLuckBuffs.internal_name: 12, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true, + options.TrapItems.internal_name: options.TrapItems.option_nightmare, + options.Mods.internal_name: (), } return min_max_options +@cache_argsless +def minimal_locations_maximal_items_with_island(): + min_max_options = minimal_locations_maximal_items().copy() + min_max_options.update({options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false}) + return min_max_options + + +@cache_argsless +def allsanity_4_x_x_options_without_mods(): + option_dict = { + options.Goal.internal_name: options.Goal.option_perfection, + options.BundleRandomization.internal_name: options.BundleRandomization.option_thematic, + options.BundlePrice.internal_name: options.BundlePrice.option_expensive, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive, + options.ToolProgression.internal_name: options.ToolProgression.option_progressive, + options.SkillProgression.internal_name: options.SkillProgression.option_progressive, + options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive, + options.FestivalLocations.internal_name: options.FestivalLocations.option_hard, + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive, + options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_full_shuffling, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi, + options.QuestLocations.internal_name: 56, + options.Fishsanity.internal_name: options.Fishsanity.option_all, + options.Museumsanity.internal_name: options.Museumsanity.option_all, + options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals, + options.Shipsanity.internal_name: options.Shipsanity.option_everything, + options.Cooksanity.internal_name: options.Cooksanity.option_all, + options.Chefsanity.internal_name: options.Chefsanity.option_all, + options.Craftsanity.internal_name: options.Craftsanity.option_all, + options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, + options.FriendsanityHeartSize.internal_name: 1, + options.NumberOfMovementBuffs.internal_name: 12, + options.NumberOfLuckBuffs.internal_name: 12, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false, + options.TrapItems.internal_name: options.TrapItems.option_nightmare, + } + option_dict.update(disable_5_x_x_options()) + return option_dict + + @cache_argsless def allsanity_options_without_mods(): - allsanity = { - Goal.internal_name: Goal.option_perfection, - BundleRandomization.internal_name: BundleRandomization.option_shuffled, - BundlePrice.internal_name: BundlePrice.option_expensive, - SeasonRandomization.internal_name: SeasonRandomization.option_randomized, - Cropsanity.internal_name: Cropsanity.option_enabled, - BackpackProgression.internal_name: BackpackProgression.option_progressive, - ToolProgression.internal_name: ToolProgression.option_progressive, - SkillProgression.internal_name: SkillProgression.option_progressive, - BuildingProgression.internal_name: BuildingProgression.option_progressive, - FestivalLocations.internal_name: FestivalLocations.option_hard, - ElevatorProgression.internal_name: ElevatorProgression.option_progressive, - ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling, - SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, - HelpWantedLocations.internal_name: 56, - Fishsanity.internal_name: Fishsanity.option_all, - Museumsanity.internal_name: Museumsanity.option_all, - Friendsanity.internal_name: Friendsanity.option_all_with_marriage, - FriendsanityHeartSize.internal_name: 1, - NumberOfMovementBuffs.internal_name: 12, - NumberOfLuckBuffs.internal_name: 12, - ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false, - TrapItems.internal_name: TrapItems.option_nightmare, + return { + options.Goal.internal_name: options.Goal.option_perfection, + options.BundleRandomization.internal_name: options.BundleRandomization.option_thematic, + options.BundlePrice.internal_name: options.BundlePrice.option_expensive, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized, + options.Cropsanity.internal_name: options.Cropsanity.option_enabled, + options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive, + options.ToolProgression.internal_name: options.ToolProgression.option_progressive, + options.SkillProgression.internal_name: options.SkillProgression.option_progressive, + options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive, + options.FestivalLocations.internal_name: options.FestivalLocations.option_hard, + options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive, + options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_full_shuffling, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi, + options.QuestLocations.internal_name: 56, + options.Fishsanity.internal_name: options.Fishsanity.option_all, + options.Museumsanity.internal_name: options.Museumsanity.option_all, + options.Monstersanity.internal_name: options.Monstersanity.option_progressive_goals, + options.Shipsanity.internal_name: options.Shipsanity.option_everything, + options.Cooksanity.internal_name: options.Cooksanity.option_all, + options.Chefsanity.internal_name: options.Chefsanity.option_all, + options.Craftsanity.internal_name: options.Craftsanity.option_all, + options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, + options.FriendsanityHeartSize.internal_name: 1, + options.NumberOfMovementBuffs.internal_name: 12, + options.NumberOfLuckBuffs.internal_name: 12, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false, + options.TrapItems.internal_name: options.TrapItems.option_nightmare, } - return allsanity @cache_argsless def allsanity_options_with_mods(): - allsanity = {} - allsanity.update(allsanity_options_without_mods()) - all_mods = ( - ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack, - ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology, - ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna, - ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene, - ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores, - ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator - ) - allsanity.update({Mods.internal_name: all_mods}) + allsanity = allsanity_options_without_mods().copy() + allsanity.update({options.Mods.internal_name: all_mods}) return allsanity +class SVTestCase(unittest.TestCase): + # Set False to not skip some 'extra' tests + skip_base_tests: bool = True + # Set False to run tests that take long + skip_long_tests: bool = True + + @classmethod + def setUpClass(cls) -> None: + super().setUpClass() + base_tests_key = "base" + if base_tests_key in os.environ: + cls.skip_base_tests = not bool(os.environ[base_tests_key]) + long_tests_key = "long" + if long_tests_key in os.environ: + cls.skip_long_tests = not bool(os.environ[long_tests_key]) + + @contextmanager + def solo_world_sub_test(self, msg: Optional[str] = None, + /, + world_options: Optional[Dict[Union[str, StardewValleyOption], Any]] = None, + *, + seed=DEFAULT_TEST_SEED, + world_caching=True, + dirty_state=False, + **kwargs) -> Tuple[MultiWorld, StardewValleyWorld]: + if msg is not None: + msg += " " + else: + msg = "" + msg += f"[Seed = {seed}]" + + with self.subTest(msg, **kwargs): + if world_caching: + multi_world = setup_solo_multiworld(world_options, seed) + if dirty_state: + original_state = multi_world.state.copy() + else: + multi_world = setup_solo_multiworld(world_options, seed, _cache={}) + + yield multi_world, multi_world.worlds[1] + + if world_caching and dirty_state: + multi_world.state = original_state + + +class SVTestBase(RuleAssertMixin, WorldTestBase, SVTestCase): + game = "Stardew Valley" + world: StardewValleyWorld + player: ClassVar[int] = 1 + + seed = DEFAULT_TEST_SEED + + options = get_minsanity_options() + + def world_setup(self, *args, **kwargs): + self.options = parse_class_option_keys(self.options) + + super().world_setup(seed=self.seed) + if self.constructed: + self.world = self.multiworld.worlds[self.player] # noqa + + @property + def run_default_tests(self) -> bool: + if self.skip_base_tests: + return False + # world_setup is overridden, so it'd always run default tests when importing SVTestBase + is_not_stardew_test = type(self) is not SVTestBase + should_run_default_tests = is_not_stardew_test and super().run_default_tests + return should_run_default_tests + + def collect_lots_of_money(self): + self.multiworld.state.collect(self.world.create_item("Shipping Bin"), event=False) + for i in range(100): + self.multiworld.state.collect(self.world.create_item("Stardrop"), event=False) + + def collect_all_the_money(self): + self.multiworld.state.collect(self.world.create_item("Shipping Bin"), event=False) + for i in range(1000): + self.multiworld.state.collect(self.world.create_item("Stardrop"), event=False) + + def get_real_locations(self) -> List[Location]: + return [location for location in self.multiworld.get_locations(self.player) if not location.event] + + def get_real_location_names(self) -> List[str]: + return [location.name for location in self.multiworld.get_locations(self.player) if not location.event] + + pre_generated_worlds = {} # Mostly a copy of test.general.setup_solo_multiworld, I just don't want to change the core. -def setup_solo_multiworld(test_options=None, seed=None, - _cache: Dict[FrozenSet[Tuple[str, Any]], MultiWorld] = {}) -> MultiWorld: # noqa - if test_options is None: - test_options = {} +def setup_solo_multiworld(test_options: Optional[Dict[Union[str, StardewValleyOption], str]] = None, + seed=DEFAULT_TEST_SEED, + _cache: Dict[Hashable, MultiWorld] = {}, # noqa + _steps=gen_steps) -> MultiWorld: + test_options = parse_class_option_keys(test_options) # Yes I reuse the worlds generated between tests, its speeds the execution by a couple seconds - frozen_options = frozenset(test_options.items()).union({seed}) - if frozen_options in _cache: - return _cache[frozen_options] + should_cache = "start_inventory" not in test_options + frozen_options = frozenset({}) + if should_cache: + frozen_options = frozenset(test_options.items()).union({seed}) + if frozen_options in _cache: + cached_multi_world = _cache[frozen_options] + print(f"Using cached solo multi world [Seed = {cached_multi_world.seed}]") + return cached_multi_world multiworld = setup_base_solo_multiworld(StardewValleyWorld, (), seed=seed) # print(f"Seed: {multiworld.seed}") # Uncomment to print the seed for every test + args = Namespace() for name, option in StardewValleyWorld.options_dataclass.type_hints.items(): - value = option(test_options[name]) if name in test_options else option.from_any(option.default) + value = option.from_any(test_options.get(name, option.default)) + + if issubclass(option, VerifyKeys): + # Values should already be verified, but just in case... + option.verify_keys(value.value) + setattr(args, name, {1: value}) multiworld.set_options(args) - for step in gen_steps: + + if "start_inventory" in test_options: + for item, amount in test_options["start_inventory"].items(): + for _ in range(amount): + multiworld.push_precollected(multiworld.create_item(item, 1)) + + for step in _steps: call_all(multiworld, step) - _cache[frozen_options] = multiworld + if should_cache: + _cache[frozen_options] = multiworld + + return multiworld + + +def parse_class_option_keys(test_options: dict) -> dict: + """ Now the option class is allowed as key. """ + parsed_options = {} + + if test_options: + for option, value in test_options.items(): + if hasattr(option, "internal_name"): + assert option.internal_name not in test_options, "Defined two times by class and internal_name" + parsed_options[option.internal_name] = value + else: + assert option in StardewValleyOptions.type_hints, \ + f"All keys of world_options must be a possible Stardew Valley option, {option} is not." + parsed_options[option] = value + + return parsed_options + + +def complete_options_with_default(options_to_complete=None) -> StardewValleyOptions: + if options_to_complete is None: + options_to_complete = {} + + for name, option in StardewValleyOptions.type_hints.items(): + options_to_complete[name] = option.from_any(options_to_complete.get(name, option.default)) + + return StardewValleyOptions(**options_to_complete) + + +def setup_multiworld(test_options: Iterable[Dict[str, int]] = None, seed=None) -> MultiWorld: # noqa + if test_options is None: + test_options = [] + + multiworld = MultiWorld(len(test_options)) + multiworld.player_name = {} + multiworld.set_seed(seed) + multiworld.state = CollectionState(multiworld) + for i in range(1, len(test_options) + 1): + multiworld.game[i] = StardewValleyWorld.game + multiworld.player_name.update({i: f"Tester{i}"}) + args = Namespace() + for name, option in StardewValleyWorld.options_dataclass.type_hints.items(): + options = {} + for i in range(1, len(test_options) + 1): + player_options = test_options[i - 1] + value = option(player_options[name]) if name in player_options else option.from_any(option.default) + options.update({i: value}) + setattr(args, name, options) + multiworld.set_options(args) + + for step in gen_steps: + call_all(multiworld, step) return multiworld diff --git a/worlds/stardew_valley/test/assertion/__init__.py b/worlds/stardew_valley/test/assertion/__init__.py new file mode 100644 index 000000000000..3a1420fe65e4 --- /dev/null +++ b/worlds/stardew_valley/test/assertion/__init__.py @@ -0,0 +1,5 @@ +from .goal_assert import * +from .mod_assert import * +from .option_assert import * +from .rule_assert import * +from .world_assert import * diff --git a/worlds/stardew_valley/test/assertion/goal_assert.py b/worlds/stardew_valley/test/assertion/goal_assert.py new file mode 100644 index 000000000000..2b2efbf2ec03 --- /dev/null +++ b/worlds/stardew_valley/test/assertion/goal_assert.py @@ -0,0 +1,55 @@ +from unittest import TestCase + +from BaseClasses import MultiWorld +from .option_assert import get_stardew_options +from ... import options, ExcludeGingerIsland + + +def is_goal(multiworld: MultiWorld, goal: int) -> bool: + return get_stardew_options(multiworld).goal.value == goal + + +def is_bottom_mines(multiworld: MultiWorld) -> bool: + return is_goal(multiworld, options.Goal.option_bottom_of_the_mines) + + +def is_not_bottom_mines(multiworld: MultiWorld) -> bool: + return not is_bottom_mines(multiworld) + + +def is_walnut_hunter(multiworld: MultiWorld) -> bool: + return is_goal(multiworld, options.Goal.option_greatest_walnut_hunter) + + +def is_not_walnut_hunter(multiworld: MultiWorld) -> bool: + return not is_walnut_hunter(multiworld) + + +def is_perfection(multiworld: MultiWorld) -> bool: + return is_goal(multiworld, options.Goal.option_perfection) + + +def is_not_perfection(multiworld: MultiWorld) -> bool: + return not is_perfection(multiworld) + + +class GoalAssertMixin(TestCase): + + def assert_ginger_island_is_included(self, multiworld: MultiWorld): + self.assertEqual(get_stardew_options(multiworld).exclude_ginger_island, ExcludeGingerIsland.option_false) + + def assert_walnut_hunter_world_is_valid(self, multiworld: MultiWorld): + if is_not_walnut_hunter(multiworld): + return + + self.assert_ginger_island_is_included(multiworld) + + def assert_perfection_world_is_valid(self, multiworld: MultiWorld): + if is_not_perfection(multiworld): + return + + self.assert_ginger_island_is_included(multiworld) + + def assert_goal_world_is_valid(self, multiworld: MultiWorld): + self.assert_walnut_hunter_world_is_valid(multiworld) + self.assert_perfection_world_is_valid(multiworld) diff --git a/worlds/stardew_valley/test/assertion/mod_assert.py b/worlds/stardew_valley/test/assertion/mod_assert.py new file mode 100644 index 000000000000..4f72c9a3977e --- /dev/null +++ b/worlds/stardew_valley/test/assertion/mod_assert.py @@ -0,0 +1,26 @@ +from typing import Union, List +from unittest import TestCase + +from BaseClasses import MultiWorld +from ... import item_table, location_table +from ...mods.mod_data import ModNames + + +class ModAssertMixin(TestCase): + def assert_stray_mod_items(self, chosen_mods: Union[List[str], str], multiworld: MultiWorld): + if isinstance(chosen_mods, str): + chosen_mods = [chosen_mods] + + if ModNames.jasper in chosen_mods: + # Jasper is a weird case because it shares NPC w/ SVE... + chosen_mods.append(ModNames.sve) + + for multiworld_item in multiworld.get_items(): + item = item_table[multiworld_item.name] + self.assertTrue(item.mod_name is None or item.mod_name in chosen_mods, + f"Item {item.name} has is from mod {item.mod_name}. Allowed mods are {chosen_mods}.") + for multiworld_location in multiworld.get_locations(): + if multiworld_location.event: + continue + location = location_table[multiworld_location.name] + self.assertTrue(location.mod_name is None or location.mod_name in chosen_mods) diff --git a/worlds/stardew_valley/test/assertion/option_assert.py b/worlds/stardew_valley/test/assertion/option_assert.py new file mode 100644 index 000000000000..b384858f34f4 --- /dev/null +++ b/worlds/stardew_valley/test/assertion/option_assert.py @@ -0,0 +1,96 @@ +from unittest import TestCase + +from BaseClasses import MultiWorld +from .world_assert import get_all_item_names, get_all_location_names +from ... import StardewValleyWorld, options, item_table, Group, location_table, ExcludeGingerIsland +from ...locations import LocationTags +from ...strings.ap_names.transport_names import Transportation + + +def get_stardew_world(multiworld: MultiWorld) -> StardewValleyWorld: + for world_key in multiworld.worlds: + world = multiworld.worlds[world_key] + if isinstance(world, StardewValleyWorld): + return world + raise ValueError("no stardew world in this multiworld") + + +def get_stardew_options(multiworld: MultiWorld) -> options.StardewValleyOptions: + return get_stardew_world(multiworld).options + + +class OptionAssertMixin(TestCase): + + def assert_has_item(self, multiworld: MultiWorld, item: str): + all_item_names = set(get_all_item_names(multiworld)) + self.assertIn(item, all_item_names) + + def assert_has_not_item(self, multiworld: MultiWorld, item: str): + all_item_names = set(get_all_item_names(multiworld)) + self.assertNotIn(item, all_item_names) + + def assert_has_location(self, multiworld: MultiWorld, item: str): + all_location_names = set(get_all_location_names(multiworld)) + self.assertIn(item, all_location_names) + + def assert_has_not_location(self, multiworld: MultiWorld, item: str): + all_location_names = set(get_all_location_names(multiworld)) + self.assertNotIn(item, all_location_names) + + def assert_can_reach_island(self, multiworld: MultiWorld): + all_item_names = get_all_item_names(multiworld) + self.assertIn(Transportation.boat_repair, all_item_names) + self.assertIn(Transportation.island_obelisk, all_item_names) + + def assert_cannot_reach_island(self, multiworld: MultiWorld): + all_item_names = get_all_item_names(multiworld) + self.assertNotIn(Transportation.boat_repair, all_item_names) + self.assertNotIn(Transportation.island_obelisk, all_item_names) + + def assert_can_reach_island_if_should(self, multiworld: MultiWorld): + stardew_options = get_stardew_options(multiworld) + include_island = stardew_options.exclude_ginger_island.value == ExcludeGingerIsland.option_false + if include_island: + self.assert_can_reach_island(multiworld) + else: + self.assert_cannot_reach_island(multiworld) + + def assert_cropsanity_same_number_items_and_locations(self, multiworld: MultiWorld): + is_cropsanity = get_stardew_options(multiworld).cropsanity.value == options.Cropsanity.option_enabled + if not is_cropsanity: + return + + all_item_names = set(get_all_item_names(multiworld)) + all_location_names = set(get_all_location_names(multiworld)) + all_cropsanity_item_names = {item_name for item_name in all_item_names if Group.CROPSANITY in item_table[item_name].groups} + all_cropsanity_location_names = {location_name for location_name in all_location_names if LocationTags.CROPSANITY in location_table[location_name].tags} + self.assertEqual(len(all_cropsanity_item_names), len(all_cropsanity_location_names)) + + def assert_all_rarecrows_exist(self, multiworld: MultiWorld): + all_item_names = set(get_all_item_names(multiworld)) + for rarecrow_number in range(1, 9): + self.assertIn(f"Rarecrow #{rarecrow_number}", all_item_names) + + def assert_has_deluxe_scarecrow_recipe(self, multiworld: MultiWorld): + self.assert_has_item(multiworld, "Deluxe Scarecrow Recipe") + + def assert_festivals_give_access_to_deluxe_scarecrow(self, multiworld: MultiWorld): + stardew_options = get_stardew_options(multiworld) + has_festivals = stardew_options.festival_locations.value != options.FestivalLocations.option_disabled + if not has_festivals: + return + + self.assert_all_rarecrows_exist(multiworld) + self.assert_has_deluxe_scarecrow_recipe(multiworld) + + def assert_has_festival_recipes(self, multiworld: MultiWorld): + stardew_options = get_stardew_options(multiworld) + has_festivals = stardew_options.festival_locations.value != options.FestivalLocations.option_disabled + festival_items = ["Tub o' Flowers Recipe", "Jack-O-Lantern Recipe"] + for festival_item in festival_items: + if has_festivals: + self.assert_has_item(multiworld, festival_item) + self.assert_has_location(multiworld, festival_item) + else: + self.assert_has_not_item(multiworld, festival_item) + self.assert_has_not_location(multiworld, festival_item) diff --git a/worlds/stardew_valley/test/assertion/rule_assert.py b/worlds/stardew_valley/test/assertion/rule_assert.py new file mode 100644 index 000000000000..f9b12394311a --- /dev/null +++ b/worlds/stardew_valley/test/assertion/rule_assert.py @@ -0,0 +1,17 @@ +from unittest import TestCase + +from BaseClasses import CollectionState +from .rule_explain import explain +from ...stardew_rule import StardewRule, false_, MISSING_ITEM + + +class RuleAssertMixin(TestCase): + def assert_rule_true(self, rule: StardewRule, state: CollectionState): + self.assertTrue(rule(state), explain(rule, state)) + + def assert_rule_false(self, rule: StardewRule, state: CollectionState): + self.assertFalse(rule(state), explain(rule, state, expected=False)) + + def assert_rule_can_be_resolved(self, rule: StardewRule, complete_state: CollectionState): + self.assertNotIn(MISSING_ITEM, repr(rule)) + self.assertTrue(rule is false_ or rule(complete_state), explain(rule, complete_state)) diff --git a/worlds/stardew_valley/test/assertion/rule_explain.py b/worlds/stardew_valley/test/assertion/rule_explain.py new file mode 100644 index 000000000000..f9bf97603404 --- /dev/null +++ b/worlds/stardew_valley/test/assertion/rule_explain.py @@ -0,0 +1,102 @@ +from __future__ import annotations + +from dataclasses import dataclass, field +from functools import cached_property, singledispatch +from typing import Iterable + +from BaseClasses import CollectionState +from worlds.generic.Rules import CollectionRule +from ...stardew_rule import StardewRule, AggregatingStardewRule, Count, Has, TotalReceived, Received, Reach + +max_explanation_depth = 10 + + +@dataclass +class RuleExplanation: + rule: StardewRule + state: CollectionState + expected: bool + sub_rules: Iterable[StardewRule] = field(default_factory=list) + + def summary(self, depth=0): + return " " * depth + f"{str(self.rule)} -> {self.result}" + + def __str__(self, depth=0): + if not self.sub_rules or depth >= max_explanation_depth: + return self.summary(depth) + + return self.summary(depth) + "\n" + "\n".join(RuleExplanation.__str__(i, depth + 1) + if i.result is not self.expected else i.summary(depth + 1) + for i in sorted(self.explained_sub_rules, key=lambda x: x.result)) + + def __repr__(self, depth=0): + if not self.sub_rules or depth >= max_explanation_depth: + return self.summary(depth) + + return self.summary(depth) + "\n" + "\n".join(RuleExplanation.__repr__(i, depth + 1) + for i in sorted(self.explained_sub_rules, key=lambda x: x.result)) + + @cached_property + def result(self): + return self.rule(self.state) + + @cached_property + def explained_sub_rules(self): + return [_explain(i, self.state, self.expected) for i in self.sub_rules] + + +def explain(rule: CollectionRule, state: CollectionState, expected: bool = True) -> RuleExplanation: + if isinstance(rule, StardewRule): + return _explain(rule, state, expected) + else: + return f"Value of rule {str(rule)} was not {str(expected)} in {str(state)}" # noqa + + +@singledispatch +def _explain(rule: StardewRule, state: CollectionState, expected: bool) -> RuleExplanation: + return RuleExplanation(rule, state, expected) + + +@_explain.register +def _(rule: AggregatingStardewRule, state: CollectionState, expected: bool) -> RuleExplanation: + return RuleExplanation(rule, state, expected, rule.original_rules) + + +@_explain.register +def _(rule: Count, state: CollectionState, expected: bool) -> RuleExplanation: + return RuleExplanation(rule, state, expected, rule.rules) + + +@_explain.register +def _(rule: Has, state: CollectionState, expected: bool) -> RuleExplanation: + return RuleExplanation(rule, state, expected, [rule.other_rules[rule.item]]) + + +@_explain.register +def _(rule: TotalReceived, state: CollectionState, expected=True) -> RuleExplanation: + return RuleExplanation(rule, state, expected, [Received(i, rule.player, 1) for i in rule.items]) + + +@_explain.register +def _(rule: Reach, state: CollectionState, expected=True) -> RuleExplanation: + access_rules = None + if rule.resolution_hint == 'Location': + spot = state.multiworld.get_location(rule.spot, rule.player) + + if isinstance(spot.access_rule, StardewRule): + access_rules = [spot.access_rule, Reach(spot.parent_region.name, "Region", rule.player)] + + elif rule.resolution_hint == 'Entrance': + spot = state.multiworld.get_entrance(rule.spot, rule.player) + + if isinstance(spot.access_rule, StardewRule): + access_rules = [spot.access_rule, Reach(spot.parent_region.name, "Region", rule.player)] + + else: + spot = state.multiworld.get_region(rule.spot, rule.player) + access_rules = [*(Reach(e.name, "Entrance", rule.player) for e in spot.entrances)] + + if not access_rules: + return RuleExplanation(rule, state, expected) + + return RuleExplanation(rule, state, expected, access_rules) diff --git a/worlds/stardew_valley/test/assertion/world_assert.py b/worlds/stardew_valley/test/assertion/world_assert.py new file mode 100644 index 000000000000..413517e1c912 --- /dev/null +++ b/worlds/stardew_valley/test/assertion/world_assert.py @@ -0,0 +1,83 @@ +from typing import List +from unittest import TestCase + +from BaseClasses import MultiWorld, ItemClassification +from .rule_assert import RuleAssertMixin +from ... import StardewItem +from ...items import items_by_group, Group +from ...locations import LocationTags, locations_by_tag + + +def get_all_item_names(multiworld: MultiWorld) -> List[str]: + return [item.name for item in multiworld.itempool] + + +def get_all_location_names(multiworld: MultiWorld) -> List[str]: + return [location.name for location in multiworld.get_locations() if not location.event] + + +class WorldAssertMixin(RuleAssertMixin, TestCase): + + def assert_victory_exists(self, multiworld: MultiWorld): + self.assertIn(StardewItem("Victory", ItemClassification.progression, None, 1), multiworld.get_items()) + + def assert_can_reach_victory(self, multiworld: MultiWorld): + victory = multiworld.find_item("Victory", 1) + self.assert_rule_true(victory.access_rule, multiworld.state) + + def assert_cannot_reach_victory(self, multiworld: MultiWorld): + victory = multiworld.find_item("Victory", 1) + self.assert_rule_false(victory.access_rule, multiworld.state) + + def assert_item_was_necessary_for_victory(self, item: StardewItem, multiworld: MultiWorld): + self.assert_can_reach_victory(multiworld) + multiworld.state.remove(item) + self.assert_cannot_reach_victory(multiworld) + multiworld.state.collect(item, event=False) + self.assert_can_reach_victory(multiworld) + + def assert_item_was_not_necessary_for_victory(self, item: StardewItem, multiworld: MultiWorld): + self.assert_can_reach_victory(multiworld) + multiworld.state.remove(item) + self.assert_can_reach_victory(multiworld) + multiworld.state.collect(item, event=False) + self.assert_can_reach_victory(multiworld) + + def assert_can_win(self, multiworld: MultiWorld): + self.assert_victory_exists(multiworld) + self.assert_can_reach_victory(multiworld) + + def assert_same_number_items_locations(self, multiworld: MultiWorld): + non_event_locations = [location for location in multiworld.get_locations() if not location.event] + self.assertEqual(len(multiworld.itempool), len(non_event_locations)) + + def assert_can_reach_everything(self, multiworld: MultiWorld): + for location in multiworld.get_locations(): + self.assert_rule_true(location.access_rule, multiworld.state) + + def assert_basic_checks(self, multiworld: MultiWorld): + self.assert_same_number_items_locations(multiworld) + non_event_items = [item for item in multiworld.get_items() if item.code] + for item in non_event_items: + multiworld.state.collect(item) + self.assert_can_win(multiworld) + self.assert_can_reach_everything(multiworld) + + def assert_basic_checks_with_subtests(self, multiworld: MultiWorld): + with self.subTest("same_number_items_locations"): + self.assert_same_number_items_locations(multiworld) + non_event_items = [item for item in multiworld.get_items() if item.code] + for item in non_event_items: + multiworld.state.collect(item) + with self.subTest("can_win"): + self.assert_can_win(multiworld) + with self.subTest("can_reach_everything"): + self.assert_can_reach_everything(multiworld) + + def assert_no_ginger_island_content(self, multiworld: MultiWorld): + ginger_island_items = [item_data.name for item_data in items_by_group[Group.GINGER_ISLAND]] + ginger_island_locations = [location_data.name for location_data in locations_by_tag[LocationTags.GINGER_ISLAND]] + for item in multiworld.get_items(): + self.assertNotIn(item.name, ginger_island_items) + for location in multiworld.get_locations(): + self.assertNotIn(location.name, ginger_island_locations) diff --git a/worlds/stardew_valley/test/checks/goal_checks.py b/worlds/stardew_valley/test/checks/goal_checks.py deleted file mode 100644 index d0f06a6caafa..000000000000 --- a/worlds/stardew_valley/test/checks/goal_checks.py +++ /dev/null @@ -1,55 +0,0 @@ -from BaseClasses import MultiWorld -from .option_checks import get_stardew_options -from ... import options -from .. import SVTestBase - - -def is_goal(multiworld: MultiWorld, goal: int) -> bool: - return get_stardew_options(multiworld).goal.value == goal - - -def is_bottom_mines(multiworld: MultiWorld) -> bool: - return is_goal(multiworld, options.Goal.option_bottom_of_the_mines) - - -def is_not_bottom_mines(multiworld: MultiWorld) -> bool: - return not is_bottom_mines(multiworld) - - -def is_walnut_hunter(multiworld: MultiWorld) -> bool: - return is_goal(multiworld, options.Goal.option_greatest_walnut_hunter) - - -def is_not_walnut_hunter(multiworld: MultiWorld) -> bool: - return not is_walnut_hunter(multiworld) - - -def is_perfection(multiworld: MultiWorld) -> bool: - return is_goal(multiworld, options.Goal.option_perfection) - - -def is_not_perfection(multiworld: MultiWorld) -> bool: - return not is_perfection(multiworld) - - -def assert_ginger_island_is_included(tester: SVTestBase, multiworld: MultiWorld): - tester.assertEqual(get_stardew_options(multiworld).exclude_ginger_island, options.ExcludeGingerIsland.option_false) - - -def assert_walnut_hunter_world_is_valid(tester: SVTestBase, multiworld: MultiWorld): - if is_not_walnut_hunter(multiworld): - return - - assert_ginger_island_is_included(tester, multiworld) - - -def assert_perfection_world_is_valid(tester: SVTestBase, multiworld: MultiWorld): - if is_not_perfection(multiworld): - return - - assert_ginger_island_is_included(tester, multiworld) - - -def assert_goal_world_is_valid(tester: SVTestBase, multiworld: MultiWorld): - assert_walnut_hunter_world_is_valid(tester, multiworld) - assert_perfection_world_is_valid(tester, multiworld) diff --git a/worlds/stardew_valley/test/checks/option_checks.py b/worlds/stardew_valley/test/checks/option_checks.py deleted file mode 100644 index c9d9860cf52b..000000000000 --- a/worlds/stardew_valley/test/checks/option_checks.py +++ /dev/null @@ -1,72 +0,0 @@ -from BaseClasses import MultiWorld -from .world_checks import get_all_item_names, get_all_location_names -from .. import SVTestBase -from ... import StardewValleyWorld, options, item_table, Group, location_table -from ...locations import LocationTags -from ...strings.ap_names.transport_names import Transportation - - -def get_stardew_world(multiworld: MultiWorld) -> StardewValleyWorld: - for world_key in multiworld.worlds: - world = multiworld.worlds[world_key] - if isinstance(world, StardewValleyWorld): - return world - raise ValueError("no stardew world in this multiworld") - - -def get_stardew_options(multiworld: MultiWorld) -> options.StardewValleyOptions: - return get_stardew_world(multiworld).options - - -def assert_can_reach_island(tester: SVTestBase, multiworld: MultiWorld): - all_item_names = get_all_item_names(multiworld) - tester.assertIn(Transportation.boat_repair, all_item_names) - tester.assertIn(Transportation.island_obelisk, all_item_names) - - -def assert_cannot_reach_island(tester: SVTestBase, multiworld: MultiWorld): - all_item_names = get_all_item_names(multiworld) - tester.assertNotIn(Transportation.boat_repair, all_item_names) - tester.assertNotIn(Transportation.island_obelisk, all_item_names) - - -def assert_can_reach_island_if_should(tester: SVTestBase, multiworld: MultiWorld): - stardew_options = get_stardew_options(multiworld) - include_island = stardew_options.exclude_ginger_island.value == options.ExcludeGingerIsland.option_false - if include_island: - assert_can_reach_island(tester, multiworld) - else: - assert_cannot_reach_island(tester, multiworld) - - -def assert_cropsanity_same_number_items_and_locations(tester: SVTestBase, multiworld: MultiWorld): - is_cropsanity = get_stardew_options(multiworld).cropsanity.value == options.Cropsanity.option_enabled - if not is_cropsanity: - return - - all_item_names = set(get_all_item_names(multiworld)) - all_location_names = set(get_all_location_names(multiworld)) - all_cropsanity_item_names = {item_name for item_name in all_item_names if Group.CROPSANITY in item_table[item_name].groups} - all_cropsanity_location_names = {location_name for location_name in all_location_names if LocationTags.CROPSANITY in location_table[location_name].tags} - tester.assertEqual(len(all_cropsanity_item_names), len(all_cropsanity_location_names)) - - -def assert_all_rarecrows_exist(tester: SVTestBase, multiworld: MultiWorld): - all_item_names = set(get_all_item_names(multiworld)) - for rarecrow_number in range(1, 9): - tester.assertIn(f"Rarecrow #{rarecrow_number}", all_item_names) - - -def assert_has_deluxe_scarecrow_recipe(tester: SVTestBase, multiworld: MultiWorld): - all_item_names = set(get_all_item_names(multiworld)) - tester.assertIn(f"Deluxe Scarecrow Recipe", all_item_names) - - -def assert_festivals_give_access_to_deluxe_scarecrow(tester: SVTestBase, multiworld: MultiWorld): - stardew_options = get_stardew_options(multiworld) - has_festivals = stardew_options.festival_locations.value != options.FestivalLocations.option_disabled - if not has_festivals: - return - - assert_all_rarecrows_exist(tester, multiworld) - assert_has_deluxe_scarecrow_recipe(tester, multiworld) diff --git a/worlds/stardew_valley/test/checks/world_checks.py b/worlds/stardew_valley/test/checks/world_checks.py deleted file mode 100644 index 9bd9fd614c26..000000000000 --- a/worlds/stardew_valley/test/checks/world_checks.py +++ /dev/null @@ -1,33 +0,0 @@ -import unittest -from typing import List - -from BaseClasses import MultiWorld, ItemClassification -from ... import StardewItem - - -def get_all_item_names(multiworld: MultiWorld) -> List[str]: - return [item.name for item in multiworld.itempool] - - -def get_all_location_names(multiworld: MultiWorld) -> List[str]: - return [location.name for location in multiworld.get_locations() if not location.event] - - -def assert_victory_exists(tester: unittest.TestCase, multiworld: MultiWorld): - tester.assertIn(StardewItem("Victory", ItemClassification.progression, None, 1), multiworld.get_items()) - - -def collect_all_then_assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld): - for item in multiworld.get_items(): - multiworld.state.collect(item) - tester.assertTrue(multiworld.find_item("Victory", 1).can_reach(multiworld.state)) - - -def assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld): - assert_victory_exists(tester, multiworld) - collect_all_then_assert_can_win(tester, multiworld) - - -def assert_same_number_items_locations(tester: unittest.TestCase, multiworld: MultiWorld): - non_event_locations = [location for location in multiworld.get_locations() if not location.event] - tester.assertEqual(len(multiworld.itempool), len(non_event_locations)) \ No newline at end of file diff --git a/worlds/stardew_valley/test/long/TestModsLong.py b/worlds/stardew_valley/test/long/TestModsLong.py index 36a59ae854e5..9f76c10a9da4 100644 --- a/worlds/stardew_valley/test/long/TestModsLong.py +++ b/worlds/stardew_valley/test/long/TestModsLong.py @@ -1,57 +1,53 @@ import unittest -from typing import List, Union +from itertools import combinations, product -from BaseClasses import MultiWorld -from worlds.stardew_valley.mods.mod_data import all_mods -from worlds.stardew_valley.test import setup_solo_multiworld -from worlds.stardew_valley.test.TestOptions import basic_checks, SVTestCase -from worlds.stardew_valley.items import item_table -from worlds.stardew_valley.locations import location_table -from worlds.stardew_valley.options import Mods -from .option_names import options_to_include +from BaseClasses import get_seed +from .option_names import all_option_choices +from .. import SVTestCase +from ..assertion import WorldAssertMixin, ModAssertMixin +from ... import options +from ...mods.mod_data import all_mods, ModNames +assert unittest -def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: unittest.TestCase, multiworld: MultiWorld): - if isinstance(chosen_mods, str): - chosen_mods = [chosen_mods] - for multiworld_item in multiworld.get_items(): - item = item_table[multiworld_item.name] - tester.assertTrue(item.mod_name is None or item.mod_name in chosen_mods) - for multiworld_location in multiworld.get_locations(): - if multiworld_location.event: - continue - location = location_table[multiworld_location.name] - tester.assertTrue(location.mod_name is None or location.mod_name in chosen_mods) - -class TestGenerateModsOptions(SVTestCase): +class TestGenerateModsOptions(WorldAssertMixin, ModAssertMixin, SVTestCase): def test_given_mod_pairs_when_generate_then_basic_checks(self): if self.skip_long_tests: return - mods = list(all_mods) - num_mods = len(mods) - for mod1_index in range(0, num_mods): - for mod2_index in range(mod1_index + 1, num_mods): - mod1 = mods[mod1_index] - mod2 = mods[mod2_index] - mod_pair = (mod1, mod2) - with self.subTest(f"Mods: {mod_pair}"): - multiworld = setup_solo_multiworld({Mods: mod_pair}) - basic_checks(self, multiworld) - check_stray_mod_items(list(mod_pair), self, multiworld) + + for mod_pair in combinations(all_mods, 2): + world_options = { + options.Mods: frozenset(mod_pair) + } + + with self.solo_world_sub_test(f"Mods: {mod_pair}", world_options, world_caching=False) as (multiworld, _): + self.assert_basic_checks(multiworld) + self.assert_stray_mod_items(list(mod_pair), multiworld) def test_given_mod_names_when_generate_paired_with_other_options_then_basic_checks(self): if self.skip_long_tests: return - num_options = len(options_to_include) - for option_index in range(0, num_options): - option = options_to_include[option_index] - if not option.options: - continue - for value in option.options: - for mod in all_mods: - with self.subTest(f"{option.internal_name}: {value}, Mod: {mod}"): - multiworld = setup_solo_multiworld({option.internal_name: option.options[value], Mods: mod}) - basic_checks(self, multiworld) - check_stray_mod_items(mod, self, multiworld) \ No newline at end of file + + for mod, (option, value) in product(all_mods, all_option_choices): + world_options = { + option: value, + options.Mods: mod + } + + with self.solo_world_sub_test(f"{option.internal_name}: {value}, Mod: {mod}", world_options, world_caching=False) as (multiworld, _): + self.assert_basic_checks(multiworld) + self.assert_stray_mod_items(mod, multiworld) + + # @unittest.skip + def test_troubleshoot_option(self): + seed = get_seed(45949559493817417717) + world_options = { + options.ElevatorProgression: options.ElevatorProgression.option_vanilla, + options.Mods: ModNames.deepwoods + } + + with self.solo_world_sub_test(world_options=world_options, seed=seed, world_caching=False) as (multiworld, _): + self.assert_basic_checks(multiworld) + self.assert_stray_mod_items(world_options[options.Mods], multiworld) diff --git a/worlds/stardew_valley/test/long/TestOptionsLong.py b/worlds/stardew_valley/test/long/TestOptionsLong.py index e3da6968ed43..ca9fc01b2922 100644 --- a/worlds/stardew_valley/test/long/TestOptionsLong.py +++ b/worlds/stardew_valley/test/long/TestOptionsLong.py @@ -1,41 +1,43 @@ -import unittest -from typing import Dict +from itertools import combinations -from BaseClasses import MultiWorld -from Options import NamedRange -from .option_names import options_to_include -from worlds.stardew_valley.test.checks.world_checks import assert_can_win, assert_same_number_items_locations +from .option_names import all_option_choices from .. import setup_solo_multiworld, SVTestCase +from ..assertion.world_assert import WorldAssertMixin +from ... import options -def basic_checks(tester: unittest.TestCase, multiworld: MultiWorld): - assert_can_win(tester, multiworld) - assert_same_number_items_locations(tester, multiworld) +class TestGenerateDynamicOptions(WorldAssertMixin, SVTestCase): + def test_given_option_pair_when_generate_then_basic_checks(self): + if self.skip_long_tests: + return + for (option1, option1_choice), (option2, option2_choice) in combinations(all_option_choices, 2): + if option1 is option2: + continue -def get_option_choices(option) -> Dict[str, int]: - if issubclass(option, NamedRange): - return option.special_range_names - elif option.options: - return option.options - return {} + world_options = { + option1: option1_choice, + option2: option2_choice + } + with self.solo_world_sub_test(f"{option1.internal_name}: {option1_choice}, {option2.internal_name}: {option2_choice}", + world_options, + world_caching=False) \ + as (multiworld, _): + self.assert_basic_checks(multiworld) -class TestGenerateDynamicOptions(SVTestCase): - def test_given_option_pair_when_generate_then_basic_checks(self): - if self.skip_long_tests: - return - num_options = len(options_to_include) - for option1_index in range(0, num_options): - for option2_index in range(option1_index + 1, num_options): - option1 = options_to_include[option1_index] - option2 = options_to_include[option2_index] - option1_choices = get_option_choices(option1) - option2_choices = get_option_choices(option2) - for key1 in option1_choices: - for key2 in option2_choices: - with self.subTest(f"{option1.internal_name}: {key1}, {option2.internal_name}: {key2}"): - choices = {option1.internal_name: option1_choices[key1], - option2.internal_name: option2_choices[key2]} - multiworld = setup_solo_multiworld(choices) - basic_checks(self, multiworld) \ No newline at end of file + +class TestDynamicOptionDebug(WorldAssertMixin, SVTestCase): + + def test_option_pair_debug(self): + option_dict = { + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi, + options.Monstersanity.internal_name: options.Monstersanity.option_one_per_monster, + } + for i in range(1): + # seed = int(random() * pow(10, 18) - 1) + seed = 823942126251776128 + with self.subTest(f"Seed: {seed}"): + print(f"Seed: {seed}") + multiworld = setup_solo_multiworld(option_dict, seed) + self.assert_basic_checks(multiworld) diff --git a/worlds/stardew_valley/test/long/TestPreRolledRandomness.py b/worlds/stardew_valley/test/long/TestPreRolledRandomness.py new file mode 100644 index 000000000000..66bc5aeba8bb --- /dev/null +++ b/worlds/stardew_valley/test/long/TestPreRolledRandomness.py @@ -0,0 +1,25 @@ +from BaseClasses import get_seed +from .. import SVTestCase +from ..assertion import WorldAssertMixin +from ... import options + + +class TestGeneratePreRolledRandomness(WorldAssertMixin, SVTestCase): + def test_given_pre_rolled_difficult_randomness_when_generate_then_basic_checks(self): + if self.skip_long_tests: + return + choices = { + options.EntranceRandomization.internal_name: options.EntranceRandomization.option_buildings, + options.BundleRandomization.internal_name: options.BundleRandomization.option_remixed, + options.BundlePrice.internal_name: options.BundlePrice.option_maximum + } + + num_tests = 1000 + for i in range(num_tests): + seed = get_seed() # Put seed in parameter to test + with self.solo_world_sub_test(f"Entrance Randomizer and Remixed Bundles", + choices, + seed=seed, + world_caching=False) \ + as (multiworld, _): + self.assert_basic_checks(multiworld) diff --git a/worlds/stardew_valley/test/long/TestRandomWorlds.py b/worlds/stardew_valley/test/long/TestRandomWorlds.py index 1f1d59652c5e..f3702c05f42b 100644 --- a/worlds/stardew_valley/test/long/TestRandomWorlds.py +++ b/worlds/stardew_valley/test/long/TestRandomWorlds.py @@ -1,14 +1,11 @@ -from typing import Dict import random +from typing import Dict -from BaseClasses import MultiWorld +from BaseClasses import MultiWorld, get_seed from Options import NamedRange, Range from .option_names import options_to_include from .. import setup_solo_multiworld, SVTestCase -from ..checks.goal_checks import assert_perfection_world_is_valid, assert_goal_world_is_valid -from ..checks.option_checks import assert_can_reach_island_if_should, assert_cropsanity_same_number_items_and_locations, \ - assert_festivals_give_access_to_deluxe_scarecrow -from ..checks.world_checks import assert_same_number_items_locations, assert_victory_exists +from ..assertion import GoalAssertMixin, OptionAssertMixin, WorldAssertMixin def get_option_choices(option) -> Dict[str, int]: @@ -27,10 +24,10 @@ def generate_random_multiworld(world_id: int): return multiworld -def generate_random_world_options(world_id: int) -> Dict[str, int]: +def generate_random_world_options(seed: int) -> Dict[str, int]: num_options = len(options_to_include) world_options = dict() - rng = random.Random(world_id) + rng = random.Random(seed) for option_index in range(0, num_options): option = options_to_include[option_index] option_choices = get_option_choices(option) @@ -57,42 +54,37 @@ def get_number_log_steps(number_worlds: int) -> int: return 100 -def generate_many_worlds(number_worlds: int, start_index: int) -> Dict[int, MultiWorld]: - num_steps = get_number_log_steps(number_worlds) - log_step = number_worlds / num_steps - multiworlds = dict() - print(f"Generating {number_worlds} Solo Multiworlds [Start Seed: {start_index}] for Stardew Valley...") - for world_number in range(0, number_worlds + 1): - world_id = world_number + start_index - multiworld = generate_random_multiworld(world_id) - multiworlds[world_id] = multiworld - if world_number > 0 and world_number % log_step == 0: - print(f"Generated {world_number}/{number_worlds} worlds [{(world_number * 100) // number_worlds}%]") - print(f"Finished generating {number_worlds} Solo Multiworlds for Stardew Valley") - return multiworlds +class TestGenerateManyWorlds(GoalAssertMixin, OptionAssertMixin, WorldAssertMixin, SVTestCase): + def test_generate_many_worlds_then_check_results(self): + if self.skip_long_tests: + return + number_worlds = 10 if self.skip_long_tests else 1000 + seed = get_seed() + self.generate_and_check_many_worlds(number_worlds, seed) + def generate_and_check_many_worlds(self, number_worlds: int, seed: int): + num_steps = get_number_log_steps(number_worlds) + log_step = number_worlds / num_steps -def check_every_multiworld_is_valid(tester: SVTestCase, multiworlds: Dict[int, MultiWorld]): - for multiworld_id in multiworlds: - multiworld = multiworlds[multiworld_id] - with tester.subTest(f"Checking validity of world {multiworld_id}"): - check_multiworld_is_valid(tester, multiworld_id, multiworld) + print(f"Generating {number_worlds} Solo Multiworlds [Start Seed: {seed}] for Stardew Valley...") + for world_number in range(0, number_worlds + 1): + world_seed = world_number + seed + world_options = generate_random_world_options(world_seed) -def check_multiworld_is_valid(tester: SVTestCase, multiworld_id: int, multiworld: MultiWorld): - assert_victory_exists(tester, multiworld) - assert_same_number_items_locations(tester, multiworld) - assert_goal_world_is_valid(tester, multiworld) - assert_can_reach_island_if_should(tester, multiworld) - assert_cropsanity_same_number_items_and_locations(tester, multiworld) - assert_festivals_give_access_to_deluxe_scarecrow(tester, multiworld) + with self.solo_world_sub_test(f"Multiworld: {world_seed}", world_options, seed=world_seed, world_caching=False) as (multiworld, _): + self.assert_multiworld_is_valid(multiworld) + if world_number > 0 and world_number % log_step == 0: + print(f"Generated and Verified {world_number}/{number_worlds} worlds [{(world_number * 100) // number_worlds}%]") -class TestGenerateManyWorlds(SVTestCase): - def test_generate_many_worlds_then_check_results(self): - if self.skip_long_tests: - return - number_worlds = 1000 - start_index = random.Random().randint(0, 9999999999) - multiworlds = generate_many_worlds(number_worlds, start_index) - check_every_multiworld_is_valid(self, multiworlds) + print(f"Finished generating and verifying {number_worlds} Solo Multiworlds for Stardew Valley") + + def assert_multiworld_is_valid(self, multiworld: MultiWorld): + self.assert_victory_exists(multiworld) + self.assert_same_number_items_locations(multiworld) + self.assert_goal_world_is_valid(multiworld) + self.assert_can_reach_island_if_should(multiworld) + self.assert_cropsanity_same_number_items_and_locations(multiworld) + self.assert_festivals_give_access_to_deluxe_scarecrow(multiworld) + self.assert_has_festival_recipes(multiworld) diff --git a/worlds/stardew_valley/test/long/option_names.py b/worlds/stardew_valley/test/long/option_names.py index 649d0da5b33f..9f3cf98b872c 100644 --- a/worlds/stardew_valley/test/long/option_names.py +++ b/worlds/stardew_valley/test/long/option_names.py @@ -1,8 +1,30 @@ +from typing import Dict + +from Options import NamedRange from ... import StardewValleyWorld -options_to_exclude = ["profit_margin", "starting_money", "multiple_day_sleep_enabled", "multiple_day_sleep_cost", +options_to_exclude = {"profit_margin", "starting_money", "multiple_day_sleep_enabled", "multiple_day_sleep_cost", "experience_multiplier", "friendship_multiplier", "debris_multiplier", - "quick_start", "gifting", "gift_tax", "progression_balancing", "accessibility", "start_inventory", "start_hints", "death_link"] + "quick_start", "gifting", "gift_tax", + "progression_balancing", "accessibility", "start_inventory", "start_hints", "death_link"} -options_to_include = [option for option_name, option in StardewValleyWorld.options_dataclass.type_hints.items() +options_to_include = [option + for option_name, option in StardewValleyWorld.options_dataclass.type_hints.items() if option_name not in options_to_exclude] + + +def get_option_choices(option) -> Dict[str, int]: + if issubclass(option, NamedRange): + return option.special_range_names + elif option.options: + return option.options + return {} + + +all_option_choices = [(option, value) + for option in options_to_include + if option.options + for value in get_option_choices(option) + if option.default != get_option_choices(option)[value]] + +assert all_option_choices diff --git a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py index bc81f21963d8..f6d312976c45 100644 --- a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py +++ b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py @@ -1,11 +1,13 @@ from .. import SVTestBase -from ... import options from ...mods.mod_data import ModNames +from ...options import Mods, BackpackProgression class TestBiggerBackpackVanilla(SVTestBase): - options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla, - options.Mods.internal_name: ModNames.big_backpack} + options = { + BackpackProgression.internal_name: BackpackProgression.option_vanilla, + Mods.internal_name: ModNames.big_backpack + } def test_no_backpack(self): with self.subTest(check="no items"): @@ -20,8 +22,10 @@ def test_no_backpack(self): class TestBiggerBackpackProgressive(SVTestBase): - options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive, - options.Mods.internal_name: ModNames.big_backpack} + options = { + BackpackProgression.internal_name: BackpackProgression.option_progressive, + Mods.internal_name: ModNames.big_backpack + } def test_backpack(self): with self.subTest(check="has items"): @@ -36,8 +40,10 @@ def test_backpack(self): class TestBiggerBackpackEarlyProgressive(TestBiggerBackpackProgressive): - options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_early_progressive, - options.Mods.internal_name: ModNames.big_backpack} + options = { + BackpackProgression.internal_name: BackpackProgression.option_early_progressive, + Mods.internal_name: ModNames.big_backpack + } def test_backpack(self): super().test_backpack() diff --git a/worlds/stardew_valley/test/mods/TestModFish.py b/worlds/stardew_valley/test/mods/TestModFish.py new file mode 100644 index 000000000000..81ac6ac0fb99 --- /dev/null +++ b/worlds/stardew_valley/test/mods/TestModFish.py @@ -0,0 +1,226 @@ +import unittest +from typing import Set + +from ...data.fish_data import get_fish_for_mods +from ...mods.mod_data import ModNames +from ...strings.fish_names import Fish, SVEFish + +no_mods: Set[str] = set() +sve: Set[str] = {ModNames.sve} + + +class TestGetFishForMods(unittest.TestCase): + + def test_no_mods_all_vanilla_fish(self): + all_fish = get_fish_for_mods(no_mods) + fish_names = {fish.name for fish in all_fish} + + self.assertIn(Fish.albacore, fish_names) + self.assertIn(Fish.anchovy, fish_names) + self.assertIn(Fish.blue_discus, fish_names) + self.assertIn(Fish.bream, fish_names) + self.assertIn(Fish.bullhead, fish_names) + self.assertIn(Fish.carp, fish_names) + self.assertIn(Fish.catfish, fish_names) + self.assertIn(Fish.chub, fish_names) + self.assertIn(Fish.dorado, fish_names) + self.assertIn(Fish.eel, fish_names) + self.assertIn(Fish.flounder, fish_names) + self.assertIn(Fish.ghostfish, fish_names) + self.assertIn(Fish.halibut, fish_names) + self.assertIn(Fish.herring, fish_names) + self.assertIn(Fish.ice_pip, fish_names) + self.assertIn(Fish.largemouth_bass, fish_names) + self.assertIn(Fish.lava_eel, fish_names) + self.assertIn(Fish.lingcod, fish_names) + self.assertIn(Fish.lionfish, fish_names) + self.assertIn(Fish.midnight_carp, fish_names) + self.assertIn(Fish.octopus, fish_names) + self.assertIn(Fish.perch, fish_names) + self.assertIn(Fish.pike, fish_names) + self.assertIn(Fish.pufferfish, fish_names) + self.assertIn(Fish.rainbow_trout, fish_names) + self.assertIn(Fish.red_mullet, fish_names) + self.assertIn(Fish.red_snapper, fish_names) + self.assertIn(Fish.salmon, fish_names) + self.assertIn(Fish.sandfish, fish_names) + self.assertIn(Fish.sardine, fish_names) + self.assertIn(Fish.scorpion_carp, fish_names) + self.assertIn(Fish.sea_cucumber, fish_names) + self.assertIn(Fish.shad, fish_names) + self.assertIn(Fish.slimejack, fish_names) + self.assertIn(Fish.smallmouth_bass, fish_names) + self.assertIn(Fish.squid, fish_names) + self.assertIn(Fish.stingray, fish_names) + self.assertIn(Fish.stonefish, fish_names) + self.assertIn(Fish.sturgeon, fish_names) + self.assertIn(Fish.sunfish, fish_names) + self.assertIn(Fish.super_cucumber, fish_names) + self.assertIn(Fish.tiger_trout, fish_names) + self.assertIn(Fish.tilapia, fish_names) + self.assertIn(Fish.tuna, fish_names) + self.assertIn(Fish.void_salmon, fish_names) + self.assertIn(Fish.walleye, fish_names) + self.assertIn(Fish.woodskip, fish_names) + self.assertIn(Fish.blob_fish, fish_names) + self.assertIn(Fish.midnight_squid, fish_names) + self.assertIn(Fish.spook_fish, fish_names) + self.assertIn(Fish.angler, fish_names) + self.assertIn(Fish.crimsonfish, fish_names) + self.assertIn(Fish.glacierfish, fish_names) + self.assertIn(Fish.legend, fish_names) + self.assertIn(Fish.mutant_carp, fish_names) + self.assertIn(Fish.ms_angler, fish_names) + self.assertIn(Fish.son_of_crimsonfish, fish_names) + self.assertIn(Fish.glacierfish_jr, fish_names) + self.assertIn(Fish.legend_ii, fish_names) + self.assertIn(Fish.radioactive_carp, fish_names) + self.assertIn(Fish.clam, fish_names) + self.assertIn(Fish.cockle, fish_names) + self.assertIn(Fish.crab, fish_names) + self.assertIn(Fish.crayfish, fish_names) + self.assertIn(Fish.lobster, fish_names) + self.assertIn(Fish.mussel, fish_names) + self.assertIn(Fish.oyster, fish_names) + self.assertIn(Fish.periwinkle, fish_names) + self.assertIn(Fish.shrimp, fish_names) + self.assertIn(Fish.snail, fish_names) + + def test_no_mods_no_sve_fish(self): + all_fish = get_fish_for_mods(no_mods) + fish_names = {fish.name for fish in all_fish} + + self.assertNotIn(SVEFish.baby_lunaloo, fish_names) + self.assertNotIn(SVEFish.bonefish, fish_names) + self.assertNotIn(SVEFish.bull_trout, fish_names) + self.assertNotIn(SVEFish.butterfish, fish_names) + self.assertNotIn(SVEFish.clownfish, fish_names) + self.assertNotIn(SVEFish.daggerfish, fish_names) + self.assertNotIn(SVEFish.frog, fish_names) + self.assertNotIn(SVEFish.gemfish, fish_names) + self.assertNotIn(SVEFish.goldenfish, fish_names) + self.assertNotIn(SVEFish.grass_carp, fish_names) + self.assertNotIn(SVEFish.king_salmon, fish_names) + self.assertNotIn(SVEFish.kittyfish, fish_names) + self.assertNotIn(SVEFish.lunaloo, fish_names) + self.assertNotIn(SVEFish.meteor_carp, fish_names) + self.assertNotIn(SVEFish.minnow, fish_names) + self.assertNotIn(SVEFish.puppyfish, fish_names) + self.assertNotIn(SVEFish.radioactive_bass, fish_names) + self.assertNotIn(SVEFish.seahorse, fish_names) + self.assertNotIn(SVEFish.shiny_lunaloo, fish_names) + self.assertNotIn(SVEFish.snatcher_worm, fish_names) + self.assertNotIn(SVEFish.starfish, fish_names) + self.assertNotIn(SVEFish.torpedo_trout, fish_names) + self.assertNotIn(SVEFish.undeadfish, fish_names) + self.assertNotIn(SVEFish.void_eel, fish_names) + self.assertNotIn(SVEFish.water_grub, fish_names) + self.assertNotIn(SVEFish.sea_sponge, fish_names) + self.assertNotIn(SVEFish.dulse_seaweed, fish_names) + + def test_sve_all_vanilla_fish(self): + all_fish = get_fish_for_mods(no_mods) + fish_names = {fish.name for fish in all_fish} + + self.assertIn(Fish.albacore, fish_names) + self.assertIn(Fish.anchovy, fish_names) + self.assertIn(Fish.blue_discus, fish_names) + self.assertIn(Fish.bream, fish_names) + self.assertIn(Fish.bullhead, fish_names) + self.assertIn(Fish.carp, fish_names) + self.assertIn(Fish.catfish, fish_names) + self.assertIn(Fish.chub, fish_names) + self.assertIn(Fish.dorado, fish_names) + self.assertIn(Fish.eel, fish_names) + self.assertIn(Fish.flounder, fish_names) + self.assertIn(Fish.ghostfish, fish_names) + self.assertIn(Fish.halibut, fish_names) + self.assertIn(Fish.herring, fish_names) + self.assertIn(Fish.ice_pip, fish_names) + self.assertIn(Fish.largemouth_bass, fish_names) + self.assertIn(Fish.lava_eel, fish_names) + self.assertIn(Fish.lingcod, fish_names) + self.assertIn(Fish.lionfish, fish_names) + self.assertIn(Fish.midnight_carp, fish_names) + self.assertIn(Fish.octopus, fish_names) + self.assertIn(Fish.perch, fish_names) + self.assertIn(Fish.pike, fish_names) + self.assertIn(Fish.pufferfish, fish_names) + self.assertIn(Fish.rainbow_trout, fish_names) + self.assertIn(Fish.red_mullet, fish_names) + self.assertIn(Fish.red_snapper, fish_names) + self.assertIn(Fish.salmon, fish_names) + self.assertIn(Fish.sandfish, fish_names) + self.assertIn(Fish.sardine, fish_names) + self.assertIn(Fish.scorpion_carp, fish_names) + self.assertIn(Fish.sea_cucumber, fish_names) + self.assertIn(Fish.shad, fish_names) + self.assertIn(Fish.slimejack, fish_names) + self.assertIn(Fish.smallmouth_bass, fish_names) + self.assertIn(Fish.squid, fish_names) + self.assertIn(Fish.stingray, fish_names) + self.assertIn(Fish.stonefish, fish_names) + self.assertIn(Fish.sturgeon, fish_names) + self.assertIn(Fish.sunfish, fish_names) + self.assertIn(Fish.super_cucumber, fish_names) + self.assertIn(Fish.tiger_trout, fish_names) + self.assertIn(Fish.tilapia, fish_names) + self.assertIn(Fish.tuna, fish_names) + self.assertIn(Fish.void_salmon, fish_names) + self.assertIn(Fish.walleye, fish_names) + self.assertIn(Fish.woodskip, fish_names) + self.assertIn(Fish.blob_fish, fish_names) + self.assertIn(Fish.midnight_squid, fish_names) + self.assertIn(Fish.spook_fish, fish_names) + self.assertIn(Fish.angler, fish_names) + self.assertIn(Fish.crimsonfish, fish_names) + self.assertIn(Fish.glacierfish, fish_names) + self.assertIn(Fish.legend, fish_names) + self.assertIn(Fish.mutant_carp, fish_names) + self.assertIn(Fish.ms_angler, fish_names) + self.assertIn(Fish.son_of_crimsonfish, fish_names) + self.assertIn(Fish.glacierfish_jr, fish_names) + self.assertIn(Fish.legend_ii, fish_names) + self.assertIn(Fish.radioactive_carp, fish_names) + self.assertIn(Fish.clam, fish_names) + self.assertIn(Fish.cockle, fish_names) + self.assertIn(Fish.crab, fish_names) + self.assertIn(Fish.crayfish, fish_names) + self.assertIn(Fish.lobster, fish_names) + self.assertIn(Fish.mussel, fish_names) + self.assertIn(Fish.oyster, fish_names) + self.assertIn(Fish.periwinkle, fish_names) + self.assertIn(Fish.shrimp, fish_names) + self.assertIn(Fish.snail, fish_names) + + def test_sve_has_sve_fish(self): + all_fish = get_fish_for_mods(sve) + fish_names = {fish.name for fish in all_fish} + + self.assertIn(SVEFish.baby_lunaloo, fish_names) + self.assertIn(SVEFish.bonefish, fish_names) + self.assertIn(SVEFish.bull_trout, fish_names) + self.assertIn(SVEFish.butterfish, fish_names) + self.assertIn(SVEFish.clownfish, fish_names) + self.assertIn(SVEFish.daggerfish, fish_names) + self.assertIn(SVEFish.frog, fish_names) + self.assertIn(SVEFish.gemfish, fish_names) + self.assertIn(SVEFish.goldenfish, fish_names) + self.assertIn(SVEFish.grass_carp, fish_names) + self.assertIn(SVEFish.king_salmon, fish_names) + self.assertIn(SVEFish.kittyfish, fish_names) + self.assertIn(SVEFish.lunaloo, fish_names) + self.assertIn(SVEFish.meteor_carp, fish_names) + self.assertIn(SVEFish.minnow, fish_names) + self.assertIn(SVEFish.puppyfish, fish_names) + self.assertIn(SVEFish.radioactive_bass, fish_names) + self.assertIn(SVEFish.seahorse, fish_names) + self.assertIn(SVEFish.shiny_lunaloo, fish_names) + self.assertIn(SVEFish.snatcher_worm, fish_names) + self.assertIn(SVEFish.starfish, fish_names) + self.assertIn(SVEFish.torpedo_trout, fish_names) + self.assertIn(SVEFish.undeadfish, fish_names) + self.assertIn(SVEFish.void_eel, fish_names) + self.assertIn(SVEFish.water_grub, fish_names) + self.assertIn(SVEFish.sea_sponge, fish_names) + self.assertIn(SVEFish.dulse_seaweed, fish_names) diff --git a/worlds/stardew_valley/test/mods/TestModVillagers.py b/worlds/stardew_valley/test/mods/TestModVillagers.py new file mode 100644 index 000000000000..3be437c3f737 --- /dev/null +++ b/worlds/stardew_valley/test/mods/TestModVillagers.py @@ -0,0 +1,132 @@ +import unittest +from typing import Set + +from ...data.villagers_data import get_villagers_for_mods +from ...mods.mod_data import ModNames +from ...strings.villager_names import NPC, ModNPC + +no_mods: Set[str] = set() +sve: Set[str] = {ModNames.sve} + + +class TestGetVillagersForMods(unittest.TestCase): + + def test_no_mods_all_vanilla_villagers(self): + villagers = get_villagers_for_mods(no_mods) + villager_names = {villager.name for villager in villagers} + + self.assertIn(NPC.alex, villager_names) + self.assertIn(NPC.elliott, villager_names) + self.assertIn(NPC.harvey, villager_names) + self.assertIn(NPC.sam, villager_names) + self.assertIn(NPC.sebastian, villager_names) + self.assertIn(NPC.shane, villager_names) + self.assertIn(NPC.abigail, villager_names) + self.assertIn(NPC.emily, villager_names) + self.assertIn(NPC.haley, villager_names) + self.assertIn(NPC.leah, villager_names) + self.assertIn(NPC.maru, villager_names) + self.assertIn(NPC.penny, villager_names) + self.assertIn(NPC.caroline, villager_names) + self.assertIn(NPC.clint, villager_names) + self.assertIn(NPC.demetrius, villager_names) + self.assertIn(NPC.dwarf, villager_names) + self.assertIn(NPC.evelyn, villager_names) + self.assertIn(NPC.george, villager_names) + self.assertIn(NPC.gus, villager_names) + self.assertIn(NPC.jas, villager_names) + self.assertIn(NPC.jodi, villager_names) + self.assertIn(NPC.kent, villager_names) + self.assertIn(NPC.krobus, villager_names) + self.assertIn(NPC.leo, villager_names) + self.assertIn(NPC.lewis, villager_names) + self.assertIn(NPC.linus, villager_names) + self.assertIn(NPC.marnie, villager_names) + self.assertIn(NPC.pam, villager_names) + self.assertIn(NPC.pierre, villager_names) + self.assertIn(NPC.robin, villager_names) + self.assertIn(NPC.sandy, villager_names) + self.assertIn(NPC.vincent, villager_names) + self.assertIn(NPC.willy, villager_names) + self.assertIn(NPC.wizard, villager_names) + + def test_no_mods_no_mod_villagers(self): + villagers = get_villagers_for_mods(no_mods) + villager_names = {villager.name for villager in villagers} + + self.assertNotIn(ModNPC.alec, villager_names) + self.assertNotIn(ModNPC.ayeisha, villager_names) + self.assertNotIn(ModNPC.delores, villager_names) + self.assertNotIn(ModNPC.eugene, villager_names) + self.assertNotIn(ModNPC.jasper, villager_names) + self.assertNotIn(ModNPC.juna, villager_names) + self.assertNotIn(ModNPC.mr_ginger, villager_names) + self.assertNotIn(ModNPC.riley, villager_names) + self.assertNotIn(ModNPC.shiko, villager_names) + self.assertNotIn(ModNPC.wellwick, villager_names) + self.assertNotIn(ModNPC.yoba, villager_names) + self.assertNotIn(ModNPC.lance, villager_names) + self.assertNotIn(ModNPC.apples, villager_names) + self.assertNotIn(ModNPC.claire, villager_names) + self.assertNotIn(ModNPC.olivia, villager_names) + self.assertNotIn(ModNPC.sophia, villager_names) + self.assertNotIn(ModNPC.victor, villager_names) + self.assertNotIn(ModNPC.andy, villager_names) + self.assertNotIn(ModNPC.gunther, villager_names) + self.assertNotIn(ModNPC.martin, villager_names) + self.assertNotIn(ModNPC.marlon, villager_names) + self.assertNotIn(ModNPC.morgan, villager_names) + self.assertNotIn(ModNPC.morris, villager_names) + self.assertNotIn(ModNPC.scarlett, villager_names) + self.assertNotIn(ModNPC.susan, villager_names) + self.assertNotIn(ModNPC.goblin, villager_names) + self.assertNotIn(ModNPC.alecto, villager_names) + + def test_sve_has_sve_villagers(self): + villagers = get_villagers_for_mods(sve) + villager_names = {villager.name for villager in villagers} + + self.assertIn(ModNPC.lance, villager_names) + self.assertIn(ModNPC.apples, villager_names) + self.assertIn(ModNPC.claire, villager_names) + self.assertIn(ModNPC.olivia, villager_names) + self.assertIn(ModNPC.sophia, villager_names) + self.assertIn(ModNPC.victor, villager_names) + self.assertIn(ModNPC.andy, villager_names) + self.assertIn(ModNPC.gunther, villager_names) + self.assertIn(ModNPC.martin, villager_names) + self.assertIn(ModNPC.marlon, villager_names) + self.assertIn(ModNPC.morgan, villager_names) + self.assertIn(ModNPC.morris, villager_names) + self.assertIn(ModNPC.scarlett, villager_names) + self.assertIn(ModNPC.susan, villager_names) + + def test_sve_has_no_other_mod_villagers(self): + villagers = get_villagers_for_mods(sve) + villager_names = {villager.name for villager in villagers} + + self.assertNotIn(ModNPC.alec, villager_names) + self.assertNotIn(ModNPC.ayeisha, villager_names) + self.assertNotIn(ModNPC.delores, villager_names) + self.assertNotIn(ModNPC.eugene, villager_names) + self.assertNotIn(ModNPC.jasper, villager_names) + self.assertNotIn(ModNPC.juna, villager_names) + self.assertNotIn(ModNPC.mr_ginger, villager_names) + self.assertNotIn(ModNPC.riley, villager_names) + self.assertNotIn(ModNPC.shiko, villager_names) + self.assertNotIn(ModNPC.wellwick, villager_names) + self.assertNotIn(ModNPC.yoba, villager_names) + self.assertNotIn(ModNPC.goblin, villager_names) + self.assertNotIn(ModNPC.alecto, villager_names) + + def test_no_mods_wizard_is_not_bachelor(self): + villagers = get_villagers_for_mods(no_mods) + villagers_by_name = {villager.name: villager for villager in villagers} + self.assertFalse(villagers_by_name[NPC.wizard].bachelor) + self.assertEqual(villagers_by_name[NPC.wizard].mod_name, ModNames.vanilla) + + def test_sve_wizard_is_bachelor(self): + villagers = get_villagers_for_mods(sve) + villagers_by_name = {villager.name: villager for villager in villagers} + self.assertTrue(villagers_by_name[NPC.wizard].bachelor) + self.assertEqual(villagers_by_name[NPC.wizard].mod_name, ModNames.sve) diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py index 9bdabaf73f14..57bca5f25645 100644 --- a/worlds/stardew_valley/test/mods/TestMods.py +++ b/worlds/stardew_valley/test/mods/TestMods.py @@ -1,69 +1,74 @@ -from typing import List, Union -import unittest import random -import sys -from BaseClasses import MultiWorld -from ...mods.mod_data import all_mods -from .. import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_without_mods -from ..TestOptions import basic_checks +from BaseClasses import get_seed +from .. import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_without_mods, allsanity_options_with_mods, complete_options_with_default +from ..assertion import ModAssertMixin, WorldAssertMixin from ... import items, Group, ItemClassification -from ...regions import RandomizationFlag, create_final_connections, randomize_connections, create_final_regions -from ...items import item_table, items_by_group -from ...locations import location_table -from ...options import Mods, EntranceRandomization, Friendsanity, SeasonRandomization, SpecialOrderLocations, ExcludeGingerIsland, TrapItems - - -def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: unittest.TestCase, multiworld: MultiWorld): - if isinstance(chosen_mods, str): - chosen_mods = [chosen_mods] - for multiworld_item in multiworld.get_items(): - item = item_table[multiworld_item.name] - tester.assertTrue(item.mod_name is None or item.mod_name in chosen_mods) - for multiworld_location in multiworld.get_locations(): - if multiworld_location.event: - continue - location = location_table[multiworld_location.name] - tester.assertTrue(location.mod_name is None or location.mod_name in chosen_mods) +from ... import options +from ...items import items_by_group +from ...mods.mod_data import all_mods +from ...regions import RandomizationFlag, randomize_connections, create_final_connections_and_regions -class TestGenerateModsOptions(SVTestCase): +class TestGenerateModsOptions(WorldAssertMixin, ModAssertMixin, SVTestCase): def test_given_single_mods_when_generate_then_basic_checks(self): for mod in all_mods: - with self.subTest(f"Mod: {mod}"): - multi_world = setup_solo_multiworld({Mods: mod}) - basic_checks(self, multi_world) - check_stray_mod_items(mod, self, multi_world) + with self.solo_world_sub_test(f"Mod: {mod}", {options.Mods: mod}, dirty_state=True) as (multi_world, _): + self.assert_basic_checks(multi_world) + self.assert_stray_mod_items(mod, multi_world) def test_given_mod_names_when_generate_paired_with_entrance_randomizer_then_basic_checks(self): - for option in EntranceRandomization.options: + for option in options.EntranceRandomization.options: for mod in all_mods: - with self.subTest(f"entrance_randomization: {option}, Mod: {mod}"): - multiworld = setup_solo_multiworld({EntranceRandomization.internal_name: option, Mods: mod}) - basic_checks(self, multiworld) - check_stray_mod_items(mod, self, multiworld) - if self.skip_extra_tests: - return # assume the rest will work as well + world_options = { + options.EntranceRandomization.internal_name: options.EntranceRandomization.options[option], + options.Mods: mod + } + with self.solo_world_sub_test(f"entrance_randomization: {option}, Mod: {mod}", world_options, dirty_state=True) as (multi_world, _): + self.assert_basic_checks(multi_world) + self.assert_stray_mod_items(mod, multi_world) + + def test_allsanity_all_mods_when_generate_then_basic_checks(self): + with self.solo_world_sub_test(world_options=allsanity_options_with_mods(), dirty_state=True) as (multi_world, _): + self.assert_basic_checks(multi_world) + + def test_allsanity_all_mods_exclude_island_when_generate_then_basic_checks(self): + world_options = allsanity_options_with_mods() + world_options.update({options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true}) + with self.solo_world_sub_test(world_options=world_options, dirty_state=True) as (multi_world, _): + self.assert_basic_checks(multi_world) + + +class TestBaseLocationDependencies(SVTestBase): + options = { + options.Mods.internal_name: all_mods, + options.ToolProgression.internal_name: options.ToolProgression.option_progressive, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized + } class TestBaseItemGeneration(SVTestBase): options = { - Friendsanity.internal_name: Friendsanity.option_all_with_marriage, - SeasonRandomization.internal_name: SeasonRandomization.option_progressive, - SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, - Mods.internal_name: all_mods + options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive, + options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi, + options.Shipsanity.internal_name: options.Shipsanity.option_everything, + options.Chefsanity.internal_name: options.Chefsanity.option_all, + options.Craftsanity.internal_name: options.Craftsanity.option_all, + options.Mods.internal_name: all_mods } def test_all_progression_items_are_added_to_the_pool(self): all_created_items = [item.name for item in self.multiworld.itempool] # Ignore all the stuff that the algorithm chooses one of, instead of all, to fulfill logical progression items_to_ignore = [event.name for event in items.events] + items_to_ignore.extend(deprecated.name for deprecated in items.items_by_group[Group.DEPRECATED]) items_to_ignore.extend(season.name for season in items.items_by_group[Group.SEASON]) items_to_ignore.extend(weapon.name for weapon in items.items_by_group[Group.WEAPON]) - items_to_ignore.extend(footwear.name for footwear in items.items_by_group[Group.FOOTWEAR]) items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY]) items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK]) + items_to_ignore.append("The Gateway Gazette") progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore] for progression_item in progression_items: @@ -73,21 +78,25 @@ def test_all_progression_items_are_added_to_the_pool(self): class TestNoGingerIslandModItemGeneration(SVTestBase): options = { - Friendsanity.internal_name: Friendsanity.option_all_with_marriage, - SeasonRandomization.internal_name: SeasonRandomization.option_progressive, - ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true, - Mods.internal_name: all_mods + options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage, + options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true, + options.Shipsanity.internal_name: options.Shipsanity.option_everything, + options.Chefsanity.internal_name: options.Chefsanity.option_all, + options.Craftsanity.internal_name: options.Craftsanity.option_all, + options.Mods.internal_name: all_mods } def test_all_progression_items_except_island_are_added_to_the_pool(self): all_created_items = [item.name for item in self.multiworld.itempool] # Ignore all the stuff that the algorithm chooses one of, instead of all, to fulfill logical progression items_to_ignore = [event.name for event in items.events] + items_to_ignore.extend(deprecated.name for deprecated in items.items_by_group[Group.DEPRECATED]) items_to_ignore.extend(season.name for season in items.items_by_group[Group.SEASON]) items_to_ignore.extend(weapon.name for weapon in items.items_by_group[Group.WEAPON]) - items_to_ignore.extend(footwear.name for footwear in items.items_by_group[Group.FOOTWEAR]) items_to_ignore.extend(baby.name for baby in items.items_by_group[Group.BABY]) items_to_ignore.extend(resource_pack.name for resource_pack in items.items_by_group[Group.RESOURCE_PACK]) + items_to_ignore.append("The Gateway Gazette") progression_items = [item for item in items.all_items if item.classification is ItemClassification.progression and item.name not in items_to_ignore] for progression_item in progression_items: @@ -101,44 +110,41 @@ def test_all_progression_items_except_island_are_added_to_the_pool(self): class TestModEntranceRando(SVTestCase): def test_mod_entrance_randomization(self): - - for option, flag in [(EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), - (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), - (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: - with self.subTest(option=option, flag=flag): - seed = random.randrange(sys.maxsize) - rand = random.Random(seed) - world_options = {EntranceRandomization.internal_name: option, - ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false, - Mods.internal_name: all_mods} - multiworld = setup_solo_multiworld(world_options) - world = multiworld.worlds[1] - final_regions = create_final_regions(world.options) - final_connections = create_final_connections(world.options) - - regions_by_name = {region.name: region for region in final_regions} - _, randomized_connections = randomize_connections(rand, world.options, regions_by_name) - - for connection in final_connections: + for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN), + (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION), + (options.EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]: + sv_options = complete_options_with_default({ + options.EntranceRandomization.internal_name: option, + options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false, + options.Mods.internal_name: all_mods + }) + seed = get_seed() + rand = random.Random(seed) + with self.subTest(option=option, flag=flag, seed=seed): + final_connections, final_regions = create_final_connections_and_regions(sv_options) + + _, randomized_connections = randomize_connections(rand, sv_options, final_regions, final_connections) + + for connection_name in final_connections: + connection = final_connections[connection_name] if flag in connection.flag: - connection_in_randomized = connection.name in randomized_connections + connection_in_randomized = connection_name in randomized_connections reverse_in_randomized = connection.reverse in randomized_connections - self.assertTrue(connection_in_randomized, - f"Connection {connection.name} should be randomized but it is not in the output. Seed = {seed}") - self.assertTrue(reverse_in_randomized, - f"Connection {connection.reverse} should be randomized but it is not in the output. Seed = {seed}") + self.assertTrue(connection_in_randomized, f"Connection {connection_name} should be randomized but it is not in the output") + self.assertTrue(reverse_in_randomized, f"Connection {connection.reverse} should be randomized but it is not in the output.") self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()), - f"Connections are duplicated in randomization. Seed = {seed}") + f"Connections are duplicated in randomization.") class TestModTraps(SVTestCase): def test_given_traps_when_generate_then_all_traps_in_pool(self): - for value in TrapItems.options: + for value in options.TrapItems.options: if value == "no_traps": continue + world_options = allsanity_options_without_mods() - world_options.update({TrapItems.internal_name: TrapItems.options[value], Mods: "Magic"}) + world_options.update({options.TrapItems.internal_name: options.TrapItems.options[value], options.Mods: "Magic"}) multi_world = setup_solo_multiworld(world_options) trap_items = [item_data.name for item_data in items_by_group[Group.TRAP] if Group.DEPRECATED not in item_data.groups] multiworld_items = [item.name for item in multi_world.get_items()] diff --git a/worlds/stardew_valley/test/performance/TestPerformance.py b/worlds/stardew_valley/test/performance/TestPerformance.py new file mode 100644 index 000000000000..0d453942c35f --- /dev/null +++ b/worlds/stardew_valley/test/performance/TestPerformance.py @@ -0,0 +1,276 @@ +import os +import time +import unittest +from dataclasses import dataclass +from statistics import mean, median, variance, stdev +from typing import List + +from BaseClasses import get_seed +from Fill import distribute_items_restrictive, balance_multiworld_progression +from worlds import AutoWorld +from .. import SVTestCase, minimal_locations_maximal_items, setup_multiworld, default_4_x_x_options, \ + allsanity_4_x_x_options_without_mods, default_options, allsanity_options_without_mods, allsanity_options_with_mods + +assert default_4_x_x_options +assert allsanity_4_x_x_options_without_mods +assert default_options +assert allsanity_options_without_mods + +default_number_generations = 25 +acceptable_deviation = 4 + + +@dataclass +class PerformanceResults: + case: SVTestCase + + amount_of_players: int + results: List[float] + acceptable_mean: float + + def __repr__(self): + size = size_name(self.amount_of_players) + + total_time = sum(self.results) + mean_time = mean(self.results) + median_time = median(self.results) + stdev_time = stdev(self.results, mean_time) + variance_time = variance(self.results, mean_time) + + return f"""Generated {len(self.results)} {size} multiworlds in {total_time:.2f} seconds. Average {mean_time:.2f} seconds (Acceptable: {self.acceptable_mean:.2f}) +Mean: {mean_time:.2f} Median: {median_time:.2f} Stdeviation: {stdev_time:.2f} Variance: {variance_time:.4f} Deviation percent: {stdev_time / mean_time:.2%}""" + + +class SVPerformanceTestCase(SVTestCase): + acceptable_time_per_player: float + results: List[PerformanceResults] + + # Set False to run tests that take long + skip_performance_tests: bool = True + # Set False to not call the fill in the tests""" + skip_fill: bool = True + # Set True to print results as CSV""" + csv: bool = False + + @classmethod + def setUpClass(cls) -> None: + super().setUpClass() + performance_tests_key = "performance" + if performance_tests_key in os.environ: + cls.skip_performance_tests = not bool(os.environ[performance_tests_key]) + + fill_tests_key = "fill" + if fill_tests_key in os.environ: + cls.skip_fill = os.environ[fill_tests_key] != "True" + + fixed_seed_key = "fixed_seed" + if fixed_seed_key in os.environ: + cls.fixed_seed = bool(os.environ[fixed_seed_key]) + else: + cls.fixed_seed = False + + number_generations_key = "number_gen" + if number_generations_key in os.environ: + cls.number_generations = int(os.environ[number_generations_key]) + else: + cls.number_generations = default_number_generations + + csv_key = "csv" + if csv_key in os.environ: + cls.csv = bool(os.environ[csv_key]) + + @classmethod + def tearDownClass(cls) -> None: + if cls.csv: + csved_results = (f"{type(result.case).__name__},{result.amount_of_players},{val:.6f}" + for result in cls.results for val in result.results) + for r in csved_results: + print(r) + else: + case = None + for result in cls.results: + if type(result.case) is not case: + case = type(result.case) + print(case.__name__) + print(result) + print() + + super().tearDownClass() + + def performance_test_multiworld(self, options): + amount_of_players = len(options) + acceptable_average_time = self.acceptable_time_per_player * amount_of_players + total_time = 0 + all_times = [] + seeds = [get_seed() for _ in range(self.number_generations)] if not self.fixed_seed else [87876703343494157696] * self.number_generations + + for i, seed in enumerate(seeds): + with self.subTest(f"Seed: {seed}"): + time_before = time.time() + + print("Starting world setup") + multiworld = setup_multiworld(options, seed) + if not self.skip_fill: + distribute_items_restrictive(multiworld) + AutoWorld.call_all(multiworld, 'post_fill') + if multiworld.players > 1: + balance_multiworld_progression(multiworld) + + time_after = time.time() + elapsed_time = time_after - time_before + total_time += elapsed_time + all_times.append(elapsed_time) + print(f"Multiworld {i + 1}/{self.number_generations} [{seed}] generated in {elapsed_time:.4f} seconds") + # tester.assertLessEqual(elapsed_time, acceptable_average_time * acceptable_deviation) + + self.results.append(PerformanceResults(self, amount_of_players, all_times, acceptable_average_time)) + self.assertLessEqual(mean(all_times), acceptable_average_time) + + +def size_name(number_players): + if number_players == 1: + return "solo" + elif number_players == 2: + return "duo" + elif number_players == 3: + return "trio" + return f"{number_players}-player" + + +class TestDefaultOptions(SVPerformanceTestCase): + acceptable_time_per_player = 2 + options = default_options() + results = [] + + def test_solo(self): + if self.skip_performance_tests: + return + + number_players = 1 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_duo(self): + if self.skip_performance_tests: + return + + number_players = 2 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_5_player(self): + if self.skip_performance_tests: + return + + number_players = 5 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + @unittest.skip + def test_10_player(self): + if self.skip_performance_tests: + return + + number_players = 10 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + +class TestMinLocationMaxItems(SVPerformanceTestCase): + acceptable_time_per_player = 0.3 + options = minimal_locations_maximal_items() + results = [] + + def test_solo(self): + if self.skip_performance_tests: + return + + number_players = 1 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_duo(self): + if self.skip_performance_tests: + return + + number_players = 2 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_5_player(self): + if self.skip_performance_tests: + return + + number_players = 5 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_10_player(self): + if self.skip_performance_tests: + return + + number_players = 10 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + +class TestAllsanityWithoutMods(SVPerformanceTestCase): + acceptable_time_per_player = 10 + options = allsanity_options_without_mods() + results = [] + + def test_solo(self): + if self.skip_performance_tests: + return + + number_players = 1 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_duo(self): + if self.skip_performance_tests: + return + + number_players = 2 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + @unittest.skip + def test_5_player(self): + if self.skip_performance_tests: + return + + number_players = 5 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + @unittest.skip + def test_10_player(self): + if self.skip_performance_tests: + return + + number_players = 10 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + +class TestAllsanityWithMods(SVPerformanceTestCase): + acceptable_time_per_player = 25 + options = allsanity_options_with_mods() + results = [] + + def test_solo(self): + if self.skip_performance_tests: + return + + number_players = 1 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) + + def test_duo(self): + if self.skip_performance_tests: + return + + number_players = 2 + multiworld_options = [self.options] * number_players + self.performance_test_multiworld(multiworld_options) diff --git a/worlds/stardew_valley/test/performance/__init__.py b/worlds/stardew_valley/test/performance/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/worlds/stardew_valley/test/stability/StabilityOutputScript.py b/worlds/stardew_valley/test/stability/StabilityOutputScript.py new file mode 100644 index 000000000000..baf17dde8423 --- /dev/null +++ b/worlds/stardew_valley/test/stability/StabilityOutputScript.py @@ -0,0 +1,32 @@ +import argparse +import json + +from ...test import setup_solo_multiworld, allsanity_options_with_mods + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument('--seed', help='Define seed number to generate.', type=int, required=True) + + args = parser.parse_args() + seed = args.seed + + multi_world = setup_solo_multiworld( + allsanity_options_with_mods(), + seed=seed + ) + + output = { + "bundles": { + bundle_room.name: { + bundle.name: str(bundle.items) + for bundle in bundle_room.bundles + } + for bundle_room in multi_world.worlds[1].modified_bundles + }, + "items": [item.name for item in multi_world.get_items()], + "location_rules": {location.name: repr(location.access_rule) for location in multi_world.get_locations(1)} + } + + print(json.dumps(output)) +else: + raise RuntimeError("Do not import this file, execute it in different python session so the PYTHONHASHSEED is different..") diff --git a/worlds/stardew_valley/test/stability/TestStability.py b/worlds/stardew_valley/test/stability/TestStability.py new file mode 100644 index 000000000000..48cd663cb301 --- /dev/null +++ b/worlds/stardew_valley/test/stability/TestStability.py @@ -0,0 +1,52 @@ +import json +import re +import subprocess +import sys + +from BaseClasses import get_seed +from .. import SVTestCase + +# at 0x102ca98a0> +lambda_regex = re.compile(r"^ at (.*)>$") +# Python 3.10.2\r\n +python_version_regex = re.compile(r"^Python (\d+)\.(\d+)\.(\d+)\s*$") + + +class TestGenerationIsStable(SVTestCase): + """Let it be known that I hate this tests, and if someone has a better idea than starting subprocesses, please fix this. + """ + + def test_all_locations_and_items_are_the_same_between_two_generations(self): + if self.skip_long_tests: + return + + # seed = get_seed(33778671150797368040) # troubleshooting seed + seed = get_seed() + + output_a = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)]) + output_b = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)]) + + result_a = json.loads(output_a) + result_b = json.loads(output_b) + + for i, ((room_a, bundles_a), (room_b, bundles_b)) in enumerate(zip(result_a["bundles"].items(), result_b["bundles"].items())): + self.assertEqual(room_a, room_b, f"Bundle rooms at index {i} is different between both executions. Seed={seed}") + for j, ((bundle_a, items_a), (bundle_b, items_b)) in enumerate(zip(bundles_a.items(), bundles_b.items())): + self.assertEqual(bundle_a, bundle_b, f"Bundle in room {room_a} at index {j} is different between both executions. Seed={seed}") + self.assertEqual(items_a, items_b, f"Items in bundle {bundle_a} are different between both executions. Seed={seed}") + + for i, (item_a, item_b) in enumerate(zip(result_a["items"], result_b["items"])): + self.assertEqual(item_a, item_b, f"Item at index {i} is different between both executions. Seed={seed}") + + for i, ((location_a, rule_a), (location_b, rule_b)) in enumerate(zip(result_a["location_rules"].items(), result_b["location_rules"].items())): + self.assertEqual(location_a, location_b, f"Location at index {i} is different between both executions. Seed={seed}") + + match = lambda_regex.match(rule_a) + if match: + self.assertTrue(bool(lambda_regex.match(rule_b)), + f"Location rule of {location_a} at index {i} is different between both executions. Seed={seed}") + continue + + # We check that the actual rule has the same order to make sure it is evaluated in the same order, + # so performance tests are repeatable as much as possible. + self.assertEqual(rule_a, rule_b, f"Location rule of {location_a} at index {i} is different between both executions. Seed={seed}") diff --git a/worlds/stardew_valley/test/stability/__init__.py b/worlds/stardew_valley/test/stability/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 From 31249ec6e2b37e481f5eb006820b2068d5b727bb Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Fri, 15 Mar 2024 07:47:31 -0500 Subject: [PATCH 02/22] Launcher: make scrollbar more prominent (#2955) --- kvui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kvui.py b/kvui.py index dc8f4f4162bf..bf1f0541a358 100644 --- a/kvui.py +++ b/kvui.py @@ -132,6 +132,8 @@ def __init__(self, *args, **kwargs): self.layout.bind(minimum_height=self.layout.setter("height")) self.add_widget(self.layout) self.effect_cls = ScrollEffect + self.bar_width = dp(12) + self.scroll_type = ["content", "bars"] class HovererableLabel(HoverBehavior, Label): From 329a2f9175cde19a287e09421aaa3f6fd51e3f6c Mon Sep 17 00:00:00 2001 From: Silent <110704408+silent-destroyer@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:53:41 -0400 Subject: [PATCH 03/22] TUNIC: Updated display name for a few options (#2953) --- worlds/tunic/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py index f4790da36729..ee42b1cfc480 100644 --- a/worlds/tunic/options.py +++ b/worlds/tunic/options.py @@ -30,7 +30,7 @@ class AbilityShuffling(Toggle): player-facing codes. """ internal_name = "ability_shuffling" - display_name = "Ability Shuffling" + display_name = "Shuffle Abilities" class LogicRules(Choice): @@ -115,7 +115,7 @@ class FixedShop(Toggle): """Forces the Windmill entrance to lead to a shop, and places only one other shop in the pool. Has no effect if Entrance Rando is not enabled.""" internal_name = "fixed_shop" - display_name = "ER Fixed Shop" + display_name = "Fewer Shops in Entrance Rando" class LaurelsLocation(Choice): From f330e5835c9ff180be7df1595f3781a9765ef3e2 Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:56:12 -0400 Subject: [PATCH 04/22] SMW: Add CHANGELOG.md (#2947) --- worlds/smw/CHANGELOG.md | 118 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 worlds/smw/CHANGELOG.md diff --git a/worlds/smw/CHANGELOG.md b/worlds/smw/CHANGELOG.md new file mode 100644 index 000000000000..7f62997adcef --- /dev/null +++ b/worlds/smw/CHANGELOG.md @@ -0,0 +1,118 @@ +# Super Mario World - Changelog + + +## v2.0 + +### Features: + +- New optional Location Checks + - 3-Up Moons + - Hidden 1-Ups + - Bonus Blocks + - Blocksanity + - All blocks that contain coins or items are included, with the exception of: + - Blocks in Top Secret Area & Front Door/Bowser Castle + - Blocks that are unreachable without glitches/unreasonable movement +- New Items + - Special Zone Clear + - New Filler Items + - 1 Coin + - 5 Coins + - 10 Coins + - 50 Coins + - New Trap Items + - Reverse Trap + - Thwimp Trap +- SFX Shuffle +- Palette Shuffle Overhaul + - New Curated Palette can now be used for the Overworld and Level Palette Shuffle options + - Foreground and Background Shuffle options have been merged into a single option +- Max possible Yoshi Egg value is 255 + - UI in-game is updated to handle 3-digits + - New `Display Received Item Popups` option: `progression_minus_yoshi_eggs` + +### Quality of Life: + +- In-Game Indicators are now displayed on the map screen for location checks and received items +- In-level sprites are displayed upon receiving certain items +- The Camera Scroll unlocking is now only enabled on levels where it needs to be +- SMW can now handle receiving more than 255 items +- Significant World Code cleanup + - New Options API + - Removal of `world: MultiWorld` across the world +- The PopTracker pack now has tabs for every level/sublevel, and can automatically swap tabs while playing if connected to the server + +### Bug Fixes: + +- Several logic tweaks/fixes + + +## v1.1 + +### Features: + +- New Item + - Timer Trap +- `Bowser Castle Rooms` option which changes the behavior of the Front Door +- `Boss Shuffle` option +- `Overworld Palette Shuffle` option + +### Quality of Life: + +- `Overworld Speed` option which allows the player to move faster or slower on the map +- `Early Climb` option which guarantees that `Climb` will be found locally in an early location +- `Exclude Special Zone` option which fully excludes Special Zone levels from the seed + - Note: this option is ignored if the player chooses to fill their entire item pool with Yoshi Eggs, which are Progression Items +- Ice and Stun Traps are now queued if received while another of its type is already active, and are then activated at the next opportunity + +### Bug Fixes: + +- Fixed `Chocolate Island 4 - Dragon Coins` requiring `Run` instead of `P-Switch` +- Fixed a Literature Trap typo + + +## v1.0 - First Stable Release + +### Features: + +- Goal + - Bowser + - Defeat bosses, reach Bowser's Castle, and defeat Bowser + - Yoshi Egg Hunt + - Find a certain number of Yoshi Eggs spread across the MultiWorld` +- Locations included: + - Level exits (Normal and Secret) + - Dragon Coins + - Collect at least five Dragon Coins in a level to send a location check +- Items included: + - Run + - Carry + - Swim + - Spin Jump + - Climb + - Yoshi + - P-Switch + - P-Balloon + - Progressive Powerup + - Unlocks the ability to use Mushrooms, Fire Flowers, and Capes, progressively + - Super Star Activate + - Yellow Switch Palace + - Green Switch Palace + - Red Switch Palace + - Blue Switch Palace + - 1-Up Mushroom + - Yoshi Egg + - Only on `Yoshi Egg Hunt` goal + - Traps + - Ice Trap + - Stun Trap + - Literature Trap +- `Bowser Castle Doors` option + - Whether the Front Door and Back Door map tiles lead to the Front Door or Back Door levels +- DeathLink is supported +- Level Shuffle is supported +- Autosave is supported +- Music Shuffle is supported +- Mario's palette can be selected +- Level Palettes can be shuffled +- Starting life count can be set From 0342c1e09d1fb33fd4997c207bfb062d2547c286 Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:57:05 -0400 Subject: [PATCH 05/22] Celeste 64: Add CHANGELOG.md (#2948) --- worlds/celeste64/CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 worlds/celeste64/CHANGELOG.md diff --git a/worlds/celeste64/CHANGELOG.md b/worlds/celeste64/CHANGELOG.md new file mode 100644 index 000000000000..a1cbd8df9825 --- /dev/null +++ b/worlds/celeste64/CHANGELOG.md @@ -0,0 +1,21 @@ +# Celeste 64 - Changelog + + +## v1.1 - First Stable Release + +### Features: + +- Goal is to collect a certain amount of Strawberries and visit Badeline on her island +- Locations included: + - Strawberries +- Items included: + - Strawberries + - Dash Refills + - Double Dash Refills + - Feathers + - Coins + - Cassettes + - Traffic Blocks + - Springs + - Breakable Blocks +- DeathLink is supported \ No newline at end of file From 2e8a84121e90e895c514103a9988226123135ca2 Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:57:43 -0400 Subject: [PATCH 06/22] DKC3: Add CHANGELOG.md (#2946) --- worlds/dkc3/CHANGELOG.md | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 worlds/dkc3/CHANGELOG.md diff --git a/worlds/dkc3/CHANGELOG.md b/worlds/dkc3/CHANGELOG.md new file mode 100644 index 000000000000..dc853a5aa944 --- /dev/null +++ b/worlds/dkc3/CHANGELOG.md @@ -0,0 +1,47 @@ +# Donkey Kong Country 3 - Changelog + + +## v1.1 + +### Features: + +- KONGsanity option (Collect all KONG letters in each level for a check) +- Autosave option +- Difficulty option +- MERRY option +- Handle collected/co-op locations + +### Bug Fixes: + +- Fixed Mekanos softlock +- Prevent Brothers Bear giving extra Banana Birds +- Fixed Banana Bird Mother check sending prematurely +- Fix Logic bug with Krematoa level costs + + +## v1.0 + +### Features: + +- Goal + - Knautilus + - Scuttle the Knautilus in Krematoa and defeat Baron K. Roolenstein to win + - Banana Bird Hunt + - Find the Banana Birds and rescue their mother to win +- Locations included: + - Level Flags + - Bonuses + - DK Coins + - Banana Bird Caves +- Items included: + - Progressive Boat Upgrade + - Three are placed into the item pool (Patch -> First Ski -> Second Ski) + - Bonus Coins + - DK Coins + - Krematoa Cogs + - Bear Coins + - 1-Up Balloons +- Level Shuffle is supported +- Music Shuffle is supported +- Kong Palette options are supported +- Starting life count can be set From e1038b443155d6aa195bcd489feb2b17fa677b48 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 15 Mar 2024 13:58:08 +0100 Subject: [PATCH 07/22] Core: increment version (#2958) --- Utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utils.py b/Utils.py index 70decf45d8d5..10e6e504b5c2 100644 --- a/Utils.py +++ b/Utils.py @@ -46,7 +46,7 @@ def as_simple_string(self) -> str: return ".".join(str(item) for item in self) -__version__ = "0.4.4" +__version__ = "0.4.5" version_tuple = tuplize_version(__version__) is_linux = sys.platform.startswith("linux") From cafacfe754877d8f9a9659032ccd4bf25fe072bd Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 15 Mar 2024 08:58:20 -0400 Subject: [PATCH 08/22] SA2B: Add CHANGELOG.md (#2945) --- worlds/sa2b/CHANGELOG.md | 247 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 worlds/sa2b/CHANGELOG.md diff --git a/worlds/sa2b/CHANGELOG.md b/worlds/sa2b/CHANGELOG.md new file mode 100644 index 000000000000..af6c4afd229f --- /dev/null +++ b/worlds/sa2b/CHANGELOG.md @@ -0,0 +1,247 @@ +# Sonic Adventure 2 Battle - Changelog + + +## v2.3 - The Chao Update + +### Features: + +- New goal + - Chaos Chao + - Raise a Chaos Chao to win! +- New optional Location Checks + - Chao Animal Parts + - Each body part from each type of animal is a location + - Chao Stats + - 0-99 levels of each of the 7 Chao stats can be locations + - The frequency of Chao Stat locations can be set (every level, every 2nd level, etc) + - Kindergartensanity + - Classroom lessons are locations + - Either all lessons or any one of each category can be set as locations + - Shopsanity + - A specified number of locations can be placed in the Chao Black Market + - These locations are unlocked by acquiring Chao Coins + - Ring costs for these items can be adjusted + - Chao Karate can now be set to one location per fight, instead of one per tournament +- New Items + - If any Chao locations are active, the following will be in the item pool: + - Chao Eggs + - Garden Seeds + - Garden Fruit + - Chao Hats + - Chaos Drives + - New Trap + - Reverse Trap +- The starting eggs in the garden can be a random color +- Chao World entrances can be shuffled +- Chao are given default names + +### Quality of Life: + +- Chao Save Data is now separate per-slot in addition to per-seed + - This allows a single player to have multiple slots in the same seed, each having separate Chao progress +- Chao Race/Karate progress is now displayed on Stage Select (when hovering over Chao World) +- All Chao can now enter the Hero and Dark races +- Chao Karate difficulty can be set separately from Chao Race difficulty +- Chao Aging can be sped up at will, up to 15× +- New mod config option to fine-tune Chao Stat multiplication + - Note: This does not mix well with the Mod Manager "Chao Stat Multiplier" code +- Pong Traps can now activate in Chao World +- Maximum range for possible number of Emblems is now 1000 +- General APWorld cleanup and optimization +- Option access has moved to the new options system +- An item group now exists for trap items + +### Bug Fixes: + +- Dry Lagoon now has all 11 Animals +- `Eternal Engine - 2` (Standard and Hard Logic) now requires only `Tails - Booster` +- `Lost Colony - 2` (Hard Logic) now requires no upgrades +- `Lost Colony - Animal 9` (Hard Logic) now requires either `Eggman - Jet Engine` or `Eggman - Large Cannon` + + +## v2.2 + +### Features: + +- New goals + - Boss Rush + - Complete the Boss Rush to win! + - Cannon's Core Boss Rush + - Beat Cannon's Core, then complete the Boss Rush + - Boss Rush Chaos Emerald Hunt + - Collect the seven Chaos Emeralds, then complete the Boss Rush +- Boss Rush Shuffle option +- New optional Location Checks + - Animalsanity + - Collect numbers of animals per stage +- Ring Link option + - Any ring amounts gained and lost by a linked player will be instantly shared with all other active linked players +- Voice line shuffle + - None + - Shuffled + - Rude + - Chao + - Singularity +- New Traps + - Ice Trap + - Slow Trap + - Cutscene Trap + +### Quality of Life: + +- Maximum possible number of Emblems in item pool is now a player-facing option, in the range of 50-500 +- A cause is now included for sent DeathLinks +- Death Cause messages are now displayed in-game +- WSS connections are now supported + +### Bug Fixes: + +- Two rare softlock scenarios related to the Chaos Control Trap should no longer occur +- Tracking of location checks while disconnected from the server should be more consistent +- DeathLinks can now be sent and received between two players connected to the same slot +- 2P mode should no longer be accessible +- Boss Stages no longer display erroneous location tracking icons +- Boss Stages are no longer subject to mission shuffle oddities +- Fix Logic Errors + - Eternal Engine - Pipe 1 (Standard and Hard Logic) now requires no upgrades + - Egg Quarters - 5 (Standard Logic) now requires Rouge - Iron Boots + + +## v2.1 + +### Features: + +- New goal + - Grand Prix + - Complete all of the Kart Races to win! +- New optional Location Checks + - Omosanity (Activating Omochao) + - Kart Race Mode +- Ring Loss option + - Classic - lose all rings on hit + - Modern - lose 20 rings on hit + - OHKO - instantly die on hit, regardless of ring count (shields still protect you) +- New Trap + - Pong Trap + +### Quality of Life: + +- SA2B is now distributed as an `.apworld` +- Maximum possible number of Emblems in item pool is increased from 180 to 250 +- An indicator now shows on the Stage Select screen when Cannon's Core is available +- Certain traps (Exposition and Pong) are now possible to receive on Route 101 and Route 280 +- Certain traps (Confusion, Chaos Control, Exposition and Pong) are now possible to receive on FinalHazard + +### Bug Fixes: + +- Actually swap Intermediate and Expert Chao Races correctly +- Don't always grant double score for killing Gold Beetles anymore +- Ensure upgrades are applied properly, even when received while dying +- Fix the Message Queue getting disordered when receiving many messages in quick succession +- Fix Logic errors + - `City Escape - 3` (Hard Logic) now requires no upgrades + - `Mission Street - Pipe 2` (Hard Logic) now requires no upgrades + - `Crazy Gadget - Pipe 3` (Hard Logic) now requires no upgrades + - `Egg Quarters - 3` (Hard Logic) now requires only `Rouge - Mystic Melody` + - `Mad Space - 5` (Hard Logic) now requires no upgrades + + +## v2.0 + +### Features: + +- Completely reworked mission progression system + - Control of which mission types can be active per-gameplay-style + - Control of how many missions are active per-gameplay-style + - Mission order shuffle +- Two new Chaos Emerald Hunt goals + - Chaos Emerald Hunt involves finding the seven Chaos Emeralds and beating Green Hill + - FinalHazard Chaos Emerald Hunt is the same, but with the FinalHazard fight at the end of Green Hill +- New optional Location Checks + - Keysanity (Chao Containers) + - Whistlesanity (Animal Pipes and hidden whistle spots) + - Beetlesanity (Destroying Gold Beetles) +- Option to require clearing all active Cannon's Core Missions for access to the Biolizard fight in Biolizard goal +- Hard Logic option +- More Music Options + - Option to use SADX music + - New Singularity music shuffle option +- Option to choose the Narrator theme +- New Traps + - Tiny Trap is now permanent within a level + - Gravity Trap + - Exposition Trap + +### Quality of Life: + +- Significant revamp to Stage Select screen information conveyance + - Icons are displayed for: + - Relevant character's upgrades + - Which location checks are active/checked + - Chaos Emeralds found (if relevant) + - Gate and Cannon's Core emblem costs + - The above stage-specific info can also be viewed when paused in-level + - The current mission is also displayed when paused +- Emblem Symbol on Mission Select subscreen now only displays if a high enough rank has been gotten on that mission to send the location check +- Hints including SA2B locations will now specify which Gate that level is located in +- Save file now stores slot name to help prevent false location checks in the case of one player having multiple SA2B slots in the same seed +- Chao Intermediate and Expert race sets are now swapped, per player feedback + - Intermediate now includes Beginner + Challenge + Hero + Dark + - Expert now includes Beginner + Challenge + Hero + Dark + Jewel +- New mod config option for the color of the Message Queue text + +### Bug Fixes: + +- Fixed bug where game stops properly tracking items after 127 have been received. +- Several logic fixes +- Game now refers to `Knuckles - Shovel Claws` correctly +- Minor AP World code cleanup + + +## v1.1 + +### Features: + +- Unlocking each gate of levels requires beating a random boss +- Chao Races and Karate are now available as an option for checks +- Junk items can now be put into the itempool + - Five Rings + - Ten Rings + - Twenty Rings + - Extra Life + - Shield + - Magnetic Shield + - Invincibility +- Traps can now be put into the itempool + - Omotrap + - Chaos Control Trap + - Confusion Trap + - Tiny Trap +- The Credits now display a few stats about the run +- An Option for the minimum required rank for mission checks is now available +- An Option for influencing the costs of level gates is now available + +### Bug Fixes: + +- A message will display if the game loses connection to Archipelago +- The game will gracefully reconnect to Archipelago +- Kart Race mode is now properly hidden +- Minor logic fixes + + +## v1.0 - First Stable Release + +### Features: + +- Goal is to beat Cannon's Core and defeat the Biolizard +- Locations included: + - Upgrade Pickups + - Mission Clears +- Items included: + - Character Upgrades + - Emblems +- Levels are unlocked by certain amounts of emblems + - An option exists to specify how many missions to include +- Cannon's Core is unlocked by a certain percentage of existent emblems, depending on an option +- Music Shuffle is supported +- DeathLink is supported From 1324bccc894e5fc2f97baced802dd793855fbc5f Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 15 Mar 2024 14:00:10 +0100 Subject: [PATCH 09/22] The Witness: Add newly submitted junk hints (#2949) --- worlds/witness/hints.py | 132 ++++++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 58 deletions(-) diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index 4b40ba32dfda..0c84dbc94da9 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -11,79 +11,80 @@ CompactItemData = Tuple[str, Union[str, int], int] joke_hints = [ - "Quaternions break my brain", - "Eclipse has nothing, but you should do it anyway.", - "Beep", - "Putting in custom subtitles shouldn't have been as hard as it was...", - "BK mode is right around the corner.", - "You can do it!", - "I believe in you!", - "The person playing is cute. <3", - "dash dot, dash dash dash,\ndash, dot dot dot dot, dot dot,\ndash dot, dash dash dot", - "When you think about it, there are actually a lot of bubbles in a stream.", - "Never gonna give you up\nNever gonna let you down\nNever gonna run around and desert you", - "Thanks to the Archipelago developers for making this possible.", + "Have you tried Adventure?\n...Holy crud, that game is 17 years older than me.", + "Have you tried A Link to the Past?\nThe Archipelago game that started it all!", + "Waiting to get your items?\nTry BK Sudoku! Make progress even while stuck.", + "Have you tried Blasphemous?\nYou haven't? Blasphemy!\n...Sorry. You should try it, though!", + "Have you tried Bumper Stickers?\nDecades after its inception, people are still inventing unique twists on the match-3 genre.", + "Have you tried Bumper Stickers?\nMaybe after spending so much time on this island, you are longing for a simpler puzzle game.", + "Have you tried Celeste 64?\nYou need smol low-poly Madeline in your life. TRUST ME.", "Have you tried ChecksFinder?\nIf you like puzzles, you might enjoy it!", + "Have you tried Clique?\nIt's certainly a lot less complicated than this game!", "Have you tried Dark Souls III?\nA tough game like this feels better when friends are helping you!", "Have you tried Donkey Kong Country 3?\nA legendary game from a golden age of platformers!", + "Have you tried DLC Quest?\nI know you all like parody games.\nI got way too many requests to make a randomizer for \"The Looker\".", + "Have you tried Doom?\nI wonder if a smart fridge can connect to Archipelago.", + "Have you tried Doom II?\nGot a good game on your hands? Just make it bigger and better.", "Have you tried Factorio?\nAlone in an unknown multiworld. Sound familiar?", "Have you tried Final Fantasy?\nExperience a classic game improved to fit modern standards!", + "Have you tried Final Fantasy Mystic Quest?\nApparently, it was made in an attempt to simplify Final Fantasy for the western market.\nThey were right, I suck at RPGs.", + "Have you tried Heretic?\nWait, there is a Doom Engine game where you can look UP AND DOWN???", "Have you tried Hollow Knight?\nAnother independent hit revolutionising a genre!", - "Have you tried A Link to the Past?\nThe Archipelago game that started it all!", + "Have you tried Hylics 2?\nStop motion might just be the epitome of unique art styles.", + "Have you tried Kirby's Dream Land 3?\nAll good things must come to an end, including Nintendo's SNES library.\nWent out with a bang though!", + "Have you tried Kingdom Hearts II?\nI'll wait for you to name a more epic crossover.", + "Have you tried Link's Awakening DX?\nHopefully, Link won't be obsessed with circles when he wakes up.", + "Have you tried Landstalker?\nThe Witness player's greatest fear: A diagonal movement grid...\nWait, I guess we have the Monastery puzzles.", + "Have you tried Lingo?\nIt's an open world puzzle game. It features puzzle panels with non-verbally explained mechanics.\nIf you like this game, you'll like Lingo too.", + "(Middle Yellow)\nYOU AILED OVERNIGHT\nH--- --- ----- -----?", + "Have you tried Lufia II?\nRoguelites are not just a 2010s phenomenon, turns out.", "Have you tried Meritous?\nYou should know that obscure games are often groundbreaking!", + "Have you tried The Messenger?\nOld ideas made new again. It's how all art is made.", + "Have you tried Minecraft?\nI have recently learned this is a question that needs to be asked.", + "Have you tried Mega Man Battle Network 3?\nIt's a Mega Man RPG. How could you not want to try that?", + "Have you tried Muse Dash?\nRhythm game with cute girls!\n(Maybe skip if you don't like the Jungle panels)", + "Have you tried Noita?\nIf you like punishing yourself, you will like it.", "Have you tried Ocarina of Time?\nOne of the biggest randomizers, big inspiration for this one's features!", + "Have you tried Overcooked 2?\nWhen you're done relaxing with puzzles, use your energy to yell at your friends.", + "Have you tried Pokemon Emerald?\nI'm going to say it: 10/10, just the right amount of water.", + "Have you tried Pokemon Red&Blue?\nA cute pet collecting game that fascinated an entire generation.", "Have you tried Raft?\nHaven't you always wanted to explore the ocean surrounding this island?", - "Have you tried Risk of Rain 2?\nI haven't either. But I hear it's incredible!", "Have you tried Rogue Legacy?\nAfter solving so many puzzles it's the perfect way to rest your \"thinking\" brain.", - "Have you tried Secret of Evermore?\nI haven't either. But I hear it's great!", - "Have you tried Slay the Spire?\nExperience the thrill of combat without needing fast fingers!", - "Have you tried SMZ3?\nWhy play one incredible game when you can play 2 at once?", + "Have you tried Risk of Rain 2?\nI haven't either. But I hear it's incredible!", + "Have you tried Sonic Adventure 2?\nIf the silence on this island is getting to you, there aren't many games more energetic.", "Have you tried Starcraft 2?\nUse strategy and management to crush your enemies!", - "Have you tried Super Mario 64?\n3-dimensional games like this owe everything to that game.", + "Have you tried Shivers?\nWitness 2 should totally feature a haunted museum.", "Have you tried Super Metroid?\nA classic game, yet still one of the best in the genre.", - "Have you tried Timespinner?\nEveryone who plays it ends up loving it!", - "Have you tried VVVVVV?\nExperience the essence of gaming distilled into its purest form!", - "Have you tried The Witness?\nOh. I guess you already have. Thanks for playing!", + "Have you tried Super Mario 64?\n3-dimensional games like this owe everything to that game.", "Have you tried Super Mario World?\nI don't think I need to tell you that it is beloved by many.", - "Have you tried Overcooked 2?\nWhen you're done relaxing with puzzles, use your energy to yell at your friends.", - "Have you tried Zillion?\nMe neither. But it looks fun. So, let's try something new together?", - "Have you tried Hylics 2?\nStop motion might just be the epitome of unique art styles.", - "Have you tried Pokemon Red&Blue?\nA cute pet collecting game that fascinated an entire generation.", - "Have you tried Lufia II?\nRoguelites are not just a 2010s phenomenon, turns out.", - "Have you tried Minecraft?\nI have recently learned this is a question that needs to be asked.", - "Have you tried Subnautica?\nIf you like this game's lonely atmosphere, I would suggest you try it.", - - "Have you tried Sonic Adventure 2?\nIf the silence on this island is getting to you, " - "there aren't many games more energetic.", - - "Waiting to get your items?\nTry BK Sudoku! Make progress even while stuck.", - - "Have you tried Adventure?\n...Holy crud, that game is 17 years older than me.", - "Have you tried Muse Dash?\nRhythm game with cute girls!\n(Maybe skip if you don't like the Jungle panels)", - "Have you tried Clique?\nIt's certainly a lot less complicated than this game!", - "Have you tried Bumper Stickers?\nDecades after its inception, people are still inventing unique twists on the match-3 genre.", - "Have you tried DLC Quest?\nI know you all like parody games.\nI got way too many requests to make a randomizer for \"The Looker\".", - "Have you tried Doom?\nI wonder if a smart fridge can connect to Archipelago.", - "Have you tried Kingdom Hearts II?\nI'll wait for you to name a more epic crossover.", - "Have you tried Link's Awakening DX?\nHopefully, Link won't be obsessed with circles when he wakes up.", - "Have you tried The Messenger?\nOld ideas made new again. It's how all art is made.", - "Have you tried Mega Man Battle Network 3?\nIt's a Mega Man RPG. How could you not want to try that?", - "Have you tried Noita?\nIf you like punishing yourself, you will like it.", + "Have you tried SMZ3?\nWhy play one incredible game when you can play 2 at once?", + "Have you tried Secret of Evermore?\nI haven't either. But I hear it's great!", + "Have you tried Slay the Spire?\nExperience the thrill of combat without needing fast fingers!", "Have you tried Stardew Valley?\nThe Farming game that gave a damn. It's so easy to lose hours and days to it...", + "Have you tried Subnautica?\nIf you like this game's lonely atmosphere, I would suggest you try it.", + "Have you tried Terraria?\nA prime example of a survival sandbox game that beats the \"Wide as an ocean, deep as a puddle\" allegations.", + "Have you tried Timespinner?\nEveryone who plays it ends up loving it!", "Have you tried The Legend of Zelda?\nIn some sense, it was the starting point of \"adventure\" in video games.", + "Have you tried TUNC?\nWhat? No, I'm pretty sure I spelled that right.", + "Have you tried TUNIC?\nRemember what discovering your first Environmental Puzzle was like?\nTUNIC will make you feel like that at least 5 times over.", "Have you tried Undertale?\nI hope I'm not the 10th person to ask you that. But it's, like, really good.", + "Have you tried VVVVVV?\nExperience the essence of gaming distilled into its purest form!", "Have you tried Wargroove?\nI'm glad that for every abandoned series, enough people are yearning for its return that one of them will know how to code.", - "Have you tried Blasphemous?\nYou haven't? Blasphemy!\n...Sorry. You should try it, though!", - "Have you tried Doom II?\nGot a good game on your hands? Just make it bigger and better.", - "Have you tried Lingo?\nIt's an open world puzzle game. It features panels with non-verbally explained mechanics.\nIf you like this game, you'll like Lingo too.", - "(Middle Yellow)\nYOU AILED OVERNIGHT\nH--- --- ----- -----?", - "Have you tried Bumper Stickers?\nMaybe after spending so much time on this island, you are longing for a simpler puzzle game.", - "Have you tried Pokemon Emerald?\nI'm going to say it: 10/10, just the right amount of water.", - "Have you tried Terraria?\nA prime example of a survival sandbox game that beats the \"Wide as an ocean, deep as a puddle\" allegations.", - "Have you tried Final Fantasy Mystic Quest?\nApparently, it was made in an attempt to simplify Final Fantasy for the western market.\nThey were right, I suck at RPGs.", - "Have you tried Shivers?\nWitness 2 should totally feature a haunted Museum.", - "Have you tried Heretic?\nWait, there is a Doom Engine game where you can look UP AND DOWN???", - + "Have you tried The Witness?\nOh. I guess you already have. Thanks for playing!", + "Have you tried Zillion?\nMe neither. But it looks fun. So, let's try something new together?", + + "Quaternions break my brain", + "Eclipse has nothing, but you should do it anyway.", + "Beep", + "Putting in custom subtitles shouldn't have been as hard as it was...", + "BK mode is right around the corner.", + "You can do it!", + "I believe in you!", + "The person playing is cute. <3", + "dash dot, dash dash dash,\ndash, dot dot dot dot, dot dot,\ndash dot, dash dash dot", + "When you think about it, there are actually a lot of bubbles in a stream.", + "Never gonna give you up\nNever gonna let you down\nNever gonna run around and desert you", + "Thanks to the Archipelago developers for making this possible.", "One day I was fascinated by the subject of generation of waves by wind.", "I don't like sandwiches. Why would you think I like sandwiches? Have you ever seen me with a sandwich?", "Where are you right now?\nI'm at soup!\nWhat do you mean you're at soup?", @@ -163,8 +164,23 @@ "Welcome Back! (:", "R R R U L L U L U R U R D R D R U U", "Have you tried checking your tracker?", - - "Hints suggested by:\nIHNN, Beaker, MrPokemon11, Ember, TheM8, NewSoupVi, Jasper Bird, T1mshady," + "Lines are drawn on grids\nAll symbols must be obeyed\nIt's snowing on Mt. Fuji", + "If you're BK, you could try today's Wittle:\nhttps://www.fourisland.com/wittle/", + "They say that plundering Outside Ganon's Castle is a foolish choice.", + "You should try to BLJ. Maybe that'll get you through that door.", + "Error: Witness Randomizer disconnected from Archipelago.\n(lmao gottem)", + "You have found: One (1) Audio Log!\nSeries of 49! Collect them all!", + "In the Town area, you will find 1 good boi.\nGo pet him.", + "If you're ever stuck on a panel, feel free to ask Rever.\nSurely you'll understand his drawing!", + "[This hint has been removed as part of the Witness Protection Program]", + "Panel Diddle", + "Witness AP when", + "This game is my favorite walking simulator.", + "Did you hear that? It said --\n\nCosmic background radiation is a riot!", + "Well done solving those puzzles.\nPray return to the Waking Sands.", + "Having trouble finding your checks?\nTry the PopTracker pack!\nIt's got auto-tracking and a detailed map.", + + "Hints suggested by:\nIHNN, Beaker, MrPokemon11, Ember, TheM8, NewSoupVi, Jasper Bird, T1mshady, " "KF, Yoshi348, Berserker, BowlinJim, oddGarrett, Pink Switch, Rever, Ishigh, snolid.", ] From d1ef198566e47c628ab77c534857a8e4877d8dcb Mon Sep 17 00:00:00 2001 From: espeon65536 <81029175+espeon65536@users.noreply.github.com> Date: Fri, 15 Mar 2024 07:05:44 -0600 Subject: [PATCH 10/22] OoT: Entrance Spoiler Fixes (#2500) --- worlds/oot/__init__.py | 52 ++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index 2f06500e81b6..303529c945f6 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -1034,6 +1034,31 @@ def prefill_state(base_state): def generate_output(self, output_directory: str): + + # Write entrances to spoiler log + all_entrances = self.get_shuffled_entrances() + all_entrances.sort(reverse=True, key=lambda x: (x.type, x.name)) + if not self.decouple_entrances: + while all_entrances: + loadzone = all_entrances.pop() + if loadzone.type != 'Overworld': + if loadzone.primary: + entrance = loadzone + else: + entrance = loadzone.reverse + if entrance.reverse is not None: + self.multiworld.spoiler.set_entrance(entrance, entrance.replaces.reverse, 'both', self.player) + else: + self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player) + else: + reverse = loadzone.replaces.reverse + if reverse in all_entrances: + all_entrances.remove(reverse) + self.multiworld.spoiler.set_entrance(loadzone, reverse, 'both', self.player) + else: + for entrance in all_entrances: + self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player) + if self.hints != 'none': self.hint_data_available.wait() @@ -1229,6 +1254,8 @@ def get_entrance_to_region(region): def write_spoiler(self, spoiler_handle: typing.TextIO) -> None: required_trials_str = ", ".join(t for t in self.skipped_trials if not self.skipped_trials[t]) + if required_trials_str == "": + required_trials_str = "None" spoiler_handle.write(f"\n\nTrials ({self.multiworld.get_player_name(self.player)}): {required_trials_str}\n") if self.shopsanity != 'off': @@ -1236,31 +1263,6 @@ def write_spoiler(self, spoiler_handle: typing.TextIO) -> None: for k, v in self.shop_prices.items(): spoiler_handle.write(f"{k}: {v} Rupees\n") - # Write entrances to spoiler log - all_entrances = self.get_shuffled_entrances() - all_entrances.sort(reverse=True, key=lambda x: x.name) - all_entrances.sort(reverse=True, key=lambda x: x.type) - if not self.decouple_entrances: - while all_entrances: - loadzone = all_entrances.pop() - if loadzone.type != 'Overworld': - if loadzone.primary: - entrance = loadzone - else: - entrance = loadzone.reverse - if entrance.reverse is not None: - self.multiworld.spoiler.set_entrance(entrance, entrance.replaces.reverse, 'both', self.player) - else: - self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player) - else: - reverse = loadzone.replaces.reverse - if reverse in all_entrances: - all_entrances.remove(reverse) - self.multiworld.spoiler.set_entrance(loadzone, reverse, 'both', self.player) - else: - for entrance in all_entrances: - self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player) - # Key ring handling: # Key rings are multiple items glued together into one, so we need to give From ed9cbfecb9156dbe581ee7afe2ea23956c0520ab Mon Sep 17 00:00:00 2001 From: agilbert1412 Date: Fri, 15 Mar 2024 19:31:01 +0300 Subject: [PATCH 11/22] Stardew Valley: Added a Great Combat requirement to an entrance that could block its own key (#2959) --- worlds/stardew_valley/rules.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py index 8c0f63f2dbcf..8002031ac792 100644 --- a/worlds/stardew_valley/rules.py +++ b/worlds/stardew_valley/rules.py @@ -33,6 +33,7 @@ from .strings.generic_names import Generic from .strings.material_names import Material from .strings.metal_names import MetalBar +from .strings.performance_names import Performance from .strings.quest_names import Quest from .strings.region_names import Region from .strings.season_names import Season @@ -862,7 +863,7 @@ def set_sve_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, worl set_entrance_rule(multiworld, player, SVEEntrance.forest_to_lost_woods, logic.bundle.can_complete_community_center) set_entrance_rule(multiworld, player, SVEEntrance.enter_summit, logic.mod.sve.has_iridium_bomb()) set_entrance_rule(multiworld, player, SVEEntrance.backwoods_to_grove, logic.mod.sve.has_any_rune()) - set_entrance_rule(multiworld, player, SVEEntrance.badlands_to_cave, logic.has("Aegis Elixir")) + set_entrance_rule(multiworld, player, SVEEntrance.badlands_to_cave, logic.has("Aegis Elixir") | logic.combat.can_fight_at_level(Performance.maximum)) set_entrance_rule(multiworld, player, SVEEntrance.forest_west_to_spring, logic.quest.can_complete_quest(Quest.magic_ink)) set_entrance_rule(multiworld, player, SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer)) set_entrance_rule(multiworld, player, SVEEntrance.secret_woods_to_west, logic.tool.has_tool(Tool.axe, ToolMaterial.iron)) From e0e9fdd86a8dccc2f292f8c23441c66601a56e9e Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Fri, 15 Mar 2024 17:33:03 +0100 Subject: [PATCH 12/22] SC2: Multi-campaign (#2954) Adds HotS, LotV and NCO campaigns to SC2 game. The world's name has changed to reflect that (it's not only Wings of Liberty now) The client was patched in a way that can still join to games generated prior this change --------- Co-authored-by: Magnemania Co-authored-by: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com> Co-authored-by: Matthew Co-authored-by: hopop201 Co-authored-by: Salzkorn Co-authored-by: genderdruid Co-authored-by: MadiMadsen <137329235+MadiMadsen@users.noreply.github.com> Co-authored-by: neocerber Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Fabian Dill --- README.md | 2 +- Starcraft2Client.py | 2 +- .../{sc2wolTracker.js => sc2Tracker.js} | 10 +- .../static/icons/sc2/SC2_Lab_BioSteel_L1.png | Bin 5945 -> 0 bytes .../static/icons/sc2/SC2_Lab_BioSteel_L2.png | Bin 6699 -> 0 bytes .../static/icons/sc2/advanceballistics.png | Bin 11624 -> 0 bytes .../static/icons/sc2/autoturretblackops.png | Bin 8834 -> 0 bytes .../static/icons/sc2/biomechanicaldrone.png | Bin 6999 -> 0 bytes .../static/icons/sc2/burstcapacitors.png | Bin 2579 -> 0 bytes .../icons/sc2/crossspectrumdampeners.png | Bin 5344 -> 0 bytes .../static/static/icons/sc2/cyclone.png | Bin 8524 -> 0 bytes .../static/icons/sc2/cyclonerangeupgrade.png | Bin 12682 -> 0 bytes .../static/static/icons/sc2/drillingclaws.png | Bin 8451 -> 0 bytes .../static/icons/sc2/emergencythrusters.png | Bin 6796 -> 0 bytes .../static/icons/sc2/hellionbattlemode.png | Bin 8210 -> 0 bytes .../icons/sc2/high-explosive-spidermine.png | Bin 14334 -> 0 bytes .../static/icons/sc2/hyperflightrotors.png | Bin 14285 -> 0 bytes .../static/static/icons/sc2/hyperfluxor.png | Bin 9261 -> 0 bytes .../static/static/icons/sc2/impalerrounds.png | Bin 4347 -> 0 bytes .../static/icons/sc2/improvedburstlaser.png | Bin 11115 -> 0 bytes .../static/icons/sc2/improvedsiegemode.png | Bin 14293 -> 0 bytes .../static/icons/sc2/interferencematrix.png | Bin 10537 -> 0 bytes .../icons/sc2/internalizedtechmodule.png | Bin 16425 -> 0 bytes .../static/static/icons/sc2/jotunboosters.png | Bin 5740 -> 0 bytes .../static/static/icons/sc2/jumpjets.png | Bin 17881 -> 0 bytes .../static/icons/sc2/lasertargetingsystem.png | Bin 14802 -> 0 bytes .../static/static/icons/sc2/liberator.png | Bin 9012 -> 0 bytes .../static/static/icons/sc2/lockdown.png | Bin 8289 -> 0 bytes .../static/icons/sc2/magfieldaccelerator.png | Bin 11459 -> 0 bytes .../static/icons/sc2/magrailmunitions.png | Bin 19193 -> 0 bytes .../icons/sc2/medivacemergencythrusters.png | Bin 8954 -> 0 bytes .../icons/sc2/neosteelfortifiedarmor.png | Bin 13032 -> 0 bytes .../static/static/icons/sc2/opticalflare.png | Bin 11440 -> 0 bytes .../static/icons/sc2/optimizedlogistics.png | Bin 13116 -> 0 bytes .../static/icons/sc2/reapercombatdrugs.png | Bin 7102 -> 0 bytes .../static/static/icons/sc2/restoration.png | Bin 7754 -> 0 bytes .../static/icons/sc2/ripwavemissiles.png | Bin 13628 -> 0 bytes .../static/icons/sc2/shreddermissile.png | Bin 9827 -> 0 bytes .../icons/sc2/siegetank-spidermines.png | Bin 12764 -> 0 bytes .../static/icons/sc2/siegetankrange.png | Bin 11833 -> 0 bytes .../static/icons/sc2/specialordance.png | Bin 12992 -> 0 bytes .../static/static/icons/sc2/spidermine.png | Bin 3872 -> 0 bytes .../static/icons/sc2/staticempblast.png | Bin 12094 -> 0 bytes .../static/static/icons/sc2/superstimpack.png | Bin 14901 -> 0 bytes .../static/icons/sc2/targetingoptics.png | Bin 8431 -> 0 bytes .../static/icons/sc2/terran-cloak-color.png | Bin 8134 -> 0 bytes .../static/icons/sc2/terran-emp-color.png | Bin 7693 -> 0 bytes .../sc2/terrandefendermodestructureattack.png | Bin 14017 -> 0 bytes .../static/static/icons/sc2/thorsiegemode.png | Bin 11345 -> 0 bytes .../static/icons/sc2/transformationservos.png | Bin 9215 -> 0 bytes .../static/static/icons/sc2/valkyrie.png | Bin 7490 -> 0 bytes .../static/static/icons/sc2/warpjump.png | Bin 8665 -> 0 bytes .../icons/sc2/widowmine-attackrange.png | Bin 13367 -> 0 bytes .../icons/sc2/widowmine-deathblossom.png | Bin 12946 -> 0 bytes .../static/static/icons/sc2/widowmine.png | Bin 5671 -> 0 bytes .../static/icons/sc2/widowminehidden.png | Bin 12777 -> 0 bytes WebHostLib/static/styles/sc2Tracker.css | 160 ++ WebHostLib/static/styles/sc2wolTracker.css | 112 - WebHostLib/templates/tracker__Starcraft2.html | 1090 +++++++ .../tracker__Starcraft2WingsOfLiberty.html | 366 --- WebHostLib/tracker.py | 1216 ++++++-- docs/CODEOWNERS | 4 +- setup.py | 1 - test/general/test_items.py | 4 +- worlds/_sc2common/bot/bot_ai.py | 3 + worlds/sc2/Client.py | 1631 +++++++++++ worlds/sc2/ClientGui.py | 304 ++ worlds/sc2/ItemGroups.py | 100 + worlds/sc2/ItemNames.py | 661 +++++ worlds/sc2/Items.py | 2553 +++++++++++++++++ worlds/sc2/Locations.py | 1638 +++++++++++ worlds/sc2/MissionTables.py | 737 +++++ worlds/sc2/Options.py | 908 ++++++ worlds/sc2/PoolFilter.py | 595 ++++ worlds/sc2/Regions.py | 691 +++++ worlds/sc2/Rules.py | 952 ++++++ worlds/sc2/Starcraft2.kv | 28 + worlds/sc2/__init__.py | 482 ++++ worlds/sc2/docs/contributors.md | 42 + worlds/sc2/docs/en_Starcraft 2.md | 64 + worlds/{sc2wol => sc2}/docs/setup_en.md | 67 +- worlds/{sc2wol => sc2}/requirements.txt | 0 worlds/sc2/test/__init__.py | 0 worlds/sc2/test/test_Regions.py | 41 + worlds/sc2/test/test_base.py | 11 + worlds/sc2/test/test_options.py | 7 + worlds/sc2wol/Client.py | 1222 -------- worlds/sc2wol/Items.py | 421 --- worlds/sc2wol/Locations.py | 516 ---- worlds/sc2wol/LogicMixin.py | 148 - worlds/sc2wol/MissionTables.py | 230 -- worlds/sc2wol/Options.py | 362 --- worlds/sc2wol/PoolFilter.py | 367 --- worlds/sc2wol/Regions.py | 313 -- worlds/sc2wol/Starcraft2.kv | 16 - worlds/sc2wol/__init__.py | 324 --- .../docs/en_Starcraft 2 Wings of Liberty.md | 54 - 97 files changed, 13712 insertions(+), 4743 deletions(-) rename WebHostLib/static/assets/{sc2wolTracker.js => sc2Tracker.js} (85%) delete mode 100644 WebHostLib/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png delete mode 100644 WebHostLib/static/static/icons/sc2/SC2_Lab_BioSteel_L2.png delete mode 100644 WebHostLib/static/static/icons/sc2/advanceballistics.png delete mode 100644 WebHostLib/static/static/icons/sc2/autoturretblackops.png delete mode 100644 WebHostLib/static/static/icons/sc2/biomechanicaldrone.png delete mode 100644 WebHostLib/static/static/icons/sc2/burstcapacitors.png delete mode 100644 WebHostLib/static/static/icons/sc2/crossspectrumdampeners.png delete mode 100644 WebHostLib/static/static/icons/sc2/cyclone.png delete mode 100644 WebHostLib/static/static/icons/sc2/cyclonerangeupgrade.png delete mode 100644 WebHostLib/static/static/icons/sc2/drillingclaws.png delete mode 100644 WebHostLib/static/static/icons/sc2/emergencythrusters.png delete mode 100644 WebHostLib/static/static/icons/sc2/hellionbattlemode.png delete mode 100644 WebHostLib/static/static/icons/sc2/high-explosive-spidermine.png delete mode 100644 WebHostLib/static/static/icons/sc2/hyperflightrotors.png delete mode 100644 WebHostLib/static/static/icons/sc2/hyperfluxor.png delete mode 100644 WebHostLib/static/static/icons/sc2/impalerrounds.png delete mode 100644 WebHostLib/static/static/icons/sc2/improvedburstlaser.png delete mode 100644 WebHostLib/static/static/icons/sc2/improvedsiegemode.png delete mode 100644 WebHostLib/static/static/icons/sc2/interferencematrix.png delete mode 100644 WebHostLib/static/static/icons/sc2/internalizedtechmodule.png delete mode 100644 WebHostLib/static/static/icons/sc2/jotunboosters.png delete mode 100644 WebHostLib/static/static/icons/sc2/jumpjets.png delete mode 100644 WebHostLib/static/static/icons/sc2/lasertargetingsystem.png delete mode 100644 WebHostLib/static/static/icons/sc2/liberator.png delete mode 100644 WebHostLib/static/static/icons/sc2/lockdown.png delete mode 100644 WebHostLib/static/static/icons/sc2/magfieldaccelerator.png delete mode 100644 WebHostLib/static/static/icons/sc2/magrailmunitions.png delete mode 100644 WebHostLib/static/static/icons/sc2/medivacemergencythrusters.png delete mode 100644 WebHostLib/static/static/icons/sc2/neosteelfortifiedarmor.png delete mode 100644 WebHostLib/static/static/icons/sc2/opticalflare.png delete mode 100644 WebHostLib/static/static/icons/sc2/optimizedlogistics.png delete mode 100644 WebHostLib/static/static/icons/sc2/reapercombatdrugs.png delete mode 100644 WebHostLib/static/static/icons/sc2/restoration.png delete mode 100644 WebHostLib/static/static/icons/sc2/ripwavemissiles.png delete mode 100644 WebHostLib/static/static/icons/sc2/shreddermissile.png delete mode 100644 WebHostLib/static/static/icons/sc2/siegetank-spidermines.png delete mode 100644 WebHostLib/static/static/icons/sc2/siegetankrange.png delete mode 100644 WebHostLib/static/static/icons/sc2/specialordance.png delete mode 100644 WebHostLib/static/static/icons/sc2/spidermine.png delete mode 100644 WebHostLib/static/static/icons/sc2/staticempblast.png delete mode 100644 WebHostLib/static/static/icons/sc2/superstimpack.png delete mode 100644 WebHostLib/static/static/icons/sc2/targetingoptics.png delete mode 100644 WebHostLib/static/static/icons/sc2/terran-cloak-color.png delete mode 100644 WebHostLib/static/static/icons/sc2/terran-emp-color.png delete mode 100644 WebHostLib/static/static/icons/sc2/terrandefendermodestructureattack.png delete mode 100644 WebHostLib/static/static/icons/sc2/thorsiegemode.png delete mode 100644 WebHostLib/static/static/icons/sc2/transformationservos.png delete mode 100644 WebHostLib/static/static/icons/sc2/valkyrie.png delete mode 100644 WebHostLib/static/static/icons/sc2/warpjump.png delete mode 100644 WebHostLib/static/static/icons/sc2/widowmine-attackrange.png delete mode 100644 WebHostLib/static/static/icons/sc2/widowmine-deathblossom.png delete mode 100644 WebHostLib/static/static/icons/sc2/widowmine.png delete mode 100644 WebHostLib/static/static/icons/sc2/widowminehidden.png create mode 100644 WebHostLib/static/styles/sc2Tracker.css delete mode 100644 WebHostLib/static/styles/sc2wolTracker.css create mode 100644 WebHostLib/templates/tracker__Starcraft2.html delete mode 100644 WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html create mode 100644 worlds/sc2/Client.py create mode 100644 worlds/sc2/ClientGui.py create mode 100644 worlds/sc2/ItemGroups.py create mode 100644 worlds/sc2/ItemNames.py create mode 100644 worlds/sc2/Items.py create mode 100644 worlds/sc2/Locations.py create mode 100644 worlds/sc2/MissionTables.py create mode 100644 worlds/sc2/Options.py create mode 100644 worlds/sc2/PoolFilter.py create mode 100644 worlds/sc2/Regions.py create mode 100644 worlds/sc2/Rules.py create mode 100644 worlds/sc2/Starcraft2.kv create mode 100644 worlds/sc2/__init__.py create mode 100644 worlds/sc2/docs/contributors.md create mode 100644 worlds/sc2/docs/en_Starcraft 2.md rename worlds/{sc2wol => sc2}/docs/setup_en.md (50%) rename worlds/{sc2wol => sc2}/requirements.txt (100%) create mode 100644 worlds/sc2/test/__init__.py create mode 100644 worlds/sc2/test/test_Regions.py create mode 100644 worlds/sc2/test/test_base.py create mode 100644 worlds/sc2/test/test_options.py delete mode 100644 worlds/sc2wol/Client.py delete mode 100644 worlds/sc2wol/Items.py delete mode 100644 worlds/sc2wol/Locations.py delete mode 100644 worlds/sc2wol/LogicMixin.py delete mode 100644 worlds/sc2wol/MissionTables.py delete mode 100644 worlds/sc2wol/Options.py delete mode 100644 worlds/sc2wol/PoolFilter.py delete mode 100644 worlds/sc2wol/Regions.py delete mode 100644 worlds/sc2wol/Starcraft2.kv delete mode 100644 worlds/sc2wol/__init__.py delete mode 100644 worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md diff --git a/README.md b/README.md index 3c3c41475bab..d914f860165e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Currently, the following games are supported: * Hollow Knight * The Witness * Sonic Adventure 2: Battle -* Starcraft 2: Wings of Liberty +* Starcraft 2 * Donkey Kong Country 3 * Dark Souls 3 * Super Mario World diff --git a/Starcraft2Client.py b/Starcraft2Client.py index 87b50d35063e..fb219a690460 100644 --- a/Starcraft2Client.py +++ b/Starcraft2Client.py @@ -3,7 +3,7 @@ import ModuleUpdate ModuleUpdate.update() -from worlds.sc2wol.Client import launch +from worlds.sc2.Client import launch import Utils if __name__ == "__main__": diff --git a/WebHostLib/static/assets/sc2wolTracker.js b/WebHostLib/static/assets/sc2Tracker.js similarity index 85% rename from WebHostLib/static/assets/sc2wolTracker.js rename to WebHostLib/static/assets/sc2Tracker.js index a698214b8dd6..30d4acd60b7e 100644 --- a/WebHostLib/static/assets/sc2wolTracker.js +++ b/WebHostLib/static/assets/sc2Tracker.js @@ -25,16 +25,16 @@ window.addEventListener('load', () => { // Collapsible advancement sections const categories = document.getElementsByClassName("location-category"); - for (let i = 0; i < categories.length; i++) { - let hide_id = categories[i].id.split('-')[0]; - if (hide_id == 'Total') { + for (let category of categories) { + let hide_id = category.id.split('_')[0]; + if (hide_id === 'Total') { continue; } - categories[i].addEventListener('click', function() { + category.addEventListener('click', function() { // Toggle the advancement list document.getElementById(hide_id).classList.toggle("hide"); // Change text of the header - const tab_header = document.getElementById(hide_id+'-header').children[0]; + const tab_header = document.getElementById(hide_id+'_header').children[0]; const orig_text = tab_header.innerHTML; let new_text; if (orig_text.includes("▼")) { diff --git a/WebHostLib/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png b/WebHostLib/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png deleted file mode 100644 index 8fb366b93ff0debd825faf213132da839c04a89b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5945 zcmV-97slv`P)EX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X z 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 Eg6#q-ApigX diff --git a/WebHostLib/static/static/icons/sc2/biomechanicaldrone.png b/WebHostLib/static/static/icons/sc2/biomechanicaldrone.png deleted file mode 100644 index e7ebf4031619f66461de686511e9212989c34ff6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6999 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 diff --git a/WebHostLib/static/static/icons/sc2/burstcapacitors.png b/WebHostLib/static/static/icons/sc2/burstcapacitors.png deleted file mode 100644 index 3af9b20a1698065fa07a7729b74cfed01b094a27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2579 zcmV+u3hecXP)EX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X zbWe2dEI& zG`&F}uE$B-+{bb3u|2bSm~YD~TYKzrZO`~}mbA6c*=L{2{?1x!e{1axx#W^dF1h5A zOD?(Ol1nbzMlzQ^ow>Asqn}&Y!I-_V84oS)V8EUO<};TjwsAbExXh)c@uaelYuNpA z5;y@Iid=gtb7^VUYgp#eBf!^zUmDO(0>20W1Ezt>uF$Z|rAITD?vGp=1imfJ@_;=C zybx&GLp$E-XD;1mPQM47i*$PkI3Q#$_+Fs!oUXUUgghV@yM9^fO+-pQ~S?>)ADbOCzVe$_O0mjM}X6c0bds&i76#uQD7X` z7;NzXU6zI|s+?I5o!IKLv)-_F*2dQQ*tLwIyjz%%t81 z27r%&Swlf;kx5`j0X8Z}KI&;eU==;)`>kVt5BOBjzosDjh``+5CYiZ(Aaki5$ivbe zUmw$;YdT*5&P!Vs1V%|3l>k>%_Ud`RmF7)sgobSeA9ey5i?lz}qW>M>T^&yXe*^vs z{H{e`Uq0GNK5Q&=>8}J{=9N$NylT(*D?n8s8~|>q#N;pPhXA`nJfXO?H7s-KGnq@j z64A0T;D>5^Hn?qGniMAeZnt>NO%*HWx2uLdExz@ZzF`>nzQ8D&z}e4o7i4}_k=O#w zjOi_DUQeI|PJI*kvPI3VcLmz)b~MS6;Cx7>*1{K6WP+A!gkh!akF`8L0=PrmLQ6D!u* z_~yQD0`|=opnX?>oekRm0gRjTHw9M3IOSH~H6Kacc)8HRm(EFp_nJ7gtFhz@#P=$A z(>p64X7low1lsStSsR~KFu?T$K>ahA8SP5Zq>9y`KGBnZ>->hyw%Sd=9sxeDXFUr1 zKxT48VD^idUo<|XsL9|%<8x-rwW2^uG+R#V_6@|X14Y9L6PNy`l-bri0=wuXN=FXdmz00!DI+Z5$0WxX6=(^m8CuNG&hr6k_KIp zS?$+#uRXVnhRrFWuruPnR1QkRj&>8UUYZM}CCx--WgwP}U%4))Uyk_AX$@pjob8&l z>asNSrYOU0nVHk`JeT@deJpRgX(oq$`Nw`eqaK7>9S3Z$KJ1G@g0Njbae?M?zfU>W zj31gX8d=qQTqLti@~ZTZ;bzApfUFfDx6b?hnBVF&4;zi}tSdD4XYG-h`ghF8XMLb} zaisw#9RjSQ8s^pdyqI_@)4Qzf!Jq==drB_eFsyxkg+V55fRwD`y5A$)=rmyW1cG0@ zs0P>GH|Mv5_xU8@k{Lv@2I3h`RxScgvdYh1>@;A15?BwI*sW@4$2}96C&BytCXv`m zw%v!?qggPC08)tbFPQ6%fY#W)U2*z1B5hMf!`jh~!YUM}9vN)x{z4mc$@cYhB$r%r p$t9Oua>*r^Tyn`Jms~m`{|C`oK4n}?j*$QW002ovPDHLkV1isK*}?z- diff --git a/WebHostLib/static/static/icons/sc2/crossspectrumdampeners.png b/WebHostLib/static/static/icons/sc2/crossspectrumdampeners.png deleted file mode 100644 index d1c0c6c9a01050df51d171481302cdffc38326dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5344 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 Eg7O=+9{>OV diff --git a/WebHostLib/static/static/icons/sc2/drillingclaws.png b/WebHostLib/static/static/icons/sc2/drillingclaws.png deleted file mode 100644 index 2b067a6e44d4f787505814b9bfdbc54e006a6d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8451 zcmV+eA^hHnP)EX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X z2K~#9!?VNdV8|Rs)AL3$z zO+tV{L4-+Dh6$6RO-rVh7HvkhJdCxH{$(WF2_gaCmA(E`}u{_!=s(FAzN z|4o&@DpZ5$ZUFuC?|r}b_(1q%d@?>6pNxOIqhzri&6U!o+;fYzwQ7&t2q|flxvc)T zY`0Lm$^}4RwVi;^L35p#jq54_*#FuPuMNhCOlJUyOlP?3Rv&(!%%R_f0Pwq^zDlCL zN}|Cp;V+K^u<0)z10Y$kjkULJIR4UpSbYoeaF{Z;o7s3AWlqBF_K;4e0dU9; zrY=PQs9fzsvd`0bybFNNKc0X&1%Q3ey}-_g9^ufDL%jHpKjD{0I!_kkVk`FItseU( zV5bJFDAd@TN_;MhRAgTcR{l73W{TdSC}6=?Vb`JgeKO%l(sXPNR&G?UZ`Gf#y=^0a zfCa?EVeFD|Y+0GCKX*9HumCeGZRB7beC1_+_4EHd5AemU?M0y#0IPRdHaV=;o!Xx* zITbEcSA0%2ohREZ$abq4oX?@FOTYr3OMo1>IE$~sF7};{m|!g&Ibb#GTTy@u@1N55 z*(C|PB#}`R?2?4l=Fnj!lQSk*UB^1XQMxFsgRdL_moo6=zn(nNa;+7;+NQfUh6Z|TenqA6d%RRw^vnBRTZn%{JoR2Ld8R4 z;{Y5y-p%lb6S#qWFTB9cM;_te%P;fVi%%E*{*qJ1V_{QN6 z#b@QiI(Xo~HNjdDFq2Q1$D}UVW?52UK!LjIZm8hfUudM`__zUT1?ozU9w9mU_LAQ( z2Ts;zO4%vXP+PVQg|*s8a&B!%&wS0oYx?kr*J|@Gt;J|K(Yrk*RV& zX;sO)IFGP^bV?|$q=fXf~o*Cp8uq<)vP=($^)efk67#Wx3aSh*2gvp`)NjhWHk*h+Y? zTg;;CT1m$ug}ybN!r>5~pT3$ReN|cVdKy~`XI{BXn7P~SMv|P1o?8@{wTQwJg{}*y z%}SN#zf9(My{iD)k=_VL-YdM=x&^TEf#tTnukHb0@=P~b#RzgOlB~sCPSWWVnY5zA za+Er+Iqi{UGc2h{$Wj1IDgvwE7@NhUu43a@&p0n0{9r|2G`Pl5R9yh4UfH9oD<4vB zn={2sS|O8B$fT8JKX0(RyC^JK7Ur!eDGiu&1q!o)npIJ=D%c=CCuYX!v;uPqk_{k> zWD~KJr&L0+T47$r;{?0Q%kyuHaP(9JyUUAI>E_tE8IBJ`aN0n!N%|vjokVNBOiY28 z0;~OQYHqoYj8Z}1p8o>nchTEB22EcglyDJF`I((lQEU>kb1JiQDp^%QNyV^QVJ4YG z&8RqRRwO&1X22$aRl6bDwqa8%${Z+jkWDK%Z4&Y-57;1`O=EFbk;V|^wYpZhaIJDJ zdCb5GLt#=`1#VxBDgQKlV|ryiEC(x{HiMEZ;&8Vl6~OY8iF1aB3^)zzY8L&{ewP_o zeZZXuOeEOR(Ox{kCSoHigH`GEnqVyl4luzoPb6s*yhRljk1M#{28@)dqGT73?A=bQ z4l6cWT#0WNQP@h<1(3QNK`AmbPEAD_J~J%Nxz3vxXp2dtq6n;!v9T3T01k(Pcs#Z| zu*P-O4313XRV55Z58$y$Fb5vl3S@9v6_l$GzN*cfdmVt~Kl0Tf_lx|YzTII+;XNRot8cfew+TvZ8Q3KN|~Sla3MOK zK(fJI_ibV7yasRHY<7{^8RJGD>0I6Lj!$;PWS6mdk$7C9%Fps!pE+b-uJ+c6(9Tdp~EYS^a1|v zuODXjKOZoK5eoy=9Jp;;)-!T;Ob2&*B(mZ!)o^|B(4_NUo;MdO<1t;OHPveueZL*M zK1(vMqywO4Ve4lEsI8xQU~!*XT|;r)`e7P_X48~x zR-85~0k2$CY2SYAOTu8@>C+X~(>+4Z0)^$PD_>Q)ZRf9_D=;xdQII4FkK2Q?1gt0b zKg+^2KQ&XB_z#`xGyT1B)18DT#+jU$Fu~gT!1m=87E|D*BfWg<(d~TWG2wWXxhx7< zd^Ikl{18J?kjqpa{MP3Pw6%!~uQV>HyZ-`_SPFN!aY{{Pmf3WcrUoAk4L%gNZ~;nr zs}@xL1h=9nCnY`ANhV@|ysW98>@b{lRi%gc`SXTTmyHRip}vuh zJXipouROKndoLQe{`~1qzV-EXc&2clSF6QG6XqEv)OCVGAq6;Y#6nJszI8dRKvsuk zI=8o*(0kpu*KRh{K9wY60omm-DiF(z@w4J)R|f-PHZCYz8x}A$JgCFkwsR*x+qVxU zyOwmX#4b5+HajCG!!Dx z5WtnaLe`ptpfVV`jQ!Vd@RjdBhW&;H_;3h!xt;h-MxUkRQY&f}+^g)gmBqPn!w&Rl zM+z|hK_B5MD^g7x9+wC>-yIkdim=X_vkgfhbXIGql-ji}10ttX6eOpUK+vzho|-dH z6Js9cWVl!zIG=M<0Fplb$EruHI*g_oW{#SDt@$SG7J*Pz!KNgu@ zP*pXIqA?gORQ>q)vg$hc$|0@AwwKR6Bqpm+e^;Ja4>56eh>4NmYX^2H1f8#U5@;}_ zu3pt}ZZ>Iw(38MAN8!3tD6sJ>&1Y2Q2l`rM)y)^mE8_{`$vn!%A# z+~v}WFL>}6Wek-p1hnfP~$ME z3t-}d{$($;J`kY(CUL_Yb~}S3Bl^DZq&ZLZ*3`hs?xL{X=s1jIlk#Ahl@;pm!g_IW zSVe(3RNQgUo!Efp>+y3B#q9y(6tHeHv5Ztgqhvt|!pZmec zpbjfHUVHs8pWU^MXZQaU$sN#P0XnS6g-~AgRlrIn)s^|M)>a|^?(UFKS6;tSDmBbX zau`w0pjMQt$O|7dBc?9kC3urphXpXAt&ecZ^0L4>UVT-EHrm(EXrD0Sx((~ePMA&l z+@ztn6UVw39G}!-0YpyxlhMB%KSA`OVuGdbOR7bI6)hmP-Wj0#oeuGl!CsqC4jp3q^LfQ&C5KjvU1 zXIG%G*5+!MNzwhz2-v{qcIfF$j4zpRzX!|74fM_GII*p6jT)4wwRuXi-Mr% zSdq&KDqM~wRV7K1Ug}9HM!Ga~ZVG_o-Tis6+Qo4iEagHMB|t0^B^EJO6Xjqt7&Ls2~C@WENb>F2{D4_5q=0G7BqufvL5R!Ar;3acnEle&sP zlS;+IS-PMK+uTOzy%Rbtk4FQR2W#MsA2Qq*(SZ&3^)RWJePo4fVPJTSrh4)D$EPM2 z^c>=*TG`k|1J=$@*R$`1Uld%VqC-1DEbi4|8444yU};!If$e*_m*xf^>7+Q(YERQ1 zbmNuns3mDU*X4Jg^w)xBoN%U;V;;{B+Ob zD2jN$)R>sHuU~abvp%6=|#F8rUWEP9IN(qeZisLXndY0{Y zWwUSbR+_sqmGx~zhr6&^1ZdZq0IoFw+&7AtspHp+r$G75hN?;<=4)$f!CMMDAKGd< zzPEow+m4EA!~Fu5ZiX5xWvttPH5ny38P%I8vCAo9mlc$&2CRjU>?JDz*65Rq0CVWT z6jC}Yu}v~H+(l)5n+_^}tDCge)bOn-zV7P2t?g{x+Kx3lL))kBFxqJ!j%W$<5dfOk z2Q_7lYR>(~Y`=eNQCJkf!UQWGQ%KEQbXW@^tw>>mktBncl01B?k6U~)iL^NDL@35x z0gnk*3s!FJsm+2Xa z(=!rheb7xnoBiyPM0(zir^b)$sYNOeAbZBKIILtoI)#1BMjUH4qD*!Y51%7&b0gVw z2DF^iS5*PS5(B+mR8_he7&yh&?d^2F^fFTs5h5faQ4aT8aoELYc6J^mJQZi>1NX7- z7n%twA!6r@+PgD4$n@nHk;y2LNnkDyRxC|?a+ZlCB(%zt)nX1#m5hiVO9018fPHzB zFqsW`E1X+`Zd!tF?zq`Q3b2>UILeof%pGe)3KR*)t~r8_MxuqSw@y)(F~I^8toXTJ zre~8HEc1KBVrgRW42iS>%iQUj;6@}1p>H~O156hJE+6x_f zayCO_qnGGqh2haSUXQdquxwU{uDPk2=G$uUG>XL`@$*_-RB2vh=DA@5%AA6lj8LLZ zL+M(ixfs#W9ztg(Njv?FPZ+^x`=7V#&uhoVP_#y?Wo8^{CWLfd9Z_WjDtvUlb(r=V zg|F{^f{mZnnyTjyk+^7-q2r_dL_!ggxo|EoU5Z^vqgRYA1~ zbw#I=wA~#*QQ&ajB!McKXyzK@u%}<@<{Mv^Y5v-G3H|PM9hzP@TGx(!b(1*+sS{Cr zbhNPJa__xu9C__1M_xZ_bgZ{+Hv6i#4%7LT(XP*jb?X0h5OfMyiHqY*hbKtHri&}< zN}BkU42i3dxGG?Yo`85PvgD1<-pI%6OE%wDL+`)@?i=fi?zdM4aI6;QrY0j~E)8HQ z^Xae_0=xHK5vTp_U;dE$c5PwnE|D&6{j?|#{kG#6zwJ0?I;ZRX4{*B`9ae7SU@bOs zu;N!TXPk8t0vEj+&e2LK#-?WhUTp^oG9cK6W!@3*o0Cq@nH z>UA7`^Du|s z6lS>pKl-`rhXQzXpcBrYBB&a1Stb_6ay5-ZtNbe3FH;nCp2QV}5}d@NMsvnt*Shpm zn(5lij$F;CC@M&0644nI;xXJdE6k}Y3oCm1%y%y{6USce)@Dc#a((-%+KiRfT~|t zP21g#)UPW{%_OV#umHIwT{f%nd?|%}^DCPc4@N6IIJ|{nf-kT^t2CGs?CoFw9~^r1 z6%M_2n7z+DQ2^^uM>i+>`gB;^@852M6+PWaRfPd7H*%mdSB2RnuB1p@QJ78`rI~=% zLkP&OJRg;y((hvUOkTxBW0G1v1S<~gj@xT^_dR3Uma77!XJRdER zsE^3`KEOq=c?-ejd+B)k@A=N(KFi)`o?yp=+d1@VhY8l9!`*nQq(x!nE6b#M4OHf8 zhQt*kjHqx)wBK4wKo`3i<^19EHo*E!CHGuu{`(nbF zzaoHr6oy&DfzPJQVMJYvIcToAS(x0=pN5#as4zVq#R2%W4*AHLFk9{paQt|Pu@B=c ztQSfek*4)tKL43|4*boDWs>icoj^ODngFr!5YF%^%GN!My|R(alxQI2VA*9cqYn0n zYC_|`+e+Ye5m!C>m)~LEQ+sK@zm3i}#eT7MaOjmo?09GgPd>L7sXU;=%1jNIoN6XK ziZZ*rt<*GcF#gD^cGPdICs^m@z$-=;F!o`bv9TDNHwXCTONH4%Q@sFnO>tOkB1CK= zgr{1V-t3tJl&yOhx$zOy*@yrpSL2XtU@p$!pEO`CTT$jx_*dV=&Rsj$`Pm(GzWEy+ zR_B{<6B*pK0R1H~Kkn;1q*rM8+{TW>k5% z-E*VSU|#DX;FlN}j_QvU2dsr)l?Ax8I~ri+5gje;WV z2R{sKlGm=^C9mDkBCp-B4R@nZ)n!cq?f_-iHRCArYjIGVzMgJ2w6yZwN54cm8smH4 z{{{fZj-I0bgGo9MiRDGR_wHrK1CNOKC(@_YqqGp=qdqbp^+8!Ja?osIk@t>|K?_k7tL3D1hO$EpEyT`z*t__$Dw z)p3*Q_#gdG<6k5k|3fc39^S$3C!aJOWA$x7jr5T@{XEK~2xjeTG=Sk4$%*MRZuE z6r?AZF=S`p%8v`%p^%-A+$@tP2G=25j zs=EteIkf0Ly+~?Q0IcH~ae>?Y6L59{%2$KC0jsA$+`(~?##kjUR>_NGbLTB$*+%PY zt#rQrD?&p9wD0=7zF$p-QIlbmD`PO(2hwVBQ|2z|=f8S9#DnEw@W9Lc3C+nG@1IPm zB+#OJZDmbzL3R{hu%^{wvy+`SphzVPYWRv7m|G(v=|8c}EDh{$9`9t^rvhx>EJBKG z+*||8+8sKug{G^fA~?J?wD0=7v11M$Sax=D(L4R>@ep5oypt~|@WNkI7p|yDsU#H@ zN(@*gb88Zva%U_-Xw>{UmXej_J#|4Z(eu$Ik0~(T&uRt1z#K zH?c^S`U>hCG@C=z`sXuA)aei(hNE~Y^GrBvBOMWqiV}M{^Vi)7e$5O=j$kXR&|v}0 zX@DEohyqqgCZoejDp_Xp>h2Sf43cD{{R^Afc;9*gx2ibPX%asX}kc<-=5+O*Sp$Rn^#wr_4kL-M&$yBZ9)!(07@{UGg z!se2SFVIY>dV^Xy07RgYDu% zM@~;LdU}F+xy)3F%KCit_l(inQp>mgYBODD;_TihF1GQq%H;3_UFXG3sb6iU)^4Z4 zW&Cd{CGUo{-Q9>Hx!LiU@yopz&rfu0yFNnDWu3pK5_SC-pX>ozklcq?V*i=MDE3uB zJ-*U|Q>P2A7|W*;6XM4LiO?X4&>%I9LVfL|#!t?tVj%wE zT2C$;NGG(V-g(?JS4ObQHDs=g=zlxBO`5v2pV;MKt*X_ZCqg2LpFTfG=TwIFy9F$O zU+q6i@YZUAP2#uM-6w_#jU;hjXXpIrEUkAMu=f1?IJn(>+%Y~DEX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X zP+lK~#9!?VNd#9MyftKixeu zyE}XDYFB#*(CR*r&;hzIhm1ooNQjV>k-1HURP4AMhd2}!pV+a>vCHuh+vE>d8H_C( z>;i*0jAJB$u!L4f0)!;cwYv7u-skM>%yhr}@m_bo?&)2v6#hv?Z|l_@eN6Yaf9Lo2 zdkYuG#c^?59RGKRF~K%L0k4wfDj*JILq|Bq6fi0o(~cP=OCcE?kwE~E19uOjLQXLP zqDvi721dERU38Ljj!~kv78z5$Uvz+skwgH4$xXxo>Q~iyKi>LG2ckc8gHvI}Emyi9 zvxO9vs`q9ERTNX408IC4e%tx$=38rTU-3)h8Dr9b8RdLh4Di!P7%gqT1Q?fvwr7D1 zh>Y4N4q{Y+Rscqs_CyqD#w8k{rQjTs)0_!nICO1E`I_7$U+Y)Zv5c#{?JphMOzyQH zU;zJo%fG1Sm!pqfDydSJoAve`W{6>iyw6dfnGs-pb6l{(BA5Y$n&I;#Li?sc41h?f z?ZseDmtcw0p^KU+CxB5MoZ-=Nx+Cy;U6;S#_g?(2_ud6dADMunj6d=KqmXAN zt!UXk ztPB~lWG(U*7N{Ext7$(0!)rFm86M7AFqeQiTkSVnPWx@mTrPve=j3~P*Z7z7 z9`8hc|G?4*rQLc}GqIat)0SUqUTT0rqzbfg=7J<_{Gl6s9juu4eMR*9sNuZr1Lgh1 z5(%0MoV5yyHu@}rpaBdqc!4%-JfJMKcU%Lj;2bBP z0oK)ET&jIH)t}B;$h`!yn|;u%B^qdZ{o@kT8|D*?g?o}B1N)CGm?A@|&()VsoXxQVS?@E2C5~JX>X(wt@vrbL`aW(|n z4<^2tvHz5S#XcrKm%OC{%2ob8bFQ3|2ih&%=DqKwhpKS^1GwqBoAT82d_XfN^nwWu zs0QELiCz$WQqp2;rFfe&Gl_pfAwEsrz-N?d{TyPeWMFCUk{O`r^KD-IZkY3p z=^XyD)Mfjv(E0lyz8>a$u?c{av`9~=08Bmu*4SR_Ge&Y**(5$ zDX^@SDj==&!N~m{4uAOsbG|X1`0X+X4Ug<*IQ-3)pzZpT3L*YNf&~!27iyTwAr4SO zEnRd1@CMs7A64w-jC$S(u=cvO`M5$M?5zC->)p22#4#mr3cG&q4rd zsO1f|(f(L>0JJPwGUKE@$#n_Ld6Ne%7WwT+P^!W}O}nN6fHT|M_}Sf0=3m4nU(%cp zLaLqdLE{?|B>NrtYA%s%g*$T3!{hrN=l*-|XA_SH&FsA>RXiJc3+<0}^UQU>W8H#V zHPaktjC3SuDKY`o%x+?mfE9wU)l=N)?-9Qn7A;;x58bqUx{d5p8l9tfEdXl{WPc|m zvfxWns&X$w?Bit$?(&Q~ zKvJomiHT7K>+e|4OD&uE{kNYd@p-tSaH+as>CyV>qk>8rQQXoxI5Kn$W=?GMW8-Z| zYzzVgu=nBpWPUb*%WZ_jr<6MGlMbNh7qI++CEh+o4;QhWon)Vqz?D3lU}Rs$JH`b} zbjVBqAo~pLdgfj493{J>f8VuH)(ZJ~YEv!kD?7>j0C>dTub)0navYcuIDYmgXL97( zV;2Tkd?UBubo{o7VFZo0-~F%W_sm zG7uG1Qb8sC^yQypz3+4Y%mxgn&1d_J2(`N2T*6lO=3VknWFx$3k+gXLW{vu;LA{p9 zNm1~as>dY9Jn%#cdyhai>ihf!rS=_OOE#kD&qKfmNdc` z0G6stSgT=lUQSQcABGtC|s=4jmDO%>~yN?oL+ z_)L_QCvomL!u#~^j^@4kw#)DPEctrL8t+1Lx>}m!XOa`-Q$-RiSIUf3@j6?$bM3Bk_nC^%#I5gkRmslPb&43*0i7kyP)CwNpAWQCC$>j4Ckd{cXmSU|>3z z`HY3CHU0E*BRBI_T{Ct8n3wp!JxYq{%%EG@oeC^#)SE$2}Ug6evK=IRT0{)yywWN zlKtZQW(T`6JJ|8xJFqoI*50L3wKG9l zDsX+YbnHUhGa#OMdgcG!?jdXL!3B8B)!?iS!ObunapNzWe>e$y*MAp6zjxT3w?__ zX<`;l%wh|#P){QjRC0pjbdH?G*(F(BcZx2V--=eqH3NN8%H52?u%feT(F&w_)F>sc z7ZDAk-jk?=XeVt{^Vgz>-vt2Eq>Dn$hAEXa%6-7xILaj&t;;1?i;N{IQNBFnH;N|w z{Mg`+$UZOgO4kuIJ=DlYk@W4eJk3z&a9-iXehqT3L-yH__T1CzxCOXytO#=wCgj2aNfU`PxxZC)cO zMo5sLqpMx2P8KrXgUr9FI^-Kll1AmU7DDVApdYN6QUaYbN+8^DXjtB>NC6IyQWBJ~ zsIVd#04u5(5+XTW!*14xY{H)DwdqVQqIlQdfYDO^zHfVh9`zObpK3HMtG8$y$UcEpjwyU`&?+J}E8fXR?QRG`p6ZUZMsgHFV*6{)_c%X%CRKR{; z0@e*+spcMgw*)Htgq-pFq^&bA^TQW0;)hNlSKt8g{175T*7ci4fl|<<((?-W1dL*7 zFRZx|sMysIyHS?BDi@UF;INb{Ni&LxNjt5)#hbL#$_T^Q*bLBztpdK7`qTL;J+~{N zltPLqq=-7|`P&T-${4T8j|aWDu)v>Ary?p<4~S79?P+X-^zzwF5={GD)g4p@q-3j= zX!qhrzs<&pwqZk21zfW>WD_ozT{qVJeC{7$k4kR_GBU@jP1Guh8m66AN>zlbgEf(4 z#fSycoW}3e(E4!Kr1HkGFG;4@T;y|X=4^0|$Qr0Q1DxZ2q1id%lMa*N^i5q2b+Ft5 ztq0cPe6act4+N$Qmd9**l2ewaisv)daT|@_sUfy@0+pObAQf`wa=L@cpjRLDwqfp!gxgerZ!@^75${hZ4H8CPLn+y&T()K_@G(WL;M!Vz9@lnnH5JBsoV}pqr#IiOT}S% zfC*KXGV~yigo>I~W!oqY0u_Eb)+&$Eq-v`4k}kvG{)oQ!-7p|ni^x#vJEkw#wh`UM}OShZ?p^K{VB^-*WL z0@7wqQOR<(4;J7Ne4;f-|L8px<~&$6b&cwCsAL*``_5@j1sPNdB5jw)&uiOsN@qR` z>7vu~xSyE6k?r%h(z@v^xgFFMwK5W*Gn`^3v&ZGHY-}7HvSe{^h=)ApagK6`_X6K-XDi#;>V3ZK z&S}KfgltktARPDTZ~N^ClAsJ2JU<&|xM1nJ9TlSmkXP}T^FE+;@3eA;oxCAQIZe{? zc}n?bVMT(aOINq5aEE~dICJt0*43O-%5=Nyf+n=~SLfh3fEk9zRtTXP8lkR9Xw7{_ z(yv~-s^J=jrq&7=n0BoCRD?6SEKqkKmIwDHW-TVcXS9Hzp?4 zOu@mSk6s4o&*St9E{ikzrz~YZjx+RyEY4t%^b~#hy&_^z5}d{~;Iy>APG?@wY5>_N z2@_&4a0lTG(*w&x{VEv%F0qyqC&6@@IH8(IYHDg(z~wApQGgLW-!V8rOJxJoSix!~ zeO)}ya}0eUOYA0j-S!*jKEG>|jan%zX02y(9KBc+(=u_-8|aG(yl6iJmN^fsd0;J< zK3h7732hHgOqeFq_OPJ#( zSUO;aw^=Q7@r-;+px7#*hFWTv8lZ2+NK@#h3<@Y6JU88O zix~cPDfpdq1|+GTMo;wy1_nIoA7FsN_y8+dO(|szPwR1WG>?*Yo|5rb!6T5`;{|p> z!B8=#nGHyos|FsY?`WziCTsuq(&d5&1i*4V-zcd(x;gC8n%T(>e3mC36diy~bw1P+Si_>{2ZJ45V+HlMU z;(%i$ROLtEU`)~AO@UC?9$P8N!U`(A*r|tZ>S@Hm@n|GnY9ttKfr4zfAuhbQVC2tZ zUa~*JFnigJ-5k6ouY|Y(>^;zv?ZI3CyevZm=Uu;g|yoFG_r)9V6~RLzut8is>Xw*c#c)sbpPbmPsuaH3@pXTN;k zR4RM9y4$)Zyhdw{EQBnNUxl?s0vNg96*B$F{6vD4_^ga2jYMSa-i5}tIGP7Ibl zs;NYas_(2C*a7Tsa58elOaPjD1%&B3mk#TygDH zyv}Z{SW>d=W(nHp1Cd}EfjCT)GG7!!U|Dm)oGS@K9jt1mMDX@0 z&s(|@*G(6_bkmvY4033_U{(cH-v!HlN0#y2(K2*A2v$^_x5ITPyRlYFpb~!%ng5c2 zIpdJDnV*2wtiq^Fo|NTFnA@G=E=hJ5h$ilqh1g|Fmw6mJ5LgCWq@@BbSi{J4p@m~! zb*P7KoRb<~j$bcuDdB45hRRFAHXicgMR!VEfevfy^ z9&iw?s(7kNuc6foocCp0fPFY5IR_LusM1ik)Q>F*0nta^0(s{!6n-Dl|1?hjN0Cgl z#gMFIIIR%7)|XNjQ@sN*(uT!WNjqh&_QA6ENl7D6&#k18q5v>a{qQbW&VK3DT)=eB z9h66l0L!&q0iaN9YLO3?=+{~r)WaycAx>KBC^4#h)>w=vkcag0kF=+v=R7$5#6$l3 zz5DitK$6l`p=jn5BLM?%DiKIhOp1{JSP+yh@NJan1bcrzSmr`ax?GS5^gje%12=ao zjJ_IbzbRH;dDJV6=Gj1NjapyO2732lBw$8d>b1ML(^}|1twt^(L4qQRyafV73^Jg# zOO~jP!T~az;S|}u4$cw32H?^t=B3iGij=HCI|so&6ubeWQ9fz=J^x=eh%n1D=HIv& z^zDwdQqt_{N7Z@y6c?89?VswO2tI%|V88E#!cD=E5@zqskH4lRFJU%w17)#px=54u zBKUHx>7s>WbPsk*u#WnrExkBoYX9@XJ|yjzdo%i4aaSGf0}<5mm_`H+`vJGRqaUDsc>b`~ck4RR`;wM&DW{Z^{KL9E5h$<#hm-QBFDK*w~(DbXr1S>5_cux#?i= zV=g<&hRM7ukHd50#jziSz|t}UFGFycxQ}uEN{eh|#w>DPb;H<59(K>1?n+*nrT&F@_KM zkI&f`0?WOr2G2eqI%FX0M6CL7IwV*DH5{4vhOFxq9@~7|W=;!vXPXNilU^i0KtDqa zjtdsRK=%O7zL4`64OX7C$XQ17A+X$a;!cNT8H6TXVn}&aZ3b@Uawz(`lrHb#lqt`u zysKB)&RrN_Q4$ug66I8QV7dR_VX%L|XCza=6e(T$Vp3PqT(HEbjI7=IrDy|Z9Ldsw z%QNyJkaQJ|-x-uHPqjZJ>52r*TFQo`X0w_J<_Z1p_>yIBmm$X(V~qSUP4;=oV48Ju z`HkoaCS)QNq;f=81OP=UL>N)q94*$;a$Jy1htL2>+ymKd0;5h_OKz$2#MHyf{qF$F zQ^~P^=d0&B$lfj|K=F<85r_NebALRCcWetL;bKh95g#lu5&~<2|5z1Yr;`5%f(!4( zNPa>3Lj?@rP2+$unS(7w<&XT)_wBKp{KZ|_SNzJd8=*UGL9kq)0xFl%ZgebSpD0yX u?=RU4aZMLG3@(m~EX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X z|EQv>_pFXxdT;g;r=OD=?x6RM1%tim)Azx_SJ;aBd!_)5mSjZMsL@ba>o+9=B(D zbZ#nhpaqoG0bQYhjg-*RG;L@|nl{a^CQTdKl%7BCk~V-SICtck*Xxy6?%((Q{oL1& z&vjkj8@`Y){sNH;$c<~NA8Ii+4L!5QFt!24o>^mX zKeNWLT`Ce4eu2(el9MJXZZS3u<)n$mHo(}Jvtew^*)VqCg~!Hj-mqazDiTR9*RjQa z7GN!1W@s`jUL*q8{K8`~`@d3C!*w+^-@9A^OZ<$kD_XkDz|v&~8n@R*H&(1MKu#sV zcmKR~EBSeEfg)Q=C!XZ0ARUF&UX)*@3LB~ z&;L`KbGC9smlLRRi$U;u!$^th|u-9G)+H*tnSMn$3>^7)mArqWS&WsAk=N z(9Cj`oF~c)EC1g;hkQgW0k;zmLMG(37A5C35sfm0#YEzpHtKV-QBz?G^F0U98@r*7A; z&&?i0#Xw8`{OjmA{Aa@9iG7BZ2Hf88(}4Zp-nyS(mVg1|DOFb~r>V9%yB#TUBOwg4 z1>aV8%*+!vEd^lR0v!O~x2afq<8GGCfstwPTC zwl+kMYw7koY+c17gC@}LHwFX#z-0p%fH+hBwN$BeL0*Q4 z16Bud38Ta(oQC8ST!SMFDGFG%`3JoEtEU+1@8d@g-Gf9F$LgAmo3-<S%AXkS-CEE>326c#NBGTgL~7Tj}@tIoi}znm0pZ@OwjV zL?YqA%LXusRC-Oo?_ZD{52?wC*u4V`4o4V^PXb`=jT_kdhgV5XOrWGhA3bmOjI87{ z&*^Z7@Y^i_3DfLY5@9Ne%vk(ZkK1yWn+>e5!+Iw>J`K%WA65%o>f7o%|UP&`n_(7 z@@GJNJjSCfwAuzJnLC{>r<+re0j7JpFyv1UMpB3w|l&cLPv7 zuR@5RCtEQr5zNfm)rH+VL9A?c4=;RuIqx+H=JvDuHse!P^6&$jqQ?}bsQ@_K*#>|! zImp8DG7cPU!r^d|oR|!-z;?oR_;Z_lPZqgaUjg8;n__@!{jibN4;#_uYOr>7QMY$r z3{W<^2aQ_Jdku~3Ziw|yhO4S${sHFCDB`fyj9R7Sz`-WeDkT-=W!O&GcK^M=`iDAw zfTGIvti5$}%(l9{^=NZ*F)Ue(wabRh?xAX7AsV$Do81!yYj;BCruBzs- z$F~5mU`A1lhD{c`!wIndvLdd*RJ|sWs$GBAw;sfL!pez}0?PjNY0{=$0f|{)`3tQd z8fpE|NZ9A0ps)aUx08_9Mcy<8Q!=MBa5|CM3k@8#Sn&r9w7bL99k8M-TY&7|wL~O3 zdfy&Kn^w*n`+rAzMh;_1V*LF>7N4unwqkKgNNWOx|A*G+ghf~&U&YiB!(>>R#y^^NS`Wn{We z$&H(?VL${@T^9WoH~k%MPAR>ZkD0KaumapN81x_i+!qih6~J{BSLn+&|ND9>=IeQ7 zyuNSz{o?>p&}OX@w%hl=hB!@vI4xZOGe>afhUL}hOG`n_AF0V(-FVo9quYggngVB9 zIX$L&g1t7Ba~3mT*)Q;=mO27<6QSV|l9Q((%g7=$5a2ZNn3|0ON6Rl@D5zxrE+Z!` zP8xO^nJP+&YM5dJL>-Uy*r+2>FWNV#nx^9%xHyv zQT2Rn&C@%8%ro0Yhl`^7-R*UZxQzHec$l0uLeiZg3KQ}=g`dw!x^%okyYndk!h~b) zQCTHumdDd2Xjb7ya%WVqZ}+okW>j!Xi4YJs{^+^5j~L^H{8`2i*Va6-G&}rtfIYpU z#_zwmb>U~CVfsbY8`f{yvU6m*E>)bBNvKb#+4mi9X3%S8&}+rhUdNbsKal||X+^@o zlM*A03=JSt6_T8ij#RDXVj6PAG(4_u?A@(QSC^2QDkU{l%EA3_ z(eHDhnNfkQvk}SZPLx?0`1-s@PPl!?FGeXgf4TIw$1CF=?ixts(Pk-mX%Y1YJ%QTc zaIkyAfG$mBrStUfl$PpCe)IBc@%r-WHhp<@5rFB9?Pu31COBDvff1LCu(R&G7j<XruFdFLzfI#={)`2rKS3fWu^McCZmb< zo3`-UmQC{jOb2TToi@Zql|-LlLKXoe8G=6wch@1B7JIB%ro_|!=0u`hun2Gp;LMpX zfG(Yj*}M;r*M_;h9ujrr&Jf73t+SEQh=sCQI)E(TPpy5Pk(^BFPT<=g16)RhR=I(* zT)?Mt`c+pN?k$>A^33UkDbpRUeoiM$L76c`cxV)xnrpRgvr$^5szAt zbk(!}y?5v{e<=JS1I(Q{jlt0*7M2!s^msk}Jv%7T43MihMfzx%zkb+E`$-2=#i`8A z$w)|oqQUU+6|z)Ovwtw$ecr}OBBk1EesO1++)7TSh~Ih3h@>kC_Z)rS?XtdqNgAe^ zp?%`cZ{7*O^S>1Ouhx#P=zeR54Og!V0F_#aO0A?Y(ZjXH>gX{>U~aJz{$%7xs}u4j zu3wyO9O^==yD48#p9u-auIfq8;8e3 zeTPGMc3JwDY`)+j5=HG*`8ibOD=m+|YkXEpIN*=a0Gzb6?&BwJEsHaKlOG{DmIQoK zu(aCi>UY;+Jk&Iizm?CAtwH5$NJ_qW@^i++Ff1!JL>650NTbuYwHur>PK3gf|dcTy=5`iP)rlHn+`Xjn5Jasp2jFxE0$F7 z*j?4Ezq&Mfe6CU`E^2ZVRL#@JTx+t10c==M%mY`K^5E6NJ?lH1=w?;{T(|Q22d~o= zFJ>}uKzFOD?y-yZVIq+zf6>wn3o@OO7Z+^RWZWEsDq4d61m^Wrz~` zar8JCWt7y^DYyqi9BDp^rm%noSFhlnuT5v=(&;F~5bSlcI!{5dGznuzCx2}|N`|7G zfx$4R#!@&nmcno(jAw9|$Z3#FiD&P@BdlCHmpiVn;;6~Yi=EYcYr~hBk{Drc%K!<= z>nW^UPGb68+#bzPkLj5$K;)tTOH546kY!|SmStoxYvv4sp^3ufsi83afdKu1AU3-L zQF0=I{(dA=r=r$qn30}Hd6iZVH^$*h0H&K4p6{rcgJL#}=kgv<9!_onR zeikiVLS|ML4SV)6U6F<^KMP%c763na>92x@$)^hSwowVmDKbXFe#9~@r$U0ZFU?o* z{j2r-@jxp8D=YP^tkmg))jVJ9AR~%7I3$V&l5Cs5KhF98TJ3{98S5?=@oX>WSrBT^~IW zMOUCZXIooKD@C(}TyfWXt?YcSMHuw*SvSd5P$pds>gVupV;(SeV2$K9SQmtXlcqx*a<)tXx5>#YSn# zxp}G0?qJ{k1Ei-5L{&9i!@{b?6i1vq^>S?#G}kfV-ln}1^{WnxgM6I|OS>IW#1eB| zbBmx6Pd@r%?tA1RUU~M#=)RT9XPxsLA+Hs2hV}=3Ge1^kX*Z6J_%fH~D^Bd`aLwG) z;d*@iLVXNqPj%#7aO@sOQ^&>Ul8K_?J2v0Za=7s@o?Zu4LNx%J)yimOi24IYHms}0 zcG5{`D2&tLM5$7a|K|#HqOp-JufD?FbEM2#aLvS<6bWy)s-%Y8>{(bN)(K5?+OgZs zteC0c7d2HB|KwFR-c-XYKYxmX)2ip{sGcWi@_oN)iVGsjgRgz9-w%}XJ%F8G$F2w0@VQg%qw4#Etg%x;@ z3R%YXKR!?X3=R8__tPJ8qscC&Kh(!qY7#D|ozQ>~Q3C-F9qxWMEuMoeb1Hw>S;y*| z|BZKE`W;6P?B~t@{1wxcN*as;-LcpP`eESd^9|$FNM!pld*4bxUVFqs?GX#7a@NG1 z0Sh1!iJ@I%CyzY;?bD+pr!S6&MZ&GWdgl2$z#vXZMx)hI|9%~sJS{eR4^;~%!hF-g zrs)4<4FhO8(8zNyJj>HReSn?2Cu;arB{kGHZyoPn=Hu!SsDOT61uJH1*mc}S@lRf5 z#Y_#hb~F3l7V_1qYgW@>Y~rck{)RW7-9m%W2>3s;8W9`{w*xb4k96pOO~5y+ZZ=$K zI7IPtVkqj;~F-=R7pBsub;B=GSVgKC{;@K?G~b# zQmsa*R`czDStdB|-Su>I+GzKVP?EotscAwG36G80lTXo$RjaDNbZ`eQm}USKEi>ip66b;&_%+DN*V&@=-% zGWBWe2V0v$KF1Dg)7E<;gGWa$sU9ZHl(VN3C4@{MNC}*RHlayY21kfeymq3ue>B zdBtx4YtO9vBBDb*c4PUcPQJr~VOMxCyj`o)2CWuruhn8bqR3GoPLt#SSS{^Q;8Idj zNJ&ZIMCXal#CR%OExsQW7i2sF@aDT#6sdxra1D(RCV~D_0tc#h_=!Xyd5VOQ;ovw2 zoOp&8ZZt4mspgq?_tQQ;e^xZUzephi;P;1HsVFMUs3i8XVyY(Hu}w;*`!n!7e0X>JByIIq=6r6q+b>Do3&G}(UB?>$j};R^hx z6Su3U$2|dH&x&yxGKEO^)cA5Dkbe&F<7SyFNx>EfM@a>R$OH~f0*LDRBUhwG;EqtqNEkG70hyvuyx9W7ib*_QyL60e`+$dmL5bve7pxyVi2Ey7?1BXRXPQSErNxt zEH7hac^P;A@)e3dXr@%BVU|oBQ-c{(uZcSl0&_*$AwIF7qc3!8ewLVS|0%YbU9^sC*hzPYcJG9iBuW&dh!O~gM+I`+ z-N}5NhHh^^+YTP3&)bhOV=BrFA$QD5ncz*&9fi=TF!GEn7A;sJ4DfUu{XR#kJVSlR z<8!p1l_RUd;qXSF@sPv+9U$~sYuMEBNbCQ&1E0P@NJ(l671R_?BI04FwYaFYxT2eU z{$XTN0f-(yQ4IqyPFgP2X|S9%S-mj77;}d}%!~4iC+|8Z2lD&Lnc^B~# zKw7tK{+xBo=D)pe+5D;2G_7Su>6HsE1lo$(ia9Iw0!YQgCc5DvxTZkCJMAtu?KE-X zM2NgRaTK&OY5RPgCI+}O;K{R#(M_G$cI}F_v{_o%{_Z#t9tmRWXhf4=apEH$ulHgG z|A~2+C{6mMN3PUwxcADrw*sPf+J(rncEK!w{`>#1?V;Vr%>2+Wf3r{r6=Wp4;uJ9N zrTs#*6T5fETsKp-6unA;UL^op^KvW;P|ui&>EQn8x@wvVhc}t@6yX-i+)@e)=JNIq zVK#N$Be&7e?&8TELN%gr<{})Hy4DU;?X15~pZa5FMu^g+EY&JDeE%x_5B0U9@HS>>?JVjmB1Chv2@~g|}UzR^dylz@JtT-QVL7=DC?1F4mXp zu|9e?+DD$7h^7bkqc5+FE=y8R;DU=L0rq6AiH1q$tu7E!pAJ(kpDAD! zxr&O-OZ02I0>ifhQ-8SI#2%{)X^!9*s&xXR-+gR<%z5ukBG!v@6};3bJp9)dmUG1J z;Dj=Ey3;KhC$Ak8wBfabCQ1vmY`I|twZ|+}&(`ty;jSoX`tnMA_H#L9Tl*0TbtRZB z%`sq|MIp+=;qbvv3)uOhq@*HOaZ^RE;#o(3X!Qrqfas+rD|s?8c``9qLqx5` zPrEnF^~D+NK4zw~&qHUQhwk7hZ2ci@{UPeRTyz9RqF@1dQc7cP)^+p^)|cxsIb0|t zVus@rqF@22YrcWYaT3$P{kR-HKZj|Znm~(UD_Qk4tsFh(wO?15^GoAbP zwerex0NR0TfNzQMk^uD%^?0V?M4Kf?tB_-Lc}Pg`0PHY*Xxuzr zufH_Fv{}+Q);|A{lDwRA0E-T;KLDAAsCKO>bYT>2q{|h+<_ciz3o`#pH8?sav`m^3 zLYeMCDH*RW^t_1kwD3WKbF7L41oIme3&BK@sbOxWaL<>IJ1FdWehgqwlc_Kq?y+2G z`cm=2nxjb}m);f>&ex;|7(s+}d?t}LOHM+92Zd4z&~7p|Rl9n6EEfydM0ZG?({S4@ z+L*6oMJH0u%J2n1o7!y{EjBb7VSR4NT;`U{<+ewkV~s%@J$|lyQZ=^A#fj{DV@Dfm ziJcadcMSpGFpd+0q)U?sGD4_p`zhDn+m+!6z6)kxaq$VsX^J0<(v{y8NrZ;5a=c(> zH48jYtyQ6zrUq!Q+rD)*V7_Ep;qv&`Z`)=*Xm0alPbAOhnZcveP^!~#+o~#_`n|xh znwy*9tHS>6byi+@%)s_KD@|Q4j9n91R$~5OYoCJfVi?vIe4HMXMLNYmR&z zSOBNTPLGCzJr77#Wk2(8iu4Td96}2#YbcXBlJ!;FR@crSg-2cFuS*R7KI$(d&>Zl&XB-7cQq` z<{6wXs*Z4;ZI8FLd02C8A%#Wqk36wdr-?~~0ZK|rq8bM9!efHJo2+4S_57G0fO4)7 z9h-i)5y>RYiuM}2wja6FsOI-N+QxsqK%2|y*f|L-KDCAcq^HH-0Nka{NnR?=nTU8k z&oGJo6IQH{h#5{5Bathxn+3Lh!`=6@^UrT$X=`QE{SRZv6LhM<*hYiVOv8zoz8}f> zP^blmZ#u9Q!z~R29JNSP0!>&%EwAl(vD{=a9^!K#7fim>)8eZ}!pWu5jHLB`?}#3d z=oAxC(-jOM9t)u=oFJnXn;l(IF_yOR-e;nWMe_vOv#7KX(gh3Hw#SFLD@^jZmFX+j zQuq2}7;c&PLO0;3MLpPr$zr_SWHJ7q&plu<(K1n_0B#IN!nZ5Z#d^i~lz{Q?LkW5W zvl|jg&k8HDvz&?$H4AeE%^Mt*;<5|iD%8b@B(n%OY6&`oWVu3rEBb;m9{%N~DZudm zG+>{&9u|&-UBEAa-vZaUf}sZhy?89PNI6Nn)&qY5`p$PfbC(c))oP+98BM8F)lrjV zunAz0&xw4hdHSXEEB{lLp0a3iq#1%Sv&nR?r_Z$)K%1Liq|Md+RGX`tVePWawfjSO zdTq$Fg;_o$!^yExI9X6xdA1HuuLZTY(QNXBmb->VY?nP?7c1J_{JWB-D!(Pq))aVp zZFqWZNMyS60_N$pybSayN1W{@@8GZgztFHt5qY*|i9B2LAD&)Y5m2Dh6{C~g>^6{GJShPlhkd`kbv|rq;xKhNwPZezKh!+!7#&DI zkPLZyM-v#_w^`WTyMZOyciOud+nwR7Rv6NH@%@JOb<7!7;1ks86Ff2pb27|thr<59 zI)m@#qk3I31WLxz@4bqDc@+~&x<# zS=l$I2Va}}giIMEnbRtVV0zpH|J?t~weq_8Lgr!g*4})2XZm$A(OX-&koewT8(nKb zo;IWmWHM&GPrqBSolz9NT9;{aNh&5Wzi~7z=`EbnEUh6kUJJe%pT-oIoAZ*z6-{s( z@=Ipth|b=1PcR$8iTkm?dJ0*HP zOWtneD}Vk<^3IO=SXkNGO$eUh>qNpS~M_Y_0Byl z%z{)nA^}t`<6^Q$D`zXF>$bQrVOw=VfpiC-bxnQ-@9Ed|g<1mHG^{kYmfvYHf` zpPXOkXr2&#E%dfA!ebROQQ4pKmSC zTzbA-iS{;MWiIvo{Hd@sXt=a9ks)E!*Zj7&0(X9v6;+L>v8(P~qsqd%EI(5qS@9u$odgfAJM3}v`j(S$hRI5%C%CK`w9#B?1!q-Tdu7W%Gx&3y1dN6 zisws=+Rb_dCp}?llDrZ5QKYQv#RerFFLpPC4+*DEn{l&?7&r03C?8>wd4AI*!yD~r z4YK2M{&7o6G$MPasGkl_f3!3IsMX;rsY>v2#6&LArJH=wQD&dT z?}fisb2kIeATeKQ)Ci-GehstKxHtWjAFq69vinI(JxOaXFE**wKGex^6>^kg6V~L@ zfM!yZ?a-e2?z^ITzJ_58`OsGMtX>`tMicvd8`#_CDZN_JQ@8xdSTHa~MvyhLuJQu6 z@BS!QEbhG}O)z<$CwS-zI`7jSD^~t2jOthP%=FYcCB4A0jvklm524o2T1RCaUDJnz z7=felR%^S%y7ATwO-BlvY7CHF zZSeNM6O$tjI=I7te5CPb(2zrQD6XB`Nyq#g`s=fNQI`8D-F%~WF^8=)v&`kzyNYS` z;>`CKwa@jDFv^EH*rtG2OG-f)Y8+dZ`c!h+%&IB`p9UI^8jH!G zvw!6$p2_ud0)Zpo;d$}Gn&bAb3@)0pez`r8+XxE|HldOirz(ORJXw5Cm|!j`fE?s7 zm-V)=DmHe!3(96=xn58>B6(3?)vd}sg&aj#9#x8b(E#MU6)C|(VaPu0hL_ifKOUz@ ztqnK6t<#vjPGE;K-T&EpI|0$0Hy;D-?&9?;4xyw~`)VH}ue%cFcCH;+9)3PsiN|?O zPdm&OD@VZcN)8|gi;{U~N$6sp&EHw%7{>^thxo`Ks6^Gj)S30Fn#wNzk*R{^7dv1FTm9cPQwpTou%y3tF}gg{;BOR!3_jE-Q5 zj0!~cS06L(C@oN^CF;U za79lz14n-Zsy%hy|D5a)^F3@4LtRVQVBsJ)KqqXiiW$I+5T8+-#g8iovk0A`FN$V4 z@?6$E8)texRzoF&DBq&do%FLjY3n>zkj{n2uZU!(q>Z%wi*Rp=({!61z;d1zxiE{R zSHZ(S?n~a6P_7{Zr&@KHGc~}0@hg-!KQ`>_rEU!d776UrkyWZ_FQ~JskY)}fm)X;3 z)K)Uy;%-SeD;s%=))RJAPrZ^ljgA^_!RODVPlG5arXdh&pn${G?Oqp&%+3k~j+WA? z$I*z;!;Ae*jFfOPmVh||iXUK~qMyE`ME7h?kH~hDkBp`EW1P>QF*bZ-qsL~1h&BHc z?y`WsuuK6Ksr+C-QwoSA{fHn$&fEX|mkU>Y*oo+jM36m%A%XxyFh-TkXaZDjFtA3T zMUnt4uGAiy#gWl`BUObEX+5I^vgyTdQ+5>JJ8p4HTVZLnN3X!ZUe_fb|FEK^h4M1r z)s`@>iZePId=QP!F^przv?AL=Ffh_Amyk2t%eo#`Sc03H&?VcIz@pq*cT=*!q$rL) zw1R(`q5aWKRgC;il4XJje}{rrYBg;vI*L3ezNVrt*?YCNskw2ioGG9fHgb0vdJI!g z_|w+r;|+(wKx_0K?oVp~rp&F}NttOl8otqTIHLtyV%?L|H1aNu0WuWTa|814>6;y#0uZ% zXVvFmHGI3|z1;}y>HAtETpkeaCqvI`HvX)4f+#g8-`%Sp3prmP#IZf(yznHhc?_$N z?2t~k!?$!Bpo-YSRi~h)QAeXU+z^2lJ3TYNhKU{*ES&+j`{1?x*&aniPBSWfWY~;s zun(3ST6~FrrD)nAApw4&@pISeQDG}b+A0Ylbm!Vay>6Ev~KRQ zR5;5Fl0G&}iOOobSgZ5A)0ELu3h}U~%I79G#qMhu{rXA>MepYnU}guJjvSw|fRU(Z z6=uyqepP&1pc;jtf;Q9mTAnjwXx`g3GxjxJTe4GNxNs$nIrj`9OOpZ0nFT|=v?{hG z3Ydoa325lfSLp;_;_cb965q<9vZ*$2ZG|yYJl0|+{H?a)(D{;_Rr$ebnMhp18opGm zalR5JYJlY~!*&;BW>-FMSsVI1!JN8I}%&u_gGuNTe zfh~=6wVzp^u33OZH7qI1uIFRq4ClzADQohH#XtE_Fx>PN;ySa~xV$4`?i>nAZP?P| zUx|E3#mpVkgU)c1;s}NE9578;TOv9EBoJ41kS&j^$$QX7xqz%Pax)*cS25bNFDc$3 zVy3M@7nGngNBtaQ!poKpaQ^ET*o0NH9)xpj`A^djD{5M4vVmXN(nHT<`p=%3zQ!NA z^ff@fOW+hDpO6Eu_@##eE~Mnt_%0J*l02m8!#~FKyk5mF@a;!n|CD^y$$@Wu>4rO1 zi$SSG27D-g0*P^@PAH^!x~0sASJh`V$Hl^6fwUb#>;&b_^B`nd#IK-d zu}#9uvrE4d8K@EYmHb>fM1GPDKpXV+D2U9x*p7*?ah9INmeUWr=EQef?QO{9BG^pD zttT>A0mV5SP(lpOR;E6wiBQ(8*TbTr|M?+1?G;4RQUQ*j=8yk9ke>c$`>%B4Ft0b= z#Ci)Mj@)g_gDMxsm`%z*LIta^dRf=Z=2yxBfgisr3#8KryBlQSsmp>Cc-WOR+tW37 zY+9!VE)Qh%o)+}$#i048J;xkml4muXfdMgU_2i`*b?<0;hiK$MjoWc33?_mxZ`E3c z!?I+|`e{vi5ig6Phr17A;hIP68Pbas)NPVq*LPTo@)yyq@=8kAp_YNlJJZ3n2mc;TUHa3o00DCGLz%=uRmHo*<255WjBMRbn~0&fX}Hj$l8%?(yA=O zh;@j>Dr-WN`y^Vw(C_FG=Et!^CEQ<{o!*zg8!^_IE=blX_)rWuVo$Q!O|csNZ*37! z?nO#CO8RTISm;k0_HijnqiE%Lfr&UKi}5$PpZ5lam!E~{OwBcFOcJ;^_{0<40N&2G zkBL>oF|%fG=;$Z~9Q=&8w1!!5_G8sf$TaB$%$;W)OWiZ#?f!K4&5Zj z7)-EWsPA)ljJwb0NV^WY9i`*d5>QJ>x}Kmhsg`R6rxzgBuvGEk7w($QP&|oDiN8vj zt01{C$aT$3F(^ng$51~bWQ$3$_C*Jm9cf$_BL=9lzZ9UIQK(a58q9O)C4ckcbrea9 zhKlTavy_d~*sXK6Sh7ALd8{C}h$`3D&H_KnBH<1DIR&Yv$Yl3XU~VM+5gbTvBaI<0 zT%<9Y8Oa!Jnost0Hab-$J7qgkSo7>8Ay!7|NB@k5zgfwC8|KZw%L~Rc*&t*awMD(0H?q@e`G0 z4N!qwJm1$sUT+v0AlXZ1AHgYm;Vrx>sBd%UMJ(X80^`go4##XsiylZ18PP(mUu!2~ z3Y|yDn4E%Os|skug!Emaq0K5e@+G$a6#}x+Ex8N%d)$}rn@`ZQ*e}AC-yOEZM@jLc z))4zmnRi;*9}3E*VJokW#*i@1f1Ma+viGAo_NDR-Zyu$woR3Q$LJkw^*DJ4+hTTd{ z3JwT}fx);9`;P6HCC?C>!h1=QKxOhge$`2edUsoja$UP(ijq7tBAX%|=iNXG zQ^78!UhD`)H3?ztHzpQzbjv8I$uxq3gJNeOq6D1IU$IBPna#SNP;E)CD}XAHrFOWH zPM;Eyz;l}}fsJkk2f-x1RTci}17mFH?S^aY_*~}byh|L2n)nt9bZxy;tAL`Q*k;StVJlNG;;AW*MQJD?;4P50=)WNjmE>dh z*8KLB0tq3#6}e?ifw^=#$PHaLlGZM)dVx#8nT|cB(HtF6ED1zbP zxZsVTlxF{sOjR$|A`rP+Qz#%%Kjy?;GGbHuX_i@wp{Uzn27@>TeI}l6b%=o!AAv&A zG1$rgRus)Dy*+4FG{xs5TSkwHd)nsj&icH^k!)v&7wZZeLAvjAcUW0*$bEpl6skxJji(y^AMpX+izhc^2~d@2NAWoavQsY5;7rty;@RVX?N94(KKpHKmMDdZ}ug%y?TNqK<>#UHq! zbFHrLL$Ki^o@py~(e55RD>94VFO12X7n*X-s)}Oa!1s}(Ihd;C>8*;wJy06!XQrTM z(CZi8`H-X5yMWZ%Il!~Z(0pGVM2RgnZOe9AD%@E`7P6dG;cIbG*pPc^qLT4+9}ehvys%_ zWKrQQ477ofDB-NPHtiL_C7=IAgYZ6M=bTLI{L#ILn9dwv(B;(bw%! ztm!8%fFn5}I!R@!cR0CaT<7vn)39_MUn!A?XBY9?#bSwlAHg3hD%GG@F9PA@19pP# zgz;;0PgaYL?Hpf;BxY{>!aDEk5i%GvOk*6DS!$)ON+?lge*T5uE=;-~_1jK8N}}jh z7@@Q~@K7U^L%YZ-Nxrp2X=2MX?L>`zMua-V%Rz>)-(hnO{X907YUq_%Y?OW3u$Ju) z@%F&&xGEIcEQS>9fhXi5nK-=2`3pwVCUFYst!Z@Vp9CTKjg%$~=lJZXWiI)aldF-q zwnSE=@bFgRFbZPfM*W^E-z{Sv#kHjrKI{cq9DL8&uVqiX&=J?)>KmjGTIDpTvJS;~ zXuzJJ6zwY;P3$?c%jC97bB@uslprw$+b!q0%k~rLR}|ZPd0lMj^~>@HeIgq%3ic)f zX5Q2x#>|B#ZI^7&*e@N8u-wft+R3JV4xRSmVX)Lp7_uT+a)mnCx!Ybt6f*Wk(Obu4 zgb~zb?nYTEvTzKV6A+HklQI%9)OT@&iv(uWjDMiNhTK^$OU*L~{5Tk|{GVZ5k zSVh=ISmDp)RXAxYgErdBH7l1AazH(c3o&DMallBv)eL%1)eOzb+ys?RnHT-DGD(eQ zb{a9;Kod^0h0m!Pp*;i!WAJmHBO%yEof*}KX34P`mq4-A74*j3Wf_w7*PLD`Nqk?< zT^*%GP2#F8uDRr3EnDdC$^)aPB%8j5Bz+L={!rwjMMfsBvS9NPKNf-BN2lHObDoWFU5^a4Q@yCjzy@Ca%PBg zEjPm|!*{r1iLCa-CjqJJGCVn5n+JODA$TrnF9wNzCA>!wC(`KvYmttIr_kjj%v)W= zPbqZoYD*s`g(_t10itI{P}Ffk^r{IsV|B^-b_+_lsy>3Yteuq{k%-oj%3O2EaH<7& zA{+9^j>Wl=&D?D`LH?K_!CsvWj@1Th8uDlabIPk_Ves1C3UQ))th*Bg$$ZY0)p0C! z_NX9`8i{(TF2#y(x6Fscr^Ccn%Ws~56V3Q8kcH+q62uZlKZi@zSUERuS6hkV;tpbz zD5>oXS{BX-SdyD8yCdhSqFv^WQBKW)*mGYP0Z>^OIX-2keL~^|!=~uQy<9RdRxgvW zc{$55FN#jSRGBNG7=PRV*Sv@v8JSv7M7P{m0dO$z0U-ji?SY$_@Q0U&K z){I4i#wcUG_*945+7c7_eariSo$leWLgDn=QALKL1zOcn@vu8m;rHG19OJ6X3U^m_yik+`j%DRu^L#?y?lc5 z+8+knj)i|qo?qx&zki@gJ}nGMDUl>o!2pMZT1>rLx-`3ck>ap?A;?j}kbQ>F)T#7P zDnI1!;HX!b+1WbiWVf6E@Bz8pOA@Vi$T}ViXz0yg7nln;7qwQ7M~C-XI1eUdRF^~Y z!Trf4IQm*oUKd48iNc$x)kW>WwD~R8nICWGRw`TSB90}KN=WZ|SUNWGKKFf*iDhx> zy>p#d-~QFrW)}Up5^DLsE`i#+!K{8Sfr`fs;PmsLBR#0i5}+I5m{p!1b0?p^?o1_o z){4zM?W>!_n(f=~R!n?pP@Cnj0UCOr>F&)Fl*ZU`bN@k^)UriG{|3OvLcE)KBliFR zAVk{B%4#Xg%Km-9^)W|YP^!4nkQDWZ`Ll9)w(u`n!}PLVO>}HKRr)M4QCjTqPZl1> zWCHd|I;PYp%i$5UFZ9vKY|Us)QKZk2h8IVaXXRCXn(NpR><+j~ZhQ<_??L+co=x|C zfxFZq2Sd6FX2;JO{6KkhX>4G0?66vp2J!qkwfXh=*Y8{d&E3=YpxeywaX_Jz*aU0{ zxItI20f$Z94Qm@@5$|~J@J4Vc{T%c9urEBt6mu`e?_kaUZCKl~cwxkYthuR}P?KPk zM87mJWC|MfjnuZq#P&N~z=dt8Pnc@F7F0EL&HR#X&nJtgZ?K6v5fIUXoD z)s(M;&0^0;3Wtqx6z>;WUzgyEbRriW5sb^;m8(&7{B;x)oV8yPtzVWf@O@Dm;7NT; z$Tkwnt}yry0-i=3Q&S%SKfLyJ1WV0MYo#ROqGN8-uxtL?3Nic+l-s5CjnzAmAVAZC z{w=DA2(p4|M$hTjQ!O9YhXVWSYb5R_kA$%Ssg%csaZ3Bg1#lyEHL#VdGZ)0#)e_3( z>+JR@3jjb&($@`QBKy&ZNNHm3V(xm{3H&vgTdUu+}u7sK3qQhT&^Cr+`J$Vh?|Fx zn~#t4(Sy^|&jkkY<#h36_zm$Fh8)z>%HvVX_O32;zcC?}u3j*4An?&n_xJueyQ!=H z1K!2+Z!A3W!R-riEyatpoLR_42TS%6mgy zU=05XVQuw~csDN(r$6ObTX933pw5r3o{w31|1G7WvbxqkB7Rd~Ywzs#C+d;xfAfUd z+x(NPf9u@4wgn$NAAqT^%gvYUTC2d&+X+z~A}7)~;6e*5JQ( ztsvHxmLL!(1Z2&_DF70Ja9Z++@NfzX2na*0_^mDZcr5<~O4-E|263^1{)T!4=dypq z5det@^IGuj&Y17&RmR&e!jhCB|Zy)(oX z%I)T2`^WH`aImzNvN({Bi|3y$T22s{&0~N#P|e=O%lDrKJ$q-UE)4RUOS@ zFbE_l4B`U`{?o|->f!mQ#NU{_JY4*L;r<>L@MAHL#6o`S^bz1s#A7XBSq~@#=IWv6 z>gps8{M{wG-;sahO(*u(peWgUK6?25R{Y;IuM2hm>(gI{fRp_n6CK?j*@7Wfe%VmUM-2Q&&i_@{|2MiY|9Qa! zb$L7s@_D?RA@jA(e7qDwwNzD<13dhG7WGu7Kek}FDH(eL09Zu7Hv~X#9{FP<8cbPT z9_W$Dqs>}bPFl}*^-G?go8EVte#vo{26dsAsrX3Bp>8O}+i5H>Nf6j| z>g7KhbLcPRw1!KGuC9K~Ui!4P0@mMkR>b|xyQ)KsH%DjK$cS&*jz}LD85!Eq+@&n^ z>etsG*Uf;gS4asE^()bDuQmf*H`luFPp*IUa3C|%Az+MM8-{oKeQA=OI#4x7d;hWD zWF4ytNgLc1LArocXCFbl@*EnF&Me?5Os1iG5EX&FLb~64_Wir1n{Y2Ddbfm@6{-p2on=^7?gKJ}$uX#W>J&ue>w+ETiMTE@9?H@fWpz z#{B~hM0T~=CT~1vOy$rNxiFz4!AWZb-HcY+ES8}~OlMmZQmK>=RC`6pq#gv3OtL@R zJ|w?lZ*C@_-f#L+6`DlaPt2nX7}U)KsULJYdvJIsd5FoAQAeYOZnKaX5mX~iXyYz^ z&e*MfGTY>jkN9n}-h{mUbN z8^qS{jqId2u!u^N7%_Pq!^HlLryu2u*OOcW44eSs6aqw*%qz;HMjS#5h%!DkebHd_ z_?sjfR|_^R%{Q4APS-dBk31Zm;A<7X96QmQto~kB!n?_0FHfDlJ3!4&d7#Qsnz$;o z73$?JB?p!(!@#!XY!{nk^{!C7tVL*EY^O~FOo2HEXd0hVWFa4rqOipj40}v z>A!lDiz*I6wk6p_z7;1^B@@{VAdwgu5k@|ZtNxHYfvsSa_2&GX0gs}g%li0<5oQ3D zhluY>)5GK4TiuDt`-A2*YZp+-4U7KJ0>b$qnI`4N&@EC<<%lVY>w(+ea{TLBBF@i^ zj)zxha0#@ER_paU1NZX-a=ZGaG~Jd)jc$}W-C|brE5&IFoA%x~6Ng^-n?!0r^u0<` z&>=$o51~=SH!9~pR)<{uZRfxbSW1O}DiC1dqJEGIMCh$clX-VQnLG%pxMqTUnCedb6(1r|I@HY)H{YLb} zpKW|;xhM~2?pM>+$vqN9DV9wLmR=NS$rQ7WyILK-i}9$b%dJ_aXCtc9E$Yzv#_64_ zWFr93&rr!=Gz&+Dz*<+)Y1k;KsDZQ+{@}oSYL1D{oJ8a4MxdimK)kokO;bsb@R(_j zhH8Q=aT`7%*833?jpf6Sm_djX1r^_`FA0SWsr>ZXq7j00F4(I~w45oX(ET)pauj$*P8;Ss~3hEg`R z*LvmLn(lhh2(kFT$z6PhX1~gvQnQf(GWlwzeuv<21N=^dS84v(8R;2||PMO6eK&!4hR^N*=G0p3N2EpviL^ zcqSYiEXtiJL%arb6zjy#bVD zUY7y4C9Z&|mWk)?eYW5It#EB9I2)aq-UgU9h2%jVp8NuGS!H2|X0yZ0htDOvZ&P;% z(u%`$RC9vRzV%E6rDi5{0HdsGA;Yx$MyhWTmUQF2^;Ha>lty@`e57gzUmq!u?E`OnO1?hfTA0(mlCc0-sFR&X3Flf5LgrLJ%Izg$_3#DbIHyCDZLjfpi z^>0qVwl%`j-%{tP=)MXi)4lPhc`$o6_Fma>Gf=pk-TFjYON-rA$Nep=+k`vpcG?=*(_PD@2HW<$cn7g&q@~pReIr*J#B4Vs=){In> zgJSiR+5_V^N3lIrl*aE23>-d*zLJw0Q0NsG`w}a-uv7Ef8wrTtMzVT%>;!%3P{YSk zbB=J|;DBw0#JjVszCF~IpC-GGrN6Kxr@Axc81a6PP3zto5JAT0zT2^d9t8D7?6cO; zp1z|s$H)1`M1a}&O6M%I`}jKLmjLx$eFYT2F4>u>oG$|FG&9sCb2d zpjJPxXY>`TT-9PWGq6~>bEZ$VIqdLh;EAY1h&ieBl;bv|3VZ?wD^@dJFi&@0OLJ1~ zOzoq2*{1p&7-c6IJx8{A#V~dB1JQRiisD7K?Op4Z5{L~`3n5L{qgoPk8Qm;57o1!~ zm34WXNjorFo5ENbnmQvFb*uS`!g5NAyxI3IG)>;{gP2~J)MO6;^WfWMiF$l2&&}f| z4(?A@irjDgJ=Kh`qinyi=&eo<5tS``n5^a4aVfBkGJj>=2lx#0zkWCELg*VK!G4IJ z%o7~U_V{Hu%cyl>(H}!0b+h`5pozROC@5HJ=+Zu_R{xW@VQt#`v(%V_CU)A?V1qYT z=PFV|=RNVn<(KeWtgXokDU(@8dp3dAA+#1{Z*Z7a)h0%@)QJPKv`Zxu0h5k G{C@z-2s91= diff --git a/WebHostLib/static/static/icons/sc2/hyperflightrotors.png b/WebHostLib/static/static/icons/sc2/hyperflightrotors.png deleted file mode 100644 index 3753258458769357ecd299f44b44dc9a3be45e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14285 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 diff --git a/WebHostLib/static/static/icons/sc2/hyperfluxor.png b/WebHostLib/static/static/icons/sc2/hyperfluxor.png deleted file mode 100644 index cdd95bb515bef7d712352f33e40f92aca5fbb871..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9261 zcmV+|B+}c7P)EX>4Tx04R}tkv&MmKpe$iTct%Rg6&YmAwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRF*B8G^>Onpui)9@T$_we!cF2S?B&;2?2m4e9tpFljzbi*RvAfDc| zbk6(4QC5}|;&b9LgDyz?$aUG}H_j!8{X8>jWHa-`QDULg#c~(3vY`@B5yur(qkMnP zWrgz=XSG^q?R)YUh6~!tGS_JiBZWmQL4*JqbyQG=g#@h{DJC+spY-q#Iew8`GPx>X zF8Us`a&w{+~VS=TQGH?_+HiV-gU%5E8e7Hx0rAka`$0kLmx%O0HwU zc=EGN>GKwgCBTx#(uZXr*iCRun;h#8?iAu=sW)ZJvH`Pgnkgnu6$x1+F4#USc?@w~ zoQuWBkO5L+G?M_E0TT!ESewEa|LSbR98p$3f5rwjYdx#gN6N2RIA(GY(I= z<2fAcBKHp43}rBQD@53>XKDFP>%e=8UV0 zMZF?agZU7?4e=`_#DmT9I-DU4XQFU6h2L#tIAb8(1x^k4XNXZSkbeV6%g;6sPBnNl z#F+F09tH;wLpdR%ff`^Zu+R3q)61M=1ZovoX4?U#;gKK!n~uyI_JWClGa8(cdXuht zlZKXwiBWMhe99u9Hoo4hC)W+$2LE*NN~1SF)E7s6H--1|H1zY3eGY=1Q0`R_yA1qu zqHs1EPfk6UTA;A8g>}0mFia!lJR4Fmq%$1@!V7j8ZM4{qVd&ep)Sw!y+qTrB0d#KKNBPC_rJ8O{!X?EzB*?szbx6vyI6 zd0K^Hmyw+;hFnap<5WU!1&{&nG`Wc*a`+J8X`B*+mKYBt`{h@|AcKrxB>oxTG=R+l zS+L!D=?eAeqdnHgCr&wuW5CsrPc~q}Zd^hE_)?ED384x$E8%2Q;EWQWbsE$tNigN= zX>l<1B}OYNx_{AgZLfr-+oA?5^{}ucdzKo`dFOZI%KHa9A=90qj0)VT;EvTz&dPf2 zfWn3U&do6nj&X2tho)RZ8m#&+;M9U0)Em@A+CJTtDm7Y4vZT$*qTFV1>f|*hsov!a z&^i;;XpV+y!OMIxZhoDvJ8=}1@P_at6Jeu_>zrmhlZxQxzh|z6PSY0s$^j#B{{g0 z)F3f=uHX@-LehM=U+}Or`xT8;YMcTzcqJZ2(L*HsGT`BnAX)ULV&XBfX$A6Je80lO zFJS<~G1!6YQq)eVq4p(k#;Q?z)vX61*stEx0O4Wrw(y`B(wzv-2nkb@6k|Iz;$?0# zI1@`S#EW*<<^-^h2(`kE`1<7>Qbi_uIyIAbKVoklfagBopwdRGD0 zVv3DDT5=`yImOHZ9Vlksp$t|Us&R=9AD@t*P@YAYIUwsUa=HQo2usR4dpxC41?1m^ zZ8sla+Hae&t9H_P3fL|UPge{W_~L=aRc=-;Vd_kfo3q)HtQZH!5hK_>$gfqm&+Gr$ zk`)y^A}px^P08*TD8^B%x9UYsEmYK05F$im}Up{_dW=Fq>gkZDzH`yt~s@WZEg#ArwXPKYQ>;@ zj8c~G9kn_&Mlt=HBg-YLcx2PyjEC_|#Ng1~*Db6*RPvn@EH+AOY)%cOG|0-ej%l)? z4OSIpjQm=7C0`xWn8$@3O5h;zG5963Xjx6~NlFbX(G!^R6m9m*OCF`{VN0x3j ze;fu&+^Rr-SO7b}30^*HH79c_r*0cBZ`2bl)b>Ky8DWs^mz{GP!J8@za7P$wCRR!I z^dbIF;Lp;9CZnub%w}#0u9Ozu8p1_G5|v0;!PWTtp_Y33=_9v7Ju9Y#dYRmpNrHQV zZcv&0PuQWxEGeUg=V1;uc7=qH9S}kqw81l{FJUrMIis~j{x+yLRxnz-0Do{mJT5#8 zwY9Z4jbKB|iA<-tX(BcwA({9%xML)QO@$_vpagUkV{9%WoHiwtp$O3Wx59UCCY%?) z2!mk<+sM99ay|VD4`}FC>fg$QKjO%`?ZB~%#vz~1{1ua52g!d1cdFo)sfTb6{O!~i z7)LX6HlHTswzKdeA&cQ*2sS~m8^V3iHQ2?}iW6}hhmer>aus8yG!Y(#ipfdh^R$#o ztI=G=l|uHc1$Tmkuzw-M=0fZ$@XuF8!jtf^De;!FFTyltV6p6eWgp?LlEhPR)QrN4 ztKOFpSa2F8RBb_Q7;cud1CU>bwf&H|39`>?fm|UT^yG|%eDKY=ymwuag)?6z><}*` zt2^XDex>f93%#>?n8jJ-$upX<+`ujTw&?)|7@+(zpI}pt>=Mm}F%1hxl7=%%@Xs9w zW`xp|5wd~FWRe_NQqKnreqTuM)hAtxhesQ&q<*f3EHCjeBi9eRB!Vy{;O~g1*&Nux zp<#bWgN1!ysxkT15^9N$$^x?s6g0cwvD4=>Z`E9`STmdFPG3>(Cz5gi17XuY-36 z?5o+&^hq-*qnv*FIF}1Zlj83@CeAr;FJU|6w?;-QaK5lpzVa(|*Nv(qqaiaZMeH(| zefc@;x_l?)R4|b#SS+usTS0zxNvTyz8v^kvr$M=03D>iEeXi^{YDsdkSf>Gk9gw;o zypth$v;MtILhSc^6O&>l9l!4z<9sD<_*q<${Dp1fUMJSN`v=$TLB;Bei_ z%P}=t5fnIDr{G@xEeY#IJjVe2Y~n3OF`BEmjx(9fWTuk1*ugtRxtoS%k#bZ@mEbf; z$T-#dTwTP`PGKe;9AXrsF__4kY{@+pgv2-m+q4u5B7TOa6-oofhC_SU(3(#T4YgwYPCK*me!W3~YLM z8_l0>V&#4Euim(3vaagG#7D;P@TsAWlR1?nWjGjmD!MqFJ0uw_r&Wb= zI#bfZD;U$MgzCS-{fXbwLpO_Az{{U~olRG-eCP8JXIPKvlv*dd!z{YO|d zbu|u#?QG?nEAC|QM_N)PB|{%zFOz5yWBDaiMWKbbikxvxGKV#SYE>`ukHcV2oo0aVC53-bv z^wYX4;I-1^>E2<)kBa?4PixK!#feZbXxVM682PhJ%vmv$CFiUm>=G}`t%#I|CH0FKGk!cZ z)ZySViqV|Qg)B+Dz{4&r_QxS;(VJG+_#8ZFI zgA!gUdJ+PIs@bJA`+AZ5ZByERs20jJe1n}0@hc$x2eGt?AK8#F@guuQMb)%iu_7-R z;h!xf&EC@nNxiX#*{__+^7Gb-;#n=FQ(@7MHvX2T*f=Vv#KmO>@8McL#F>}R=A-;G z36i|YN*?6LJoD8T$SzW<6F-v8n+mCa>uBKMuX+W{V-bb0{pvkgr7lin>|m$#SlyF! zLx*cHXCx#(CLWeusK$tui~uA{GkzX&xxE)l;$VLUUGXicq z{fjK&1u~CohVE5iAfu|S3%1Z7P(v0*4sy!`l49?bpNFSbbb@z+q3mBRB&F!Kead6J zhzDUy>NQW>?v4;yw?!qMcJ)RNx-W&+XSY)M6Xye-%Y$y?#$+{RglrwYc_t5HHdckMtBs|0yb13m#^BqB)6T12iKy;*1bJRGg)# z5kq%f2(b%Pck0$rgJ!7w34F8SJ6z1=^wG;+cC(*7oWmRrbBIZ_(0;~2@g!9+9F=EG zxn8RZ?mPbh9_2R-{ug*H!m$ce2~Wqf3iXXLeoKjh8y7tC)uTDTQE%7ffdcS+cy$LUyx*NwhGA2~1%sGdPp(`VO}2*(`!#ZxmkPZlNnve%Hv?xtovv zVIKK4Djw(rqOmGdJ7P4GETJ2Pgpeur4%*1_Y|#47(#Si;Fp3?#59~ld@aY3ga3|6@ zc?|tu>*ej-4ze!_U(=tOWnbeQaYhDF$g~GXKim?3lZaH3#0pjuffKlu0<1-vckQhUw|i zWS&{&q95DxVWMh0~bDG-fcJ88k5# z7mvdnWHAd^#!LJ;_Z#}ZE{ceE3fR6hzq#N6zQi{;z+Mt0sb>V=<7Zs`q4P=oSVAz^ z4P{?|Ez{chI-jHe^WdJWL^c)Op&2P2lwU6i&2|emJEJ1?!&E4iWlKVNxHGOMA>ovH zMg+W_SM6v2HT!95YGOPSnZP8baT*DdxXmt3vrCK^Ny><6i@u?1B=s~hs=|L8DWnw`(Qg{Uxv4u*70J?eBQ@AcC&*DDwxa({CC;?eD&PV z6FdUt{{m}HZ{uG6lgA!<9REDU*R)95!A6}^YZSQ1Efr`;-X=!LuT@XWYUswJDWBmR z%#_S_B?TYS4~YoacJ@AY&)J7J4eBfF8ATHfjHH%&DySq&2A>#ta%^Tj9v%bqv!A_e zV>2CXUF4R^&|BE9p{yb8P0?CVr>%2uz~5RPrG=9?k?FM2%5-LO4c9Y&&Xc@3=MA1> z8UMm<{QaxXVF$rKQxZwos-=+j0K&bRy{Bk@VuWPEfxEOubxKg(J$7kyOoJ6B28)__ zDCs==EJ7N~p|7fg-Qzo?hOCPkwYDElyt0K6jAGG!%Lw<$?uG{=Mr{&;bzzr0?~Db? z1qb6-N$r?j0KJVV=3o2-jWkh19qsIA6ph@@9r(n!lh5+fCsz>m$#jr^rffv6U2w~r zAymNz(crQ>5ppjIUb)R$r@BW}G}e@Bb9z`9=0pP_#cs1Jna1c&guBHs`PI>ohbfQ7 zyf?J9a_j9Eu>8Vh^nXLgq$+fvxLjO6+#?w2HmTUyDWPLCQk&WowPQm&xg#@VhDGNkY!UP^R3~2d2gpiS-#Q=Qw`Y{q6s5Ac*L0i z<5bJ~hArPYD@=#M=8O}MTN16Yr&n=R3C@*qwu?}5AuVVKc(vDVhB@V@8n@ac1HYjI02vgO$F~Y<76>K8G; zZV}#0@ZY0VfhS%NyseGfZ4$2WdE&i^55b8oC(_6mCNmX_rGb&eiDR+&c+^ry7oCiv ziCLV*au(BdsEcryfPSI#RnYh_y199+e;utU<*1KwCkmDh%V7WVr?0S(r&;%%Eo7e7 z=BajYoF<@EC7-g0=#eYwBKs0rVV`uVO?h;vAv^?juMo=g@1qf?f&$`L1*FFSXR$yS{c8bC=B_HW%_+gflr!YLvp!7oAfmDzcuWbnjH% z*-Xhv68#^iMmx+S<$CTo{hFZNqFNootCQcuz3>Lh*~>00mP)E|N|s*u*~2A9oQX`~ z{d}15G?Q<$8cYRqgY`__{?Kk--L)L|qL3R$-%R{!!`{w41RLbWyvfR^H0!vNMA|W) zG;PDqs7Y#EontL@n7xvtFeQgTNok|?0OU6)rX7a2Pu@aTqJv7RXka9x7)_2GSu$iu zW3lXD8=v9^9(AOn+nqnA=DIS<{{s@YNNt&2pgPxxNGfs1$s{%LXg3WdNA@`C2#i#SuY%-fA+F8a^utnu zUk`AbzbL2wkZS;j|pqA}15sPQ7^Y?h|&ho1OI1 zO+6z>G00dZu$YBZQb{9Clv7bWI}q%IV39~p!4knHr%Jpy@g>2r+-uVOz!ALkXM=yv z&>VGWgK14@Gnz$4iU*kl_%n63;sNnI|4hZ6I^kkgiDGqiEoFCf(RaIy2e{*o@-8Be z3J=PHy&0m?nriuf|7}V%ktHiK zQ7Z&{q4EJ$T>dB(Np_XIN9+RV`*H+K!FCxGuK12*_~EM+F};XRADbFIJ=?AIV^R$1 zjuqWL*eC*>DUszaK)04TGzeD-IgMXgV6bG`4 zrAEXNL%L(-#`g{ErLVk~*D}jEAwG?6x>&d8P4Ziy)!mLaOXczd(DYCxRaCS2Q+tYY zXJHrAJR;&_<}qRa`Bv~wgqo+puk{#QkUx&u3VT%8Xk6#l=`mwH+Gi?tra!LbMOQQ< zn+Y=PVkfh?h_XAPVO&B@>o)3XntEl`c}RRxdYSokQgmmYP*@l#cp7%fs(bhKkzEX% zc5R@G4uZW>{$v+I&pZ($ul&lT^ap)xzG06Dib=t)ihE%CbB#OINQL9$>4>zFk~7whP6w`>u!5dnWy!y#p4YEHPK0+R zq4Z%tq<#%echr%d-AVRk+3{e59=jPKJk6$ruB3h~Jx!+$-v0J(>GW)r2F$4E6I{ZT z{C(Av4E(#E*YpJ+6F0$S@4uAi?tg*YD+2n#7AXG)oOar2tbTMYso!Cai@1_MvQ-}J z689|_(Wy};tS4}7TF)a^3eMQ9r0jv^Su&5y&ZFmyier?1$=rOm7&84E=-AOo^SvYS zrs}Ysqebz6c7a@ZpQfKyQMbZS^@vcJS+|@@<@crdPaRD2=;xlK_mk0?&7cjEpMk5s zaTyEezret^^)%idh<^a8?~1YJ*|qe4OExNY>2Vm$_UQym;RuNy`?ERqrnt;axQ$YG z;%lQ<+il@N9jDYIfaIcf7bWKzZJ_Uy(HpCjdedO2dMMK7t%h-awS-jWN$BnAWh9Nn zYGZ^4;jPW<$h{)HfbJ^1>z3JYIeAcm}##!c)RX!=7Xy+6&;_a*5n z`4=3U=?~rc?v18(Ore|7qc>gnd=lDgB6+GmY|Qxn)rHH7NfN=($!YN`)ST z&_Ue7!FsIHhf(6qZMV0RyhV6Yuop}KVJ;FLGxNn8yWIW7?sj-k_4|7LeV^2=h4TZX zVBM|T$ULtEwNngJ`9nBxXCIlr2)FcRNFuXc$HDZS2I@(1xl_(0d<^MGx;938d7+@vLECk|!mefYydR)4MtC?h|;ke+%iq3eI@5#8aQj{DsOJ zW8_}U;$H&EPea#bI%ZH_qH@N>lPo$$pn@bZ!Bb}J^NF-=7>i) zHDHY%wl9%~jH~#W5#t4Ik{!p*9Zhmt86F;v9{mpp^mm7S>}AK&U2Od2F0zZG4;-;N zhUs4+lSTdiCPqr$q7$5;i2?us0v<_3K~zRLi4NOIx9wvamh`Yc-N_k46%OZP`Lgji z*OZeePU^YE4<^E?mulagBq`oMM;LnlUE*DCi%K@*^km0DNPZr!pLPR(S@$UYUzXy! z_{l0-WfT>Sf-vbu2dYeiG&kHS`T-*eJ$l$Jp_N;u-s?n!yRde5oER_ny7I=1)Qqt! zr5p=)kj|~-m0&yf+B8e^tLYu?oPOw3&}%Bm*#T-Xlo^*80dDEXUKJHs3;9)&y_`ny zP7oZjSVvJ! zvc1eE##CG?jAVU_harY_$6}lY4ZSUbE3vszQCm1+fv=x=BOl*jgFP7kJcwO@4fbJz zjY5#aF714)7u(+G(^5=@mRCWEr`wVfY1yMX)q%VNlBrmqr`>Wmfd4%@Nee)?>R zR?;lD1FW$b4&~o0b}xqiforh~@l7qs{Aw!jNaEn(>dyJmO_-`EO!Dg`Ejv0779LU$ z3Xc*E(>m2NK@WTNN7FOG4&_0PkVx+o6%v<5r`d3o8|t-ms$3whFYxr9y P00000NkvXXu0mjfj`g)7 diff --git a/WebHostLib/static/static/icons/sc2/impalerrounds.png b/WebHostLib/static/static/icons/sc2/impalerrounds.png deleted file mode 100644 index b00e0c475827388aa30c6470055aceecb04b8e27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4347 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

hpilznk6nM#o3T-srRT^HN9S9KCrk|Id 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 diff --git a/WebHostLib/static/static/icons/sc2/improvedsiegemode.png b/WebHostLib/static/static/icons/sc2/improvedsiegemode.png deleted file mode 100644 index f19dad952bb571357e72fe2bca831e127f3396db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14293 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 D09+_4 diff --git a/WebHostLib/static/static/icons/sc2/jotunboosters.png b/WebHostLib/static/static/icons/sc2/jotunboosters.png deleted file mode 100644 index 25720306e5c2d580647e3abdcfb2bf86af30d0fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5740 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 IM6N<$g5

j{pDw diff --git a/WebHostLib/static/static/icons/sc2/lasertargetingsystem.png b/WebHostLib/static/static/icons/sc2/lasertargetingsystem.png deleted file mode 100644 index c57899b270ff580c51980956089b24e629c18128..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14802 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

UNj)5@82Mmt*U$~`bXx%B7W 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 diff --git a/WebHostLib/static/static/icons/sc2/magfieldaccelerator.png b/WebHostLib/static/static/icons/sc2/magfieldaccelerator.png deleted file mode 100644 index 0272b4b73892fa735ad850ba22ecaf0646b08a95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11459 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 diff --git a/WebHostLib/static/static/icons/sc2/magrailmunitions.png b/WebHostLib/static/static/icons/sc2/magrailmunitions.png deleted file mode 100644 index ec303498ccdbffc072664429e7a943a128c84025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19193 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 QF8}}l07*qoM6N<$f)DZ>AOHXW diff --git a/WebHostLib/static/static/icons/sc2/ripwavemissiles.png b/WebHostLib/static/static/icons/sc2/ripwavemissiles.png deleted file mode 100644 index f68e820397652a0e3177a9e03cda1954b1ab12a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13628 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 diff --git a/WebHostLib/static/static/icons/sc2/specialordance.png b/WebHostLib/static/static/icons/sc2/specialordance.png deleted file mode 100644 index 4f7410d7ca9e250b0305fae35b0ccee603b2e5ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12992 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 diff --git a/WebHostLib/static/static/icons/sc2/superstimpack.png b/WebHostLib/static/static/icons/sc2/superstimpack.png deleted file mode 100644 index 0fba8ce5749ad42fe9fa5c86246280aade0e1fa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14901 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 diff --git a/WebHostLib/static/static/icons/sc2/targetingoptics.png b/WebHostLib/static/static/icons/sc2/targetingoptics.png deleted file mode 100644 index 057a40f08e3097f095239cb437618258d58fcb59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8431 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 diff --git a/WebHostLib/static/static/icons/sc2/thorsiegemode.png b/WebHostLib/static/static/icons/sc2/thorsiegemode.png deleted file mode 100644 index a298fb57de5a10de67b9d1c88ad2576884df5967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11345 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 M07*qoM6N<$f-r-FHvj+t diff --git a/WebHostLib/static/static/icons/sc2/warpjump.png b/WebHostLib/static/static/icons/sc2/warpjump.png deleted file mode 100644 index ff0a7b1af4aaeb9fa6cd112b093c3300d8b46041..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8665 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 N002ovPDHLkV1mnDw5$LC diff --git a/WebHostLib/static/static/icons/sc2/widowmine-deathblossom.png b/WebHostLib/static/static/icons/sc2/widowmine-deathblossom.png deleted file mode 100644 index 7097db05e6c0da7760362b090ad385232f2220b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12946 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 IM6N<$g1}Pepa1{> diff --git a/WebHostLib/static/static/icons/sc2/widowmine.png b/WebHostLib/static/static/icons/sc2/widowmine.png deleted file mode 100644 index 802c49a83d882539becb20df50e6d8a360cc6001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5671 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 N002ovPDHLkV1hnhB6a`( diff --git a/WebHostLib/static/static/icons/sc2/widowminehidden.png b/WebHostLib/static/static/icons/sc2/widowminehidden.png deleted file mode 100644 index e568742e8a50c5a1084e6d6de4a43309908f49de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12777 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 diff --git a/WebHostLib/static/styles/sc2Tracker.css b/WebHostLib/static/styles/sc2Tracker.css new file mode 100644 index 000000000000..29a719a110c8 --- /dev/null +++ b/WebHostLib/static/styles/sc2Tracker.css @@ -0,0 +1,160 @@ +#player-tracker-wrapper{ + margin: 0; +} + +#tracker-table td { + vertical-align: top; +} + +.inventory-table-area{ + border: 2px solid #000000; + border-radius: 4px; + padding: 3px 10px 3px 10px; +} + +.inventory-table-area:has(.inventory-table-terran) { + width: 690px; + background-color: #525494; +} + +.inventory-table-area:has(.inventory-table-zerg) { + width: 360px; + background-color: #9d60d2; +} + +.inventory-table-area:has(.inventory-table-protoss) { + width: 400px; + background-color: #d2b260; +} + +#tracker-table .inventory-table td{ + width: 40px; + height: 40px; + text-align: center; + vertical-align: middle; +} + +.inventory-table td.title{ + padding-top: 10px; + height: 20px; + font-family: "JuraBook", monospace; + font-size: 16px; + font-weight: bold; +} + +.inventory-table img{ + height: 100%; + max-width: 40px; + max-height: 40px; + border: 1px solid #000000; + filter: grayscale(100%) contrast(75%) brightness(20%); + background-color: black; +} + +.inventory-table img.acquired{ + filter: none; + background-color: black; +} + +.inventory-table .tint-terran img.acquired { + filter: sepia(100%) saturate(300%) brightness(130%) hue-rotate(120deg) +} + +.inventory-table .tint-protoss img.acquired { + filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(180deg) +} + +.inventory-table .tint-level-1 img.acquired { + filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) +} + +.inventory-table .tint-level-2 img.acquired { + filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(120deg) +} + +.inventory-table .tint-level-3 img.acquired { + filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(240deg) +} + +.inventory-table div.counted-item { + position: relative; +} + +.inventory-table div.item-count { + width: 160px; + text-align: left; + color: black; + font-family: "JuraBook", monospace; + font-weight: bold; +} + +#location-table{ + border: 2px solid #000000; + border-radius: 4px; + background-color: #87b678; + padding: 10px 3px 3px; + font-family: "JuraBook", monospace; + font-size: 16px; + font-weight: bold; + cursor: default; +} + +#location-table table{ + width: 100%; +} + +#location-table th{ + vertical-align: middle; + text-align: left; + padding-right: 10px; +} + +#location-table td{ + padding-top: 2px; + padding-bottom: 2px; + line-height: 20px; +} + +#location-table td.counter { + text-align: right; + font-size: 14px; +} + +#location-table td.toggle-arrow { + text-align: right; +} + +#location-table tr#Total-header { + font-weight: bold; +} + +#location-table img{ + height: 100%; + max-width: 30px; + max-height: 30px; +} + +#location-table tbody.locations { + font-size: 16px; +} + +#location-table td.location-name { + padding-left: 16px; +} + +#location-table td:has(.location-column) { + vertical-align: top; +} + +#location-table .location-column { + width: 100%; + height: 100%; +} + +#location-table .location-column .spacer { + min-height: 24px; +} + +.hide { + display: none; +} diff --git a/WebHostLib/static/styles/sc2wolTracker.css b/WebHostLib/static/styles/sc2wolTracker.css deleted file mode 100644 index a7d8bd28c4f8..000000000000 --- a/WebHostLib/static/styles/sc2wolTracker.css +++ /dev/null @@ -1,112 +0,0 @@ -#player-tracker-wrapper{ - margin: 0; -} - -#inventory-table{ - border-top: 2px solid #000000; - border-left: 2px solid #000000; - border-right: 2px solid #000000; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - padding: 3px 3px 10px; - width: 710px; - background-color: #525494; -} - -#inventory-table td{ - width: 40px; - height: 40px; - text-align: center; - vertical-align: middle; -} - -#inventory-table td.title{ - padding-top: 10px; - height: 20px; - font-family: "JuraBook", monospace; - font-size: 16px; - font-weight: bold; -} - -#inventory-table img{ - height: 100%; - max-width: 40px; - max-height: 40px; - border: 1px solid #000000; - filter: grayscale(100%) contrast(75%) brightness(20%); - background-color: black; -} - -#inventory-table img.acquired{ - filter: none; - background-color: black; -} - -#inventory-table div.counted-item { - position: relative; -} - -#inventory-table div.item-count { - text-align: left; - color: black; - font-family: "JuraBook", monospace; - font-weight: bold; -} - -#location-table{ - width: 710px; - border-left: 2px solid #000000; - border-right: 2px solid #000000; - border-bottom: 2px solid #000000; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - background-color: #525494; - padding: 10px 3px 3px; - font-family: "JuraBook", monospace; - font-size: 16px; - font-weight: bold; - cursor: default; -} - -#location-table th{ - vertical-align: middle; - text-align: left; - padding-right: 10px; -} - -#location-table td{ - padding-top: 2px; - padding-bottom: 2px; - line-height: 20px; -} - -#location-table td.counter { - text-align: right; - font-size: 14px; -} - -#location-table td.toggle-arrow { - text-align: right; -} - -#location-table tr#Total-header { - font-weight: bold; -} - -#location-table img{ - height: 100%; - max-width: 30px; - max-height: 30px; -} - -#location-table tbody.locations { - font-size: 16px; -} - -#location-table td.location-name { - padding-left: 16px; -} - -.hide { - display: none; -} diff --git a/WebHostLib/templates/tracker__Starcraft2.html b/WebHostLib/templates/tracker__Starcraft2.html new file mode 100644 index 000000000000..b4252df2504d --- /dev/null +++ b/WebHostLib/templates/tracker__Starcraft2.html @@ -0,0 +1,1090 @@ + +{% macro sc2_icon(name) -%} + +{% endmacro -%} +{% macro sc2_progressive_icon(name, url, level) -%} + +{% endmacro -%} +{% macro sc2_progressive_icon_with_custom_name(item_name, url, title) -%} + +{% endmacro -%} +{%+ macro sc2_tint_level(level) %} + tint-level-{{ level }} +{%+ endmacro %} +{% macro sc2_render_area(area) %} + + {{ area }} {{'▼' if area != 'Total'}} + {{ checks_done[area] }} / {{ checks_in_area[area] }} + + + {% for location in location_info[area] %} + + {{ location }} + {{ '✔' if location_info[area][location] else '' }} + + {% endfor %} + +{% endmacro -%} +{% macro sc2_loop_areas(column_index, column_count) %} + {% for area in checks_in_area if checks_in_area[area] > 0 and area != 'Total' %} + {% if loop.index0 < (loop.length / column_count) * (column_index + 1) + and loop.index0 >= (loop.length / column_count) * (column_index) %} + {{ sc2_render_area(area) }} + {% endif %} + {% endfor %} +{% endmacro -%} + + + {{ player_name }}'s Tracker + + + + + + + {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #} +

+ +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+

{{ player_name }}'s Starcraft 2 Tracker

+ Starting Resources +
+{{ minerals_count }}
+{{ vespene_count }}
+{{ supply_count }}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Terran +
+ Weapon & Armor Upgrades +
{{ sc2_progressive_icon('Progressive Terran Infantry Weapon', terran_infantry_weapon_url, terran_infantry_weapon_level) }}{{ sc2_progressive_icon('Progressive Terran Infantry Armor', terran_infantry_armor_url, terran_infantry_armor_level) }}{{ sc2_progressive_icon('Progressive Terran Vehicle Weapon', terran_vehicle_weapon_url, terran_vehicle_weapon_level) }}{{ sc2_progressive_icon('Progressive Terran Vehicle Armor', terran_vehicle_armor_url, terran_vehicle_armor_level) }}{{ sc2_progressive_icon('Progressive Terran Ship Weapon', terran_ship_weapon_url, terran_ship_weapon_level) }}{{ sc2_progressive_icon('Progressive Terran Ship Armor', terran_ship_armor_url, terran_ship_armor_level) }}{{ sc2_icon('Ultra-Capacitors') }}{{ sc2_icon('Vanadium Plating') }}
+ Base +
{{ sc2_icon('Bunker') }}{{ sc2_icon('Projectile Accelerator (Bunker)') }}{{ sc2_icon('Neosteel Bunker (Bunker)') }}{{ sc2_icon('Shrike Turret (Bunker)') }}{{ sc2_icon('Fortified Bunker (Bunker)') }}{{ sc2_icon('Missile Turret') }}{{ sc2_icon('Titanium Housing (Missile Turret)') }}{{ sc2_icon('Hellstorm Batteries (Missile Turret)') }}{{ sc2_icon('Tech Reactor') }}{{ sc2_icon('Orbital Depots') }}
{{ sc2_icon('Command Center Reactor') }}{{ sc2_progressive_icon_with_custom_name('Progressive Orbital Command', orbital_command_url, orbital_command_name) }}{{ sc2_icon('Planetary Fortress') }}{{ sc2_progressive_icon_with_custom_name('Progressive Augmented Thrusters (Planetary Fortress)', augmented_thrusters_planetary_fortress_url, augmented_thrusters_planetary_fortress_name) }}{{ sc2_icon('Advanced Targeting (Planetary Fortress)') }}{{ sc2_icon('Advanced Construction (SCV)') }}{{ sc2_icon('Dual-Fusion Welders (SCV)') }}{{ sc2_icon('Micro-Filtering') }}{{ sc2_icon('Automated Refinery') }}
{{ sc2_icon('Sensor Tower') }}{{ sc2_icon('Perdition Turret') }}{{ sc2_icon('Hive Mind Emulator') }}{{ sc2_icon('Psi Disrupter') }}
+ Infantry + + Vehicles +
{{ sc2_icon('Marine') }}{{ sc2_progressive_icon_with_custom_name('Progressive Stimpack (Marine)', stimpack_marine_url, stimpack_marine_name) }}{{ sc2_icon('Combat Shield (Marine)') }}{{ sc2_icon('Laser Targeting System (Marine)') }}{{ sc2_icon('Magrail Munitions (Marine)') }}{{ sc2_icon('Optimized Logistics (Marine)') }}{{ sc2_icon('Hellion') }}{{ sc2_icon('Twin-Linked Flamethrower (Hellion)') }}{{ sc2_icon('Thermite Filaments (Hellion)') }}{{ sc2_icon('Hellbat Aspect (Hellion)') }}{{ sc2_icon('Smart Servos (Hellion)') }}{{ sc2_icon('Optimized Logistics (Hellion)') }}{{ sc2_icon('Jump Jets (Hellion)') }}
{{ sc2_icon('Medic') }}{{ sc2_icon('Advanced Medic Facilities (Medic)') }}{{ sc2_icon('Stabilizer Medpacks (Medic)') }}{{ sc2_icon('Restoration (Medic)') }}{{ sc2_icon('Optical Flare (Medic)') }}{{ sc2_icon('Resource Efficiency (Medic)') }}{{ sc2_icon('Adaptive Medpacks (Medic)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Stimpack (Hellion)', stimpack_hellion_url, stimpack_hellion_name) }}{{ sc2_icon('Infernal Plating (Hellion)') }}
{{ sc2_icon('Nano Projector (Medic)') }}{{ sc2_icon('Vulture') }}{{ sc2_progressive_icon_with_custom_name('Progressive Replenishable Magazine (Vulture)', replenishable_magazine_vulture_url, replenishable_magazine_vulture_name) }}{{ sc2_icon('Ion Thrusters (Vulture)') }}{{ sc2_icon('Auto Launchers (Vulture)') }}{{ sc2_icon('Auto-Repair (Vulture)') }}
{{ sc2_icon('Firebat') }}{{ sc2_icon('Incinerator Gauntlets (Firebat)') }}{{ sc2_icon('Juggernaut Plating (Firebat)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Stimpack (Firebat)', stimpack_firebat_url, stimpack_firebat_name) }}{{ sc2_icon('Resource Efficiency (Firebat)') }}{{ sc2_icon('Infernal Pre-Igniter (Firebat)') }}{{ sc2_icon('Kinetic Foam (Firebat)') }}{{ sc2_icon('Cerberus Mine (Spider Mine)') }}{{ sc2_icon('High Explosive Munition (Spider Mine)') }}
{{ sc2_icon('Nano Projectors (Firebat)') }}{{ sc2_icon('Goliath') }}{{ sc2_icon('Multi-Lock Weapons System (Goliath)') }}{{ sc2_icon('Ares-Class Targeting System (Goliath)') }}{{ sc2_icon('Jump Jets (Goliath)') }}{{ sc2_icon('Shaped Hull (Goliath)') }}{{ sc2_icon('Optimized Logistics (Goliath)') }}{{ sc2_icon('Resource Efficiency (Goliath)') }}
{{ sc2_icon('Marauder') }}{{ sc2_icon('Concussive Shells (Marauder)') }}{{ sc2_icon('Kinetic Foam (Marauder)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Stimpack (Marauder)', stimpack_marauder_url, stimpack_marauder_name) }}{{ sc2_icon('Laser Targeting System (Marauder)') }}{{ sc2_icon('Magrail Munitions (Marauder)') }}{{ sc2_icon('Internal Tech Module (Marauder)') }}{{ sc2_icon('Internal Tech Module (Goliath)') }}
{{ sc2_icon('Juggernaut Plating (Marauder)') }}{{ sc2_icon('Diamondback') }}{{ sc2_progressive_icon_with_custom_name('Progressive Tri-Lithium Power Cell (Diamondback)', trilithium_power_cell_diamondback_url, trilithium_power_cell_diamondback_name) }}{{ sc2_icon('Shaped Hull (Diamondback)') }}{{ sc2_icon('Hyperfluxor (Diamondback)') }}{{ sc2_icon('Burst Capacitors (Diamondback)') }}{{ sc2_icon('Ion Thrusters (Diamondback)') }}{{ sc2_icon('Resource Efficiency (Diamondback)') }}
{{ sc2_icon('Reaper') }}{{ sc2_icon('U-238 Rounds (Reaper)') }}{{ sc2_icon('G-4 Clusterbomb (Reaper)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Stimpack (Reaper)', stimpack_reaper_url, stimpack_reaper_name) }}{{ sc2_icon('Laser Targeting System (Reaper)') }}{{ sc2_icon('Advanced Cloaking Field (Reaper)') }}{{ sc2_icon('Spider Mines (Reaper)') }}{{ sc2_icon('Siege Tank') }}{{ sc2_icon('Maelstrom Rounds (Siege Tank)') }}{{ sc2_icon('Shaped Blast (Siege Tank)') }}{{ sc2_icon('Jump Jets (Siege Tank)') }}{{ sc2_icon('Spider Mines (Siege Tank)') }}{{ sc2_icon('Smart Servos (Siege Tank)') }}{{ sc2_icon('Graduating Range (Siege Tank)') }}
{{ sc2_icon('Combat Drugs (Reaper)') }}{{ sc2_icon('Jet Pack Overdrive (Reaper)') }}{{ sc2_icon('Laser Targeting System (Siege Tank)') }}{{ sc2_icon('Advanced Siege Tech (Siege Tank)') }}{{ sc2_icon('Internal Tech Module (Siege Tank)') }}{{ sc2_icon('Shaped Hull (Siege Tank)') }}{{ sc2_icon('Resource Efficiency (Siege Tank)') }}
{{ sc2_icon('Ghost') }}{{ sc2_icon('Ocular Implants (Ghost)') }}{{ sc2_icon('Crius Suit (Ghost)') }}{{ sc2_icon('EMP Rounds (Ghost)') }}{{ sc2_icon('Lockdown (Ghost)') }}{{ sc2_icon('Resource Efficiency (Ghost)') }}{{ sc2_icon('Thor') }}{{ sc2_icon('330mm Barrage Cannon (Thor)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Immortality Protocol (Thor)', immortality_protocol_thor_url, immortality_protocol_thor_name) }}{{ sc2_progressive_icon_with_custom_name('Progressive High Impact Payload (Thor)', high_impact_payload_thor_url, high_impact_payload_thor_name) }}{{ sc2_icon('Button With a Skull on It (Thor)') }}{{ sc2_icon('Laser Targeting System (Thor)') }}{{ sc2_icon('Large Scale Field Construction (Thor)') }}
{{ sc2_icon('Spectre') }}{{ sc2_icon('Psionic Lash (Spectre)') }}{{ sc2_icon('Nyx-Class Cloaking Module (Spectre)') }}{{ sc2_icon('Impaler Rounds (Spectre)') }}{{ sc2_icon('Resource Efficiency (Spectre)') }}{{ sc2_icon('Predator') }}{{ sc2_icon('Resource Efficiency (Predator)') }}{{ sc2_icon('Cloak (Predator)') }}{{ sc2_icon('Charge (Predator)') }}{{ sc2_icon('Predator\'s Fury (Predator)') }}
{{ sc2_icon('HERC') }}{{ sc2_icon('Juggernaut Plating (HERC)') }}{{ sc2_icon('Kinetic Foam (HERC)') }}{{ sc2_icon('Widow Mine') }}{{ sc2_icon('Drilling Claws (Widow Mine)') }}{{ sc2_icon('Concealment (Widow Mine)') }}{{ sc2_icon('Black Market Launchers (Widow Mine)') }}{{ sc2_icon('Executioner Missiles (Widow Mine)') }}
{{ sc2_icon('Cyclone') }}{{ sc2_icon('Mag-Field Accelerators (Cyclone)') }}{{ sc2_icon('Mag-Field Launchers (Cyclone)') }}{{ sc2_icon('Targeting Optics (Cyclone)') }}{{ sc2_icon('Rapid Fire Launchers (Cyclone)') }}{{ sc2_icon('Resource Efficiency (Cyclone)') }}{{ sc2_icon('Internal Tech Module (Cyclone)') }}
{{ sc2_icon('Warhound') }}{{ sc2_icon('Resource Efficiency (Warhound)') }}{{ sc2_icon('Reinforced Plating (Warhound)') }}
+ Starships +
{{ sc2_icon('Medivac') }}{{ sc2_icon('Rapid Deployment Tube (Medivac)') }}{{ sc2_icon('Advanced Healing AI (Medivac)') }}{{ sc2_icon('Expanded Hull (Medivac)') }}{{ sc2_icon('Afterburners (Medivac)') }}{{ sc2_icon('Scatter Veil (Medivac)') }}{{ sc2_icon('Advanced Cloaking Field (Medivac)') }}{{ sc2_icon('Raven') }}{{ sc2_icon('Bio Mechanical Repair Drone (Raven)') }}{{ sc2_icon('Spider Mines (Raven)') }}{{ sc2_icon('Railgun Turret (Raven)') }}{{ sc2_icon('Hunter-Seeker Weapon (Raven)') }}{{ sc2_icon('Interference Matrix (Raven)') }}{{ sc2_icon('Anti-Armor Missile (Raven)') }}
{{ sc2_icon('Wraith') }}{{ sc2_progressive_icon_with_custom_name('Progressive Tomahawk Power Cells (Wraith)', tomahawk_power_cells_wraith_url, tomahawk_power_cells_wraith_name) }}{{ sc2_icon('Displacement Field (Wraith)') }}{{ sc2_icon('Advanced Laser Technology (Wraith)') }}{{ sc2_icon('Trigger Override (Wraith)') }}{{ sc2_icon('Internal Tech Module (Wraith)') }}{{ sc2_icon('Resource Efficiency (Wraith)') }}{{ sc2_icon('Internal Tech Module (Raven)') }}{{ sc2_icon('Resource Efficiency (Raven)') }}{{ sc2_icon('Durable Materials (Raven)') }}
{{ sc2_icon('Viking') }}{{ sc2_icon('Ripwave Missiles (Viking)') }}{{ sc2_icon('Phobos-Class Weapons System (Viking)') }}{{ sc2_icon('Smart Servos (Viking)') }}{{ sc2_icon('Anti-Mechanical Munition (Viking)') }}{{ sc2_icon('Shredder Rounds (Viking)') }}{{ sc2_icon('W.I.L.D. Missiles (Viking)') }}{{ sc2_icon('Science Vessel') }}{{ sc2_icon('EMP Shockwave (Science Vessel)') }}{{ sc2_icon('Defensive Matrix (Science Vessel)') }}{{ sc2_icon('Improved Nano-Repair (Science Vessel)') }}{{ sc2_icon('Advanced AI Systems (Science Vessel)') }}
{{ sc2_icon('Banshee') }}{{ sc2_progressive_icon_with_custom_name('Progressive Cross-Spectrum Dampeners (Banshee)', crossspectrum_dampeners_banshee_url, crossspectrum_dampeners_banshee_name) }}{{ sc2_icon('Shockwave Missile Battery (Banshee)') }}{{ sc2_icon('Hyperflight Rotors (Banshee)') }}{{ sc2_icon('Laser Targeting System (Banshee)') }}{{ sc2_icon('Internal Tech Module (Banshee)') }}{{ sc2_icon('Shaped Hull (Banshee)') }}{{ sc2_icon('Hercules') }}{{ sc2_icon('Internal Fusion Module (Hercules)') }}{{ sc2_icon('Tactical Jump (Hercules)') }}
{{ sc2_icon('Advanced Targeting Optics (Banshee)') }}{{ sc2_icon('Distortion Blasters (Banshee)') }}{{ sc2_icon('Rocket Barrage (Banshee)') }}{{ sc2_icon('Liberator') }}{{ sc2_icon('Advanced Ballistics (Liberator)') }}{{ sc2_icon('Raid Artillery (Liberator)') }}{{ sc2_icon('Cloak (Liberator)') }}{{ sc2_icon('Laser Targeting System (Liberator)') }}{{ sc2_icon('Optimized Logistics (Liberator)') }}{{ sc2_icon('Smart Servos (Liberator)') }}
{{ sc2_icon('Battlecruiser') }}{{ sc2_progressive_icon('Progressive Missile Pods (Battlecruiser)', missile_pods_battlecruiser_url, missile_pods_battlecruiser_level) }}{{ sc2_progressive_icon_with_custom_name('Progressive Defensive Matrix (Battlecruiser)', defensive_matrix_battlecruiser_url, defensive_matrix_battlecruiser_name) }}{{ sc2_icon('Tactical Jump (Battlecruiser)') }}{{ sc2_icon('Cloak (Battlecruiser)') }}{{ sc2_icon('ATX Laser Battery (Battlecruiser)') }}{{ sc2_icon('Optimized Logistics (Battlecruiser)') }}{{ sc2_icon('Resource Efficiency (Liberator)') }}
{{ sc2_icon('Internal Tech Module (Battlecruiser)') }}{{ sc2_icon('Behemoth Plating (Battlecruiser)') }}{{ sc2_icon('Covert Ops Engines (Battlecruiser)') }}{{ sc2_icon('Valkyrie') }}{{ sc2_icon('Enhanced Cluster Launchers (Valkyrie)') }}{{ sc2_icon('Shaped Hull (Valkyrie)') }}{{ sc2_icon('Flechette Missiles (Valkyrie)') }}{{ sc2_icon('Afterburners (Valkyrie)') }}{{ sc2_icon('Launching Vector Compensator (Valkyrie)') }}{{ sc2_icon('Resource Efficiency (Valkyrie)') }}
+ Mercenaries +
{{ sc2_icon('War Pigs') }}{{ sc2_icon('Devil Dogs') }}{{ sc2_icon('Hammer Securities') }}{{ sc2_icon('Spartan Company') }}{{ sc2_icon('Siege Breakers') }}{{ sc2_icon('Hel\'s Angels') }}{{ sc2_icon('Dusk Wings') }}{{ sc2_icon('Jackson\'s Revenge') }}{{ sc2_icon('Skibi\'s Angels') }}{{ sc2_icon('Death Heads') }}{{ sc2_icon('Winged Nightmares') }}{{ sc2_icon('Midnight Riders') }}{{ sc2_icon('Brynhilds') }}{{ sc2_icon('Jotun') }}
+ General Upgrades +
{{ sc2_progressive_icon('Progressive Fire-Suppression System', firesuppression_system_url, firesuppression_system_level) }}{{ sc2_icon('Orbital Strike') }}{{ sc2_icon('Cellular Reactor') }}{{ sc2_progressive_icon('Progressive Regenerative Bio-Steel', regenerative_biosteel_url, regenerative_biosteel_level) }}{{ sc2_icon('Structure Armor') }}{{ sc2_icon('Hi-Sec Auto Tracking') }}{{ sc2_icon('Advanced Optics') }}{{ sc2_icon('Rogue Forces') }}
+ Nova Equipment +
{{ sc2_icon('C20A Canister Rifle (Nova Weapon)') }}{{ sc2_icon('Hellfire Shotgun (Nova Weapon)') }}{{ sc2_icon('Plasma Rifle (Nova Weapon)') }}{{ sc2_icon('Monomolecular Blade (Nova Weapon)') }}{{ sc2_icon('Blazefire Gunblade (Nova Weapon)') }}{{ sc2_icon('Stim Infusion (Nova Gadget)') }}{{ sc2_icon('Pulse Grenades (Nova Gadget)') }}{{ sc2_icon('Flashbang Grenades (Nova Gadget)') }}{{ sc2_icon('Ionic Force Field (Nova Gadget)') }}{{ sc2_icon('Holo Decoy (Nova Gadget)') }}
{{ sc2_progressive_icon_with_custom_name('Progressive Stealth Suit Module (Nova Suit Module)', stealth_suit_module_nova_suit_module_url, stealth_suit_module_nova_suit_module_name) }}{{ sc2_icon('Energy Suit Module (Nova Suit Module)') }}{{ sc2_icon('Armored Suit Module (Nova Suit Module)') }}{{ sc2_icon('Jump Suit Module (Nova Suit Module)') }}{{ sc2_icon('Ghost Visor (Nova Equipment)') }}{{ sc2_icon('Rangefinder Oculus (Nova Equipment)') }}{{ sc2_icon('Domination (Nova Ability)') }}{{ sc2_icon('Blink (Nova Ability)') }}{{ sc2_icon('Tac Nuke Strike (Nova Ability)') }}
+ 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Zerg +
+ Weapon & Armor Upgrades +
{{ sc2_progressive_icon('Progressive Zerg Melee Attack', zerg_melee_attack_url, zerg_melee_attack_level) }}{{ sc2_progressive_icon('Progressive Zerg Missile Attack', zerg_missile_attack_url, zerg_missile_attack_level) }}{{ sc2_progressive_icon('Progressive Zerg Ground Carapace', zerg_ground_carapace_url, zerg_ground_carapace_level) }}{{ sc2_progressive_icon('Progressive Zerg Flyer Attack', zerg_flyer_attack_url, zerg_flyer_attack_level) }}{{ sc2_progressive_icon('Progressive Zerg Flyer Carapace', zerg_flyer_carapace_url, zerg_flyer_carapace_level) }}
+ Base +
{{ sc2_icon('Automated Extractors (Kerrigan Tier 3)') }}{{ sc2_icon('Vespene Efficiency (Kerrigan Tier 5)') }}{{ sc2_icon('Twin Drones (Kerrigan Tier 5)') }}{{ sc2_icon('Improved Overlords (Kerrigan Tier 3)') }}{{ sc2_icon('Ventral Sacs (Overlord)') }}
{{ sc2_icon('Malignant Creep (Kerrigan Tier 5)') }}{{ sc2_icon('Spine Crawler') }}{{ sc2_icon('Spore Crawler') }}
+ Units +
{{ sc2_icon('Zergling') }}{{ sc2_icon('Raptor Strain (Zergling)') }}{{ sc2_icon('Swarmling Strain (Zergling)') }}{{ sc2_icon('Hardened Carapace (Zergling)') }}{{ sc2_icon('Adrenal Overload (Zergling)') }}{{ sc2_icon('Metabolic Boost (Zergling)') }}{{ sc2_icon('Shredding Claws (Zergling)') }}{{ sc2_icon('Zergling Reconstitution (Kerrigan Tier 3)') }}
{{ sc2_icon('Baneling Aspect (Zergling)') }}{{ sc2_icon('Splitter Strain (Baneling)') }}{{ sc2_icon('Hunter Strain (Baneling)') }}{{ sc2_icon('Corrosive Acid (Baneling)') }}{{ sc2_icon('Rupture (Baneling)') }}{{ sc2_icon('Regenerative Acid (Baneling)') }}{{ sc2_icon('Centrifugal Hooks (Baneling)') }}
{{ sc2_icon('Tunneling Jaws (Baneling)') }}{{ sc2_icon('Rapid Metamorph (Baneling)') }}
{{ sc2_icon('Swarm Queen') }}{{ sc2_icon('Spawn Larvae (Swarm Queen)') }}{{ sc2_icon('Deep Tunnel (Swarm Queen)') }}{{ sc2_icon('Organic Carapace (Swarm Queen)') }}{{ sc2_icon('Bio-Mechanical Transfusion (Swarm Queen)') }}{{ sc2_icon('Resource Efficiency (Swarm Queen)') }}{{ sc2_icon('Incubator Chamber (Swarm Queen)') }}
{{ sc2_icon('Roach') }}{{ sc2_icon('Vile Strain (Roach)') }}{{ sc2_icon('Corpser Strain (Roach)') }}{{ sc2_icon('Hydriodic Bile (Roach)') }}{{ sc2_icon('Adaptive Plating (Roach)') }}{{ sc2_icon('Tunneling Claws (Roach)') }}{{ sc2_icon('Glial Reconstitution (Roach)') }}{{ sc2_icon('Organic Carapace (Roach)') }}
{{ sc2_icon('Ravager Aspect (Roach)') }}{{ sc2_icon('Potent Bile (Ravager)') }}{{ sc2_icon('Bloated Bile Ducts (Ravager)') }}{{ sc2_icon('Deep Tunnel (Ravager)') }}
{{ sc2_icon('Hydralisk') }}{{ sc2_icon('Frenzy (Hydralisk)') }}{{ sc2_icon('Ancillary Carapace (Hydralisk)') }}{{ sc2_icon('Grooved Spines (Hydralisk)') }}{{ sc2_icon('Muscular Augments (Hydralisk)') }}{{ sc2_icon('Resource Efficiency (Hydralisk)') }}
{{ sc2_icon('Impaler Aspect (Hydralisk)') }}{{ sc2_icon('Adaptive Talons (Impaler)') }}{{ sc2_icon('Secretion Glands (Impaler)') }}{{ sc2_icon('Hardened Tentacle Spines (Impaler)') }}
{{ sc2_icon('Lurker Aspect (Hydralisk)') }}{{ sc2_icon('Seismic Spines (Lurker)') }}{{ sc2_icon('Adapted Spines (Lurker)') }}
{{ sc2_icon('Aberration') }}
{{ sc2_icon('Swarm Host') }}{{ sc2_icon('Carrion Strain (Swarm Host)') }}{{ sc2_icon('Creeper Strain (Swarm Host)') }}{{ sc2_icon('Burrow (Swarm Host)') }}{{ sc2_icon('Rapid Incubation (Swarm Host)') }}{{ sc2_icon('Pressurized Glands (Swarm Host)') }}{{ sc2_icon('Locust Metabolic Boost (Swarm Host)') }}{{ sc2_icon('Enduring Locusts (Swarm Host)') }}
{{ sc2_icon('Organic Carapace (Swarm Host)') }}{{ sc2_icon('Resource Efficiency (Swarm Host)') }}
{{ sc2_icon('Infestor') }}{{ sc2_icon('Infested Terran (Infestor)') }}{{ sc2_icon('Microbial Shroud (Infestor)') }}
{{ sc2_icon('Defiler') }}
{{ sc2_icon('Ultralisk') }}{{ sc2_icon('Noxious Strain (Ultralisk)') }}{{ sc2_icon('Torrasque Strain (Ultralisk)') }}{{ sc2_icon('Burrow Charge (Ultralisk)') }}{{ sc2_icon('Tissue Assimilation (Ultralisk)') }}{{ sc2_icon('Monarch Blades (Ultralisk)') }}{{ sc2_icon('Anabolic Synthesis (Ultralisk)') }}{{ sc2_icon('Chitinous Plating (Ultralisk)') }}
{{ sc2_icon('Organic Carapace (Ultralisk)') }}{{ sc2_icon('Resource Efficiency (Ultralisk)') }}
{{ sc2_icon('Mutalisk') }}{{ sc2_icon('Rapid Regeneration (Mutalisk)') }}{{ sc2_icon('Sundering Glaive (Mutalisk)') }}{{ sc2_icon('Vicious Glaive (Mutalisk)') }}{{ sc2_icon('Severing Glaive (Mutalisk)') }}{{ sc2_icon('Aerodynamic Glaive Shape (Mutalisk)') }}
{{ sc2_icon('Corruptor') }}{{ sc2_icon('Corruption (Corruptor)') }}{{ sc2_icon('Caustic Spray (Corruptor)') }}
{{ sc2_icon('Brood Lord Aspect (Mutalisk/Corruptor)') }}{{ sc2_icon('Porous Cartilage (Brood Lord)') }}{{ sc2_icon('Evolved Carapace (Brood Lord)') }}{{ sc2_icon('Splitter Mitosis (Brood Lord)') }}{{ sc2_icon('Resource Efficiency (Brood Lord)') }}
{{ sc2_icon('Viper Aspect (Mutalisk/Corruptor)') }}{{ sc2_icon('Parasitic Bomb (Viper)') }}{{ sc2_icon('Paralytic Barbs (Viper)') }}{{ sc2_icon('Virulent Microbes (Viper)') }}
{{ sc2_icon('Guardian Aspect (Mutalisk/Corruptor)') }}{{ sc2_icon('Prolonged Dispersion (Guardian)') }}{{ sc2_icon('Primal Adaptation (Guardian)') }}{{ sc2_icon('Soronan Acid (Guardian)') }}
{{ sc2_icon('Devourer Aspect (Mutalisk/Corruptor)') }}{{ sc2_icon('Corrosive Spray (Devourer)') }}{{ sc2_icon('Gaping Maw (Devourer)') }}{{ sc2_icon('Improved Osmosis (Devourer)') }}{{ sc2_icon('Prescient Spores (Devourer)') }}
{{ sc2_icon('Brood Queen') }}{{ sc2_icon('Fungal Growth (Brood Queen)') }}{{ sc2_icon('Ensnare (Brood Queen)') }}{{ sc2_icon('Enhanced Mitochondria (Brood Queen)') }}
{{ sc2_icon('Scourge') }}{{ sc2_icon('Virulent Spores (Scourge)') }}{{ sc2_icon('Resource Efficiency (Scourge)') }}{{ sc2_icon('Swarm Scourge (Scourge)') }}
+ Mercenaries +
{{ sc2_icon('Infested Medics') }}{{ sc2_icon('Infested Siege Tanks') }}{{ sc2_icon('Infested Banshees') }}
+ Kerrigan +
Level: {{ kerrigan_level }}
{{ sc2_icon('Primal Form (Kerrigan)') }}
{{ sc2_icon('Kinetic Blast (Kerrigan Tier 1)') }}{{ sc2_icon('Heroic Fortitude (Kerrigan Tier 1)') }}{{ sc2_icon('Leaping Strike (Kerrigan Tier 1)') }}{{ sc2_icon('Crushing Grip (Kerrigan Tier 2)') }}{{ sc2_icon('Chain Reaction (Kerrigan Tier 2)') }}{{ sc2_icon('Psionic Shift (Kerrigan Tier 2)') }}
{{ sc2_icon('Wild Mutation (Kerrigan Tier 4)') }}{{ sc2_icon('Spawn Banelings (Kerrigan Tier 4)') }}{{ sc2_icon('Mend (Kerrigan Tier 4)') }}{{ sc2_icon('Infest Broodlings (Kerrigan Tier 6)') }}{{ sc2_icon('Fury (Kerrigan Tier 6)') }}{{ sc2_icon('Ability Efficiency (Kerrigan Tier 6)') }}
{{ sc2_icon('Apocalypse (Kerrigan Tier 7)') }}{{ sc2_icon('Spawn Leviathan (Kerrigan Tier 7)') }}{{ sc2_icon('Drop-Pods (Kerrigan Tier 7)') }}
+ 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Protoss +
+ Weapon & Armor Upgrades +
{{ sc2_progressive_icon('Progressive Protoss Ground Weapon', protoss_ground_weapon_url, protoss_ground_weapon_level) }}{{ sc2_progressive_icon('Progressive Protoss Ground Armor', protoss_ground_armor_url, protoss_ground_armor_level) }}{{ sc2_progressive_icon('Progressive Protoss Air Weapon', protoss_air_weapon_url, protoss_air_weapon_level) }}{{ sc2_progressive_icon('Progressive Protoss Air Armor', protoss_air_armor_url, protoss_air_armor_level) }}{{ sc2_progressive_icon('Progressive Protoss Shields', protoss_shields_url, protoss_shields_level) }}{{ sc2_icon('Quatro') }}
+ Base +
{{ sc2_icon('Photon Cannon') }}{{ sc2_icon('Khaydarin Monolith') }}{{ sc2_icon('Shield Battery') }}{{ sc2_icon('Enhanced Targeting') }}{{ sc2_icon('Optimized Ordnance') }}{{ sc2_icon('Khalai Ingenuity') }}{{ sc2_icon('Orbital Assimilators') }}{{ sc2_icon('Amplified Assimilators') }}
{{ sc2_icon('Warp Harmonization') }}{{ sc2_icon('Superior Warp Gates') }}{{ sc2_icon('Nexus Overcharge') }}
+ Gateway +
{{ sc2_icon('Zealot') }}{{ sc2_icon('Centurion') }}{{ sc2_icon('Sentinel') }}{{ sc2_icon('Leg Enhancements (Zealot/Sentinel/Centurion)') }}{{ sc2_icon('Shield Capacity (Zealot/Sentinel/Centurion)') }}
{{ sc2_icon('Supplicant') }}{{ sc2_icon('Blood Shield (Supplicant)') }}{{ sc2_icon('Soul Augmentation (Supplicant)') }}{{ sc2_icon('Shield Regeneration (Supplicant)') }}
{{ sc2_icon('Sentry') }}{{ sc2_icon('Force Field (Sentry)') }}{{ sc2_icon('Hallucination (Sentry)') }}
{{ sc2_icon('Energizer') }}{{ sc2_icon('Reclamation (Energizer)') }}{{ sc2_icon('Forged Chassis (Energizer)') }}{{ sc2_icon('Cloaking Module (Sentry/Energizer/Havoc)') }}{{ sc2_icon('Rapid Recharging (Sentry/Energizer/Havoc/Shield Battery)') }}
{{ sc2_icon('Havoc') }}{{ sc2_icon('Detect Weakness (Havoc)') }}{{ sc2_icon('Bloodshard Resonance (Havoc)') }}
{{ sc2_icon('Stalker') }}{{ sc2_icon('Instigator') }}{{ sc2_icon('Slayer') }}{{ sc2_icon('Disintegrating Particles (Stalker/Instigator/Slayer)') }}{{ sc2_icon('Particle Reflection (Stalker/Instigator/Slayer)') }}
{{ sc2_icon('Dragoon') }}{{ sc2_icon('High Impact Phase Disruptor (Dragoon)') }}{{ sc2_icon('Trillic Compression System (Dragoon)') }}{{ sc2_icon('Singularity Charge (Dragoon)') }}{{ sc2_icon('Enhanced Strider Servos (Dragoon)') }}
{{ sc2_icon('Adept') }}{{ sc2_icon('Shockwave (Adept)') }}{{ sc2_icon('Resonating Glaives (Adept)') }}{{ sc2_icon('Phase Bulwark (Adept)') }}
{{ sc2_icon('High Templar') }}{{ sc2_icon('Signifier') }}{{ sc2_icon('Unshackled Psionic Storm (High Templar/Signifier)') }}{{ sc2_icon('Hallucination (High Templar/Signifier)') }}{{ sc2_icon('Khaydarin Amulet (High Templar/Signifier)') }}{{ sc2_icon('High Archon (Archon)') }}
{{ sc2_icon('Ascendant') }}{{ sc2_icon('Power Overwhelming (Ascendant)') }}{{ sc2_icon('Chaotic Attunement (Ascendant)') }}{{ sc2_icon('Blood Amulet (Ascendant)') }}
{{ sc2_icon('Dark Archon') }}{{ sc2_icon('Feedback (Dark Archon)') }}{{ sc2_icon('Maelstrom (Dark Archon)') }}{{ sc2_icon('Argus Talisman (Dark Archon)') }}
{{ sc2_icon('Dark Templar') }}{{ sc2_icon('Dark Archon Meld (Dark Templar)') }}
{{ sc2_icon('Avenger') }}{{ sc2_icon('Blood Hunter') }}{{ sc2_icon('Shroud of Adun (Dark Templar/Avenger/Blood Hunter)') }}{{ sc2_icon('Shadow Guard Training (Dark Templar/Avenger/Blood Hunter)') }}{{ sc2_icon('Blink (Dark Templar/Avenger/Blood Hunter)') }}{{ sc2_icon('Resource Efficiency (Dark Templar/Avenger/Blood Hunter)') }}
+ Robotics Facility +
{{ sc2_icon('Warp Prism') }}{{ sc2_icon('Gravitic Drive (Warp Prism)') }}{{ sc2_icon('Phase Blaster (Warp Prism)') }}{{ sc2_icon('War Configuration (Warp Prism)') }}
{{ sc2_icon('Immortal') }}{{ sc2_icon('Annihilator') }}{{ sc2_icon('Singularity Charge (Immortal/Annihilator)') }}{{ sc2_icon('Advanced Targeting Mechanics (Immortal/Annihilator)') }}
{{ sc2_icon('Vanguard') }}{{ sc2_icon('Agony Launchers (Vanguard)') }}{{ sc2_icon('Matter Dispersion (Vanguard)') }}
{{ sc2_icon('Colossus') }}{{ sc2_icon('Pacification Protocol (Colossus)') }}
{{ sc2_icon('Wrathwalker') }}{{ sc2_icon('Rapid Power Cycling (Wrathwalker)') }}{{ sc2_icon('Eye of Wrath (Wrathwalker)') }}
{{ sc2_icon('Observer') }}{{ sc2_icon('Gravitic Boosters (Observer)') }}{{ sc2_icon('Sensor Array (Observer)') }}
{{ sc2_icon('Reaver') }}{{ sc2_icon('Scarab Damage (Reaver)') }}{{ sc2_icon('Solarite Payload (Reaver)') }}{{ sc2_icon('Reaver Capacity (Reaver)') }}{{ sc2_icon('Resource Efficiency (Reaver)') }}
{{ sc2_icon('Disruptor') }}
+ Stargate +
{{ sc2_icon('Phoenix') }}{{ sc2_icon('Mirage') }}{{ sc2_icon('Ionic Wavelength Flux (Phoenix/Mirage)') }}{{ sc2_icon('Anion Pulse-Crystals (Phoenix/Mirage)') }}
{{ sc2_icon('Corsair') }}{{ sc2_icon('Stealth Drive (Corsair)') }}{{ sc2_icon('Argus Jewel (Corsair)') }}{{ sc2_icon('Sustaining Disruption (Corsair)') }}{{ sc2_icon('Neutron Shields (Corsair)') }}
{{ sc2_icon('Destroyer') }}{{ sc2_icon('Reforged Bloodshard Core (Destroyer)') }}
{{ sc2_icon('Void Ray') }}{{ sc2_icon('Flux Vanes (Void Ray/Destroyer)') }}
{{ sc2_icon('Carrier') }}{{ sc2_icon('Graviton Catapult (Carrier)') }}{{ sc2_icon('Hull of Past Glories (Carrier)') }}
{{ sc2_icon('Scout') }}{{ sc2_icon('Combat Sensor Array (Scout)') }}{{ sc2_icon('Apial Sensors (Scout)') }}{{ sc2_icon('Gravitic Thrusters (Scout)') }}{{ sc2_icon('Advanced Photon Blasters (Scout)') }}
{{ sc2_icon('Tempest') }}{{ sc2_icon('Tectonic Destabilizers (Tempest)') }}{{ sc2_icon('Quantic Reactor (Tempest)') }}{{ sc2_icon('Gravity Sling (Tempest)') }}
{{ sc2_icon('Mothership') }}
{{ sc2_icon('Arbiter') }}{{ sc2_icon('Chronostatic Reinforcement (Arbiter)') }}{{ sc2_icon('Khaydarin Core (Arbiter)') }}{{ sc2_icon('Spacetime Anchor (Arbiter)') }}{{ sc2_icon('Resource Efficiency (Arbiter)') }}{{ sc2_icon('Enhanced Cloak Field (Arbiter)') }}
{{ sc2_icon('Oracle') }}{{ sc2_icon('Stealth Drive (Oracle)') }}{{ sc2_icon('Stasis Calibration (Oracle)') }}{{ sc2_icon('Temporal Acceleration Beam (Oracle)') }}
+ General Upgrades +
{{ sc2_icon('Matrix Overload') }}{{ sc2_icon('Guardian Shell') }}
+ Spear of Adun +
{{ sc2_icon('Chrono Surge (Spear of Adun Calldown)') }}{{ sc2_progressive_icon_with_custom_name('Progressive Proxy Pylon (Spear of Adun Calldown)', proxy_pylon_spear_of_adun_calldown_url, proxy_pylon_spear_of_adun_calldown_name) }}{{ sc2_icon('Pylon Overcharge (Spear of Adun Calldown)') }}{{ sc2_icon('Mass Recall (Spear of Adun Calldown)') }}{{ sc2_icon('Shield Overcharge (Spear of Adun Calldown)') }}{{ sc2_icon('Deploy Fenix (Spear of Adun Calldown)') }}{{ sc2_icon('Reconstruction Beam (Spear of Adun Auto-Cast)') }}
{{ sc2_icon('Orbital Strike (Spear of Adun Calldown)') }}{{ sc2_icon('Temporal Field (Spear of Adun Calldown)') }}{{ sc2_icon('Solar Lance (Spear of Adun Calldown)') }}{{ sc2_icon('Purifier Beam (Spear of Adun Calldown)') }}{{ sc2_icon('Time Stop (Spear of Adun Calldown)') }}{{ sc2_icon('Solar Bombardment (Spear of Adun Calldown)') }}{{ sc2_icon('Overwatch (Spear of Adun Auto-Cast)') }}
+
+ + + + + + +
+ + {{ sc2_loop_areas(0, 3) }} +
+ 		+ + {{ sc2_loop_areas(1, 3) }} +
+ 		+ + {{ sc2_loop_areas(2, 3) }} + + {{ sc2_render_area('Total') }} +
 
+
+
+
+ + diff --git a/WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html b/WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html deleted file mode 100644 index c27f690dfd36..000000000000 --- a/WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html +++ /dev/null @@ -1,366 +0,0 @@ - - - - {{ player_name }}'s Tracker - - - - - - - {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Starting Resources -
+{{ minerals_count }}
+{{ vespene_count }}
- Weapon & Armor Upgrades -
- Base -
- Infantry - - Vehicles -
- Starships -
- Mercenaries -
- General Upgrades -
- Protoss Units -
- - {% for area in checks_in_area %} - {% if checks_in_area[area] > 0 %} - - - - - - {% for location in location_info[area] %} - - - - - {% endfor %} - - {% endif %} - {% endfor %} -
{{ area }} {{'â–¼' if area != 'Total'}}{{ checks_done[area] }} / {{ checks_in_area[area] }}
{{ location }}{{ '✔' if location_info[area][location] else '' }}
-
- - diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py index e8b1ae5b3171..c2fdab0ed074 100644 --- a/WebHostLib/tracker.py +++ b/WebHostLib/tracker.py @@ -1553,212 +1553,298 @@ def render_ChecksFinder_tracker(tracker_data: TrackerData, team: int, player: in _player_trackers["ChecksFinder"] = render_ChecksFinder_tracker -if "Starcraft 2 Wings of Liberty" in network_data_package["games"]: - def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int, player: int) -> str: +if "Starcraft 2" in network_data_package["games"]: + def render_Starcraft2_tracker(tracker_data: TrackerData, team: int, player: int) -> str: SC2WOL_LOC_ID_OFFSET = 1000 + SC2HOTS_LOC_ID_OFFSET = 20000000 # Avoid clashes with The Legend of Zelda + SC2LOTV_LOC_ID_OFFSET = SC2HOTS_LOC_ID_OFFSET + 2000 + SC2NCO_LOC_ID_OFFSET = SC2LOTV_LOC_ID_OFFSET + 2500 + SC2WOL_ITEM_ID_OFFSET = 1000 + SC2HOTS_ITEM_ID_OFFSET = SC2WOL_ITEM_ID_OFFSET + 1000 + SC2LOTV_ITEM_ID_OFFSET = SC2HOTS_ITEM_ID_OFFSET + 1000 + + slot_data = tracker_data.get_slot_data(team, player) + minerals_per_item = slot_data.get("minerals_per_item", 15) + vespene_per_item = slot_data.get("vespene_per_item", 15) + starting_supply_per_item = slot_data.get("starting_supply_per_item", 2) + + github_icon_base_url = "https://matthewmarinets.github.io/ap_sc2_icons/icons/" + organics_icon_base_url = "https://0rganics.org/archipelago/sc2wol/" icons = { "Starting Minerals": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-mineral-protoss.png", "Starting Vespene": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-gas-terran.png", - "Starting Supply": "https://static.wikia.nocookie.net/starcraft/images/d/d3/TerranSupply_SC2_Icon1.gif", - - "Infantry Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel1.png", - "Infantry Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel2.png", - "Infantry Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel3.png", - "Infantry Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel1.png", - "Infantry Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel2.png", - "Infantry Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel3.png", - "Vehicle Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel1.png", - "Vehicle Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel2.png", - "Vehicle Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel3.png", - "Vehicle Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel1.png", - "Vehicle Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel2.png", - "Vehicle Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel3.png", - "Ship Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel1.png", - "Ship Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel2.png", - "Ship Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel3.png", - "Ship Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel1.png", - "Ship Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel2.png", - "Ship Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel3.png", + "Starting Supply": github_icon_base_url + "blizzard/icon-supply-terran_nobg.png", + + "Terran Infantry Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel1.png", + "Terran Infantry Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel2.png", + "Terran Infantry Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel3.png", + "Terran Infantry Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel1.png", + "Terran Infantry Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel2.png", + "Terran Infantry Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel3.png", + "Terran Vehicle Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel1.png", + "Terran Vehicle Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel2.png", + "Terran Vehicle Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel3.png", + "Terran Vehicle Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel1.png", + "Terran Vehicle Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel2.png", + "Terran Vehicle Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel3.png", + "Terran Ship Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel1.png", + "Terran Ship Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel2.png", + "Terran Ship Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel3.png", + "Terran Ship Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel1.png", + "Terran Ship Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel2.png", + "Terran Ship Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel3.png", "Bunker": "https://static.wikia.nocookie.net/starcraft/images/c/c5/Bunker_SC2_Icon1.jpg", "Missile Turret": "https://static.wikia.nocookie.net/starcraft/images/5/5f/MissileTurret_SC2_Icon1.jpg", "Sensor Tower": "https://static.wikia.nocookie.net/starcraft/images/d/d2/SensorTower_SC2_Icon1.jpg", - "Projectile Accelerator (Bunker)": "https://0rganics.org/archipelago/sc2wol/ProjectileAccelerator.png", - "Neosteel Bunker (Bunker)": "https://0rganics.org/archipelago/sc2wol/NeosteelBunker.png", - "Titanium Housing (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/TitaniumHousing.png", - "Hellstorm Batteries (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png", - "Advanced Construction (SCV)": "https://0rganics.org/archipelago/sc2wol/AdvancedConstruction.png", - "Dual-Fusion Welders (SCV)": "https://0rganics.org/archipelago/sc2wol/Dual-FusionWelders.png", - "Fire-Suppression System (Building)": "https://0rganics.org/archipelago/sc2wol/Fire-SuppressionSystem.png", - "Orbital Command (Building)": "https://0rganics.org/archipelago/sc2wol/OrbitalCommandCampaign.png", + "Projectile Accelerator (Bunker)": github_icon_base_url + "blizzard/btn-upgrade-zerg-stukov-bunkerresearchbundle_05.png", + "Neosteel Bunker (Bunker)": organics_icon_base_url + "NeosteelBunker.png", + "Titanium Housing (Missile Turret)": organics_icon_base_url + "TitaniumHousing.png", + "Hellstorm Batteries (Missile Turret)": github_icon_base_url + "blizzard/btn-ability-stetmann-corruptormissilebarrage.png", + "Advanced Construction (SCV)": github_icon_base_url + "blizzard/btn-ability-mengsk-trooper-advancedconstruction.png", + "Dual-Fusion Welders (SCV)": github_icon_base_url + "blizzard/btn-upgrade-swann-scvdoublerepair.png", + "Fire-Suppression System Level 1": organics_icon_base_url + "Fire-SuppressionSystem.png", + "Fire-Suppression System Level 2": github_icon_base_url + "blizzard/btn-upgrade-swann-firesuppressionsystem.png", + + "Orbital Command": organics_icon_base_url + "OrbitalCommandCampaign.png", + "Planetary Command Module": github_icon_base_url + "original/btn-orbital-fortress.png", + "Lift Off (Planetary Fortress)": github_icon_base_url + "blizzard/btn-ability-terran-liftoff.png", + "Armament Stabilizers (Planetary Fortress)": github_icon_base_url + "blizzard/btn-ability-mengsk-siegetank-flyingtankarmament.png", + "Advanced Targeting (Planetary Fortress)": github_icon_base_url + "blizzard/btn-ability-terran-detectionconedebuff.png", "Marine": "https://static.wikia.nocookie.net/starcraft/images/4/47/Marine_SC2_Icon1.jpg", - "Medic": "https://static.wikia.nocookie.net/starcraft/images/7/74/Medic_SC2_Rend1.jpg", - "Firebat": "https://static.wikia.nocookie.net/starcraft/images/3/3c/Firebat_SC2_Rend1.jpg", + "Medic": github_icon_base_url + "blizzard/btn-unit-terran-medic.png", + "Firebat": github_icon_base_url + "blizzard/btn-unit-terran-firebat.png", "Marauder": "https://static.wikia.nocookie.net/starcraft/images/b/ba/Marauder_SC2_Icon1.jpg", "Reaper": "https://static.wikia.nocookie.net/starcraft/images/7/7d/Reaper_SC2_Icon1.jpg", - - "Stimpack (Marine)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png", - "Super Stimpack (Marine)": "/static/static/icons/sc2/superstimpack.png", - "Combat Shield (Marine)": "https://0rganics.org/archipelago/sc2wol/CombatShieldCampaign.png", - "Laser Targeting System (Marine)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Magrail Munitions (Marine)": "/static/static/icons/sc2/magrailmunitions.png", - "Optimized Logistics (Marine)": "/static/static/icons/sc2/optimizedlogistics.png", - "Advanced Medic Facilities (Medic)": "https://0rganics.org/archipelago/sc2wol/AdvancedMedicFacilities.png", - "Stabilizer Medpacks (Medic)": "https://0rganics.org/archipelago/sc2wol/StabilizerMedpacks.png", - "Restoration (Medic)": "/static/static/icons/sc2/restoration.png", - "Optical Flare (Medic)": "/static/static/icons/sc2/opticalflare.png", - "Optimized Logistics (Medic)": "/static/static/icons/sc2/optimizedlogistics.png", - "Incinerator Gauntlets (Firebat)": "https://0rganics.org/archipelago/sc2wol/IncineratorGauntlets.png", - "Juggernaut Plating (Firebat)": "https://0rganics.org/archipelago/sc2wol/JuggernautPlating.png", - "Stimpack (Firebat)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png", - "Super Stimpack (Firebat)": "/static/static/icons/sc2/superstimpack.png", - "Optimized Logistics (Firebat)": "/static/static/icons/sc2/optimizedlogistics.png", - "Concussive Shells (Marauder)": "https://0rganics.org/archipelago/sc2wol/ConcussiveShellsCampaign.png", - "Kinetic Foam (Marauder)": "https://0rganics.org/archipelago/sc2wol/KineticFoam.png", - "Stimpack (Marauder)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png", - "Super Stimpack (Marauder)": "/static/static/icons/sc2/superstimpack.png", - "Laser Targeting System (Marauder)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Magrail Munitions (Marauder)": "/static/static/icons/sc2/magrailmunitions.png", - "Internal Tech Module (Marauder)": "/static/static/icons/sc2/internalizedtechmodule.png", - "U-238 Rounds (Reaper)": "https://0rganics.org/archipelago/sc2wol/U-238Rounds.png", - "G-4 Clusterbomb (Reaper)": "https://0rganics.org/archipelago/sc2wol/G-4Clusterbomb.png", - "Stimpack (Reaper)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png", - "Super Stimpack (Reaper)": "/static/static/icons/sc2/superstimpack.png", - "Laser Targeting System (Reaper)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Advanced Cloaking Field (Reaper)": "/static/static/icons/sc2/terran-cloak-color.png", - "Spider Mines (Reaper)": "/static/static/icons/sc2/spidermine.png", - "Combat Drugs (Reaper)": "/static/static/icons/sc2/reapercombatdrugs.png", + "Ghost": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Ghost_SC2_Icon1.jpg", + "Spectre": github_icon_base_url + "original/btn-unit-terran-spectre.png", + "HERC": github_icon_base_url + "blizzard/btn-unit-terran-herc.png", + + "Stimpack (Marine)": github_icon_base_url + "blizzard/btn-ability-terran-stimpack-color.png", + "Super Stimpack (Marine)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Combat Shield (Marine)": github_icon_base_url + "blizzard/btn-techupgrade-terran-combatshield-color.png", + "Laser Targeting System (Marine)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Magrail Munitions (Marine)": github_icon_base_url + "blizzard/btn-upgrade-terran-magrailmunitions.png", + "Optimized Logistics (Marine)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Advanced Medic Facilities (Medic)": organics_icon_base_url + "AdvancedMedicFacilities.png", + "Stabilizer Medpacks (Medic)": github_icon_base_url + "blizzard/btn-upgrade-raynor-stabilizermedpacks.png", + "Restoration (Medic)": github_icon_base_url + "original/btn-ability-terran-restoration@scbw.png", + "Optical Flare (Medic)": github_icon_base_url + "blizzard/btn-upgrade-protoss-fenix-dragoonsolariteflare.png", + "Resource Efficiency (Medic)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Adaptive Medpacks (Medic)": github_icon_base_url + "blizzard/btn-ability-terran-heal-color.png", + "Nano Projector (Medic)": github_icon_base_url + "blizzard/talent-raynor-level03-firebatmedicrange.png", + "Incinerator Gauntlets (Firebat)": github_icon_base_url + "blizzard/btn-upgrade-raynor-incineratorgauntlets.png", + "Juggernaut Plating (Firebat)": github_icon_base_url + "blizzard/btn-upgrade-raynor-juggernautplating.png", + "Stimpack (Firebat)": github_icon_base_url + "blizzard/btn-ability-terran-stimpack-color.png", + "Super Stimpack (Firebat)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Resource Efficiency (Firebat)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Infernal Pre-Igniter (Firebat)": github_icon_base_url + "blizzard/btn-upgrade-terran-infernalpreigniter.png", + "Kinetic Foam (Firebat)": organics_icon_base_url + "KineticFoam.png", + "Nano Projectors (Firebat)": github_icon_base_url + "blizzard/talent-raynor-level03-firebatmedicrange.png", + "Concussive Shells (Marauder)": github_icon_base_url + "blizzard/btn-ability-terran-punishergrenade-color.png", + "Kinetic Foam (Marauder)": organics_icon_base_url + "KineticFoam.png", + "Stimpack (Marauder)": github_icon_base_url + "blizzard/btn-ability-terran-stimpack-color.png", + "Super Stimpack (Marauder)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Laser Targeting System (Marauder)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Magrail Munitions (Marauder)": github_icon_base_url + "blizzard/btn-upgrade-terran-magrailmunitions.png", + "Internal Tech Module (Marauder)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Juggernaut Plating (Marauder)": organics_icon_base_url + "JuggernautPlating.png", + "U-238 Rounds (Reaper)": organics_icon_base_url + "U-238Rounds.png", + "G-4 Clusterbomb (Reaper)": github_icon_base_url + "blizzard/btn-upgrade-terran-kd8chargeex3.png", + "Stimpack (Reaper)": github_icon_base_url + "blizzard/btn-ability-terran-stimpack-color.png", + "Super Stimpack (Reaper)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Laser Targeting System (Reaper)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Advanced Cloaking Field (Reaper)": github_icon_base_url + "original/btn-permacloak-reaper.png", + "Spider Mines (Reaper)": github_icon_base_url + "original/btn-ability-terran-spidermine.png", + "Combat Drugs (Reaper)": github_icon_base_url + "blizzard/btn-upgrade-terran-reapercombatdrugs.png", + "Jet Pack Overdrive (Reaper)": github_icon_base_url + "blizzard/btn-ability-hornerhan-reaper-flightmode.png", + "Ocular Implants (Ghost)": organics_icon_base_url + "OcularImplants.png", + "Crius Suit (Ghost)": github_icon_base_url + "original/btn-permacloak-ghost.png", + "EMP Rounds (Ghost)": github_icon_base_url + "blizzard/btn-ability-terran-emp-color.png", + "Lockdown (Ghost)": github_icon_base_url + "original/btn-abilty-terran-lockdown@scbw.png", + "Resource Efficiency (Ghost)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Psionic Lash (Spectre)": organics_icon_base_url + "PsionicLash.png", + "Nyx-Class Cloaking Module (Spectre)": github_icon_base_url + "original/btn-permacloak-spectre.png", + "Impaler Rounds (Spectre)": github_icon_base_url + "blizzard/btn-techupgrade-terran-impalerrounds.png", + "Resource Efficiency (Spectre)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Juggernaut Plating (HERC)": organics_icon_base_url + "JuggernautPlating.png", + "Kinetic Foam (HERC)": organics_icon_base_url + "KineticFoam.png", "Hellion": "https://static.wikia.nocookie.net/starcraft/images/5/56/Hellion_SC2_Icon1.jpg", - "Vulture": "https://static.wikia.nocookie.net/starcraft/images/d/da/Vulture_WoL.jpg", - "Goliath": "https://static.wikia.nocookie.net/starcraft/images/e/eb/Goliath_WoL.jpg", - "Diamondback": "https://static.wikia.nocookie.net/starcraft/images/a/a6/Diamondback_WoL.jpg", + "Vulture": github_icon_base_url + "blizzard/btn-unit-terran-vulture.png", + "Goliath": github_icon_base_url + "blizzard/btn-unit-terran-goliath.png", + "Diamondback": github_icon_base_url + "blizzard/btn-unit-terran-cobra.png", "Siege Tank": "https://static.wikia.nocookie.net/starcraft/images/5/57/SiegeTank_SC2_Icon1.jpg", - - "Twin-Linked Flamethrower (Hellion)": "https://0rganics.org/archipelago/sc2wol/Twin-LinkedFlamethrower.png", - "Thermite Filaments (Hellion)": "https://0rganics.org/archipelago/sc2wol/ThermiteFilaments.png", - "Hellbat Aspect (Hellion)": "/static/static/icons/sc2/hellionbattlemode.png", - "Smart Servos (Hellion)": "/static/static/icons/sc2/transformationservos.png", - "Optimized Logistics (Hellion)": "/static/static/icons/sc2/optimizedlogistics.png", - "Jump Jets (Hellion)": "/static/static/icons/sc2/jumpjets.png", - "Stimpack (Hellion)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png", - "Super Stimpack (Hellion)": "/static/static/icons/sc2/superstimpack.png", - "Cerberus Mine (Spider Mine)": "https://0rganics.org/archipelago/sc2wol/CerberusMine.png", - "High Explosive Munition (Spider Mine)": "/static/static/icons/sc2/high-explosive-spidermine.png", - "Replenishable Magazine (Vulture)": "https://0rganics.org/archipelago/sc2wol/ReplenishableMagazine.png", - "Ion Thrusters (Vulture)": "/static/static/icons/sc2/emergencythrusters.png", - "Auto Launchers (Vulture)": "/static/static/icons/sc2/jotunboosters.png", - "Multi-Lock Weapons System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Multi-LockWeaponsSystem.png", - "Ares-Class Targeting System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Ares-ClassTargetingSystem.png", - "Jump Jets (Goliath)": "/static/static/icons/sc2/jumpjets.png", - "Optimized Logistics (Goliath)": "/static/static/icons/sc2/optimizedlogistics.png", - "Tri-Lithium Power Cell (Diamondback)": "https://0rganics.org/archipelago/sc2wol/Tri-LithiumPowerCell.png", - "Shaped Hull (Diamondback)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png", - "Hyperfluxor (Diamondback)": "/static/static/icons/sc2/hyperfluxor.png", - "Burst Capacitors (Diamondback)": "/static/static/icons/sc2/burstcapacitors.png", - "Optimized Logistics (Diamondback)": "/static/static/icons/sc2/optimizedlogistics.png", - "Maelstrom Rounds (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/MaelstromRounds.png", - "Shaped Blast (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/ShapedBlast.png", - "Jump Jets (Siege Tank)": "/static/static/icons/sc2/jumpjets.png", - "Spider Mines (Siege Tank)": "/static/static/icons/sc2/siegetank-spidermines.png", - "Smart Servos (Siege Tank)": "/static/static/icons/sc2/transformationservos.png", - "Graduating Range (Siege Tank)": "/static/static/icons/sc2/siegetankrange.png", - "Laser Targeting System (Siege Tank)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Advanced Siege Tech (Siege Tank)": "/static/static/icons/sc2/improvedsiegemode.png", - "Internal Tech Module (Siege Tank)": "/static/static/icons/sc2/internalizedtechmodule.png", + "Thor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/Thor_SC2_Icon1.jpg", + "Predator": github_icon_base_url + "original/btn-unit-terran-predator.png", + "Widow Mine": github_icon_base_url + "blizzard/btn-unit-terran-widowmine.png", + "Cyclone": github_icon_base_url + "blizzard/btn-unit-terran-cyclone.png", + "Warhound": github_icon_base_url + "blizzard/btn-unit-terran-warhound.png", + + "Twin-Linked Flamethrower (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-mengsk-trooper-flamethrower.png", + "Thermite Filaments (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-terran-infernalpreigniter.png", + "Hellbat Aspect (Hellion)": github_icon_base_url + "blizzard/btn-unit-terran-hellionbattlemode.png", + "Smart Servos (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Optimized Logistics (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Jump Jets (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-terran-jumpjets.png", + "Stimpack (Hellion)": github_icon_base_url + "blizzard/btn-ability-terran-stimpack-color.png", + "Super Stimpack (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Infernal Plating (Hellion)": github_icon_base_url + "blizzard/btn-upgrade-swann-hellarmor.png", + "Cerberus Mine (Spider Mine)": github_icon_base_url + "blizzard/btn-upgrade-raynor-cerberusmines.png", + "High Explosive Munition (Spider Mine)": github_icon_base_url + "original/btn-ability-terran-spidermine.png", + "Replenishable Magazine (Vulture)": github_icon_base_url + "blizzard/btn-upgrade-raynor-replenishablemagazine.png", + "Replenishable Magazine (Free) (Vulture)": github_icon_base_url + "blizzard/btn-upgrade-raynor-replenishablemagazine.png", + "Ion Thrusters (Vulture)": github_icon_base_url + "blizzard/btn-ability-terran-emergencythrusters.png", + "Auto Launchers (Vulture)": github_icon_base_url + "blizzard/btn-upgrade-terran-jotunboosters.png", + "Auto-Repair (Vulture)": github_icon_base_url + "blizzard/ui_tipicon_campaign_space01-repair.png", + "Multi-Lock Weapons System (Goliath)": github_icon_base_url + "blizzard/btn-upgrade-swann-multilockweaponsystem.png", + "Ares-Class Targeting System (Goliath)": github_icon_base_url + "blizzard/btn-upgrade-swann-aresclasstargetingsystem.png", + "Jump Jets (Goliath)": github_icon_base_url + "blizzard/btn-upgrade-terran-jumpjets.png", + "Optimized Logistics (Goliath)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Shaped Hull (Goliath)": organics_icon_base_url + "ShapedHull.png", + "Resource Efficiency (Goliath)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Internal Tech Module (Goliath)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Tri-Lithium Power Cell (Diamondback)": github_icon_base_url + "original/btn-upgrade-terran-trilithium-power-cell.png", + "Tungsten Spikes (Diamondback)": github_icon_base_url + "original/btn-upgrade-terran-tungsten-spikes.png", + "Shaped Hull (Diamondback)": organics_icon_base_url + "ShapedHull.png", + "Hyperfluxor (Diamondback)": github_icon_base_url + "blizzard/btn-upgrade-mengsk-engineeringbay-orbitaldrop.png", + "Burst Capacitors (Diamondback)": github_icon_base_url + "blizzard/btn-ability-terran-electricfield.png", + "Ion Thrusters (Diamondback)": github_icon_base_url + "blizzard/btn-ability-terran-emergencythrusters.png", + "Resource Efficiency (Diamondback)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Maelstrom Rounds (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-raynor-maelstromrounds.png", + "Shaped Blast (Siege Tank)": organics_icon_base_url + "ShapedBlast.png", + "Jump Jets (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-terran-jumpjets.png", + "Spider Mines (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-siegetank-spidermines.png", + "Smart Servos (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Graduating Range (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-siegetankrange.png", + "Laser Targeting System (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Advanced Siege Tech (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-raynor-improvedsiegemode.png", + "Internal Tech Module (Siege Tank)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Shaped Hull (Siege Tank)": organics_icon_base_url + "ShapedHull.png", + "Resource Efficiency (Siege Tank)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "330mm Barrage Cannon (Thor)": github_icon_base_url + "original/btn-ability-thor-330mm.png", + "Immortality Protocol (Thor)": github_icon_base_url + "blizzard/btn-techupgrade-terran-immortalityprotocol.png", + "Immortality Protocol (Free) (Thor)": github_icon_base_url + "blizzard/btn-techupgrade-terran-immortalityprotocol.png", + "High Impact Payload (Thor)": github_icon_base_url + "blizzard/btn-unit-terran-thorsiegemode.png", + "Smart Servos (Thor)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Button With a Skull on It (Thor)": github_icon_base_url + "blizzard/btn-ability-terran-nuclearstrike-color.png", + "Laser Targeting System (Thor)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Large Scale Field Construction (Thor)": github_icon_base_url + "blizzard/talent-swann-level12-immortalityprotocol.png", + "Resource Efficiency (Predator)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Cloak (Predator)": github_icon_base_url + "blizzard/btn-ability-terran-cloak-color.png", + "Charge (Predator)": github_icon_base_url + "blizzard/btn-ability-protoss-charge-color.png", + "Predator's Fury (Predator)": github_icon_base_url + "blizzard/btn-ability-protoss-shadowfury.png", + "Drilling Claws (Widow Mine)": github_icon_base_url + "blizzard/btn-upgrade-terran-researchdrillingclaws.png", + "Concealment (Widow Mine)": github_icon_base_url + "blizzard/btn-ability-terran-widowminehidden.png", + "Black Market Launchers (Widow Mine)": github_icon_base_url + "blizzard/btn-ability-hornerhan-widowmine-attackrange.png", + "Executioner Missiles (Widow Mine)": github_icon_base_url + "blizzard/btn-ability-hornerhan-widowmine-deathblossom.png", + "Mag-Field Accelerators (Cyclone)": github_icon_base_url + "blizzard/btn-upgrade-terran-magfieldaccelerator.png", + "Mag-Field Launchers (Cyclone)": github_icon_base_url + "blizzard/btn-upgrade-terran-cyclonerangeupgrade.png", + "Targeting Optics (Cyclone)": github_icon_base_url + "blizzard/btn-upgrade-swann-targetingoptics.png", + "Rapid Fire Launchers (Cyclone)": github_icon_base_url + "blizzard/btn-upgrade-raynor-ripwavemissiles.png", + "Resource Efficiency (Cyclone)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Internal Tech Module (Cyclone)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Resource Efficiency (Warhound)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Reinforced Plating (Warhound)": github_icon_base_url + "original/btn-research-zerg-fortifiedbunker.png", "Medivac": "https://static.wikia.nocookie.net/starcraft/images/d/db/Medivac_SC2_Icon1.jpg", - "Wraith": "https://static.wikia.nocookie.net/starcraft/images/7/75/Wraith_WoL.jpg", + "Wraith": github_icon_base_url + "blizzard/btn-unit-terran-wraith.png", "Viking": "https://static.wikia.nocookie.net/starcraft/images/2/2a/Viking_SC2_Icon1.jpg", "Banshee": "https://static.wikia.nocookie.net/starcraft/images/3/32/Banshee_SC2_Icon1.jpg", "Battlecruiser": "https://static.wikia.nocookie.net/starcraft/images/f/f5/Battlecruiser_SC2_Icon1.jpg", - - "Rapid Deployment Tube (Medivac)": "https://0rganics.org/archipelago/sc2wol/RapidDeploymentTube.png", - "Advanced Healing AI (Medivac)": "https://0rganics.org/archipelago/sc2wol/AdvancedHealingAI.png", - "Expanded Hull (Medivac)": "/static/static/icons/sc2/neosteelfortifiedarmor.png", - "Afterburners (Medivac)": "/static/static/icons/sc2/medivacemergencythrusters.png", - "Tomahawk Power Cells (Wraith)": "https://0rganics.org/archipelago/sc2wol/TomahawkPowerCells.png", - "Displacement Field (Wraith)": "https://0rganics.org/archipelago/sc2wol/DisplacementField.png", - "Advanced Laser Technology (Wraith)": "/static/static/icons/sc2/improvedburstlaser.png", - "Ripwave Missiles (Viking)": "https://0rganics.org/archipelago/sc2wol/RipwaveMissiles.png", - "Phobos-Class Weapons System (Viking)": "https://0rganics.org/archipelago/sc2wol/Phobos-ClassWeaponsSystem.png", - "Smart Servos (Viking)": "/static/static/icons/sc2/transformationservos.png", - "Magrail Munitions (Viking)": "/static/static/icons/sc2/magrailmunitions.png", - "Cross-Spectrum Dampeners (Banshee)": "/static/static/icons/sc2/crossspectrumdampeners.png", - "Advanced Cross-Spectrum Dampeners (Banshee)": "https://0rganics.org/archipelago/sc2wol/Cross-SpectrumDampeners.png", - "Shockwave Missile Battery (Banshee)": "https://0rganics.org/archipelago/sc2wol/ShockwaveMissileBattery.png", - "Hyperflight Rotors (Banshee)": "/static/static/icons/sc2/hyperflightrotors.png", - "Laser Targeting System (Banshee)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Internal Tech Module (Banshee)": "/static/static/icons/sc2/internalizedtechmodule.png", - "Missile Pods (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/MissilePods.png", - "Defensive Matrix (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png", - "Tactical Jump (Battlecruiser)": "/static/static/icons/sc2/warpjump.png", - "Cloak (Battlecruiser)": "/static/static/icons/sc2/terran-cloak-color.png", - "ATX Laser Battery (Battlecruiser)": "/static/static/icons/sc2/specialordance.png", - "Optimized Logistics (Battlecruiser)": "/static/static/icons/sc2/optimizedlogistics.png", - "Internal Tech Module (Battlecruiser)": "/static/static/icons/sc2/internalizedtechmodule.png", - - "Ghost": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Ghost_SC2_Icon1.jpg", - "Spectre": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Spectre_WoL.jpg", - "Thor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/Thor_SC2_Icon1.jpg", - - "Widow Mine": "/static/static/icons/sc2/widowmine.png", - "Cyclone": "/static/static/icons/sc2/cyclone.png", - "Liberator": "/static/static/icons/sc2/liberator.png", - "Valkyrie": "/static/static/icons/sc2/valkyrie.png", - - "Ocular Implants (Ghost)": "https://0rganics.org/archipelago/sc2wol/OcularImplants.png", - "Crius Suit (Ghost)": "https://0rganics.org/archipelago/sc2wol/CriusSuit.png", - "EMP Rounds (Ghost)": "/static/static/icons/sc2/terran-emp-color.png", - "Lockdown (Ghost)": "/static/static/icons/sc2/lockdown.png", - "Psionic Lash (Spectre)": "https://0rganics.org/archipelago/sc2wol/PsionicLash.png", - "Nyx-Class Cloaking Module (Spectre)": "https://0rganics.org/archipelago/sc2wol/Nyx-ClassCloakingModule.png", - "Impaler Rounds (Spectre)": "/static/static/icons/sc2/impalerrounds.png", - "330mm Barrage Cannon (Thor)": "https://0rganics.org/archipelago/sc2wol/330mmBarrageCannon.png", - "Immortality Protocol (Thor)": "https://0rganics.org/archipelago/sc2wol/ImmortalityProtocol.png", - "High Impact Payload (Thor)": "/static/static/icons/sc2/thorsiegemode.png", - "Smart Servos (Thor)": "/static/static/icons/sc2/transformationservos.png", - - "Optimized Logistics (Predator)": "/static/static/icons/sc2/optimizedlogistics.png", - "Drilling Claws (Widow Mine)": "/static/static/icons/sc2/drillingclaws.png", - "Concealment (Widow Mine)": "/static/static/icons/sc2/widowminehidden.png", - "Black Market Launchers (Widow Mine)": "/static/static/icons/sc2/widowmine-attackrange.png", - "Executioner Missiles (Widow Mine)": "/static/static/icons/sc2/widowmine-deathblossom.png", - "Mag-Field Accelerators (Cyclone)": "/static/static/icons/sc2/magfieldaccelerator.png", - "Mag-Field Launchers (Cyclone)": "/static/static/icons/sc2/cyclonerangeupgrade.png", - "Targeting Optics (Cyclone)": "/static/static/icons/sc2/targetingoptics.png", - "Rapid Fire Launchers (Cyclone)": "/static/static/icons/sc2/ripwavemissiles.png", - "Bio Mechanical Repair Drone (Raven)": "/static/static/icons/sc2/biomechanicaldrone.png", - "Spider Mines (Raven)": "/static/static/icons/sc2/siegetank-spidermines.png", - "Railgun Turret (Raven)": "/static/static/icons/sc2/autoturretblackops.png", - "Hunter-Seeker Weapon (Raven)": "/static/static/icons/sc2/specialordance.png", - "Interference Matrix (Raven)": "/static/static/icons/sc2/interferencematrix.png", - "Anti-Armor Missile (Raven)": "/static/static/icons/sc2/shreddermissile.png", - "Internal Tech Module (Raven)": "/static/static/icons/sc2/internalizedtechmodule.png", - "EMP Shockwave (Science Vessel)": "/static/static/icons/sc2/staticempblast.png", - "Defensive Matrix (Science Vessel)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png", - "Advanced Ballistics (Liberator)": "/static/static/icons/sc2/advanceballistics.png", - "Raid Artillery (Liberator)": "/static/static/icons/sc2/terrandefendermodestructureattack.png", - "Cloak (Liberator)": "/static/static/icons/sc2/terran-cloak-color.png", - "Laser Targeting System (Liberator)": "/static/static/icons/sc2/lasertargetingsystem.png", - "Optimized Logistics (Liberator)": "/static/static/icons/sc2/optimizedlogistics.png", - "Enhanced Cluster Launchers (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png", - "Shaped Hull (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png", - "Burst Lasers (Valkyrie)": "/static/static/icons/sc2/improvedburstlaser.png", - "Afterburners (Valkyrie)": "/static/static/icons/sc2/medivacemergencythrusters.png", + "Raven": "https://static.wikia.nocookie.net/starcraft/images/1/19/SC2_Lab_Raven_Icon.png", + "Science Vessel": "https://static.wikia.nocookie.net/starcraft/images/c/c3/SC2_Lab_SciVes_Icon.png", + "Hercules": "https://static.wikia.nocookie.net/starcraft/images/4/40/SC2_Lab_Hercules_Icon.png", + "Liberator": github_icon_base_url + "blizzard/btn-unit-terran-liberator.png", + "Valkyrie": github_icon_base_url + "original/btn-unit-terran-valkyrie@scbw.png", + + "Rapid Deployment Tube (Medivac)": organics_icon_base_url + "RapidDeploymentTube.png", + "Advanced Healing AI (Medivac)": github_icon_base_url + "blizzard/btn-ability-mengsk-medivac-doublehealbeam.png", + "Expanded Hull (Medivac)": github_icon_base_url + "blizzard/btn-upgrade-mengsk-engineeringbay-neosteelfortifiedarmor.png", + "Afterburners (Medivac)": github_icon_base_url + "blizzard/btn-upgrade-terran-medivacemergencythrusters.png", + "Scatter Veil (Medivac)": github_icon_base_url + "blizzard/btn-upgrade-swann-defensivematrix.png", + "Advanced Cloaking Field (Medivac)": github_icon_base_url + "original/btn-permacloak-medivac.png", + "Tomahawk Power Cells (Wraith)": organics_icon_base_url + "TomahawkPowerCells.png", + "Unregistered Cloaking Module (Wraith)": github_icon_base_url + "original/btn-permacloak-wraith.png", + "Trigger Override (Wraith)": github_icon_base_url + "blizzard/btn-ability-hornerhan-wraith-attackspeed.png", + "Internal Tech Module (Wraith)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Resource Efficiency (Wraith)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Displacement Field (Wraith)": github_icon_base_url + "blizzard/btn-upgrade-swann-displacementfield.png", + "Advanced Laser Technology (Wraith)": github_icon_base_url + "blizzard/btn-upgrade-swann-improvedburstlaser.png", + "Ripwave Missiles (Viking)": github_icon_base_url + "blizzard/btn-upgrade-raynor-ripwavemissiles.png", + "Phobos-Class Weapons System (Viking)": github_icon_base_url + "blizzard/btn-upgrade-raynor-phobosclassweaponssystem.png", + "Smart Servos (Viking)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Anti-Mechanical Munition (Viking)": github_icon_base_url + "blizzard/btn-ability-terran-ignorearmor.png", + "Shredder Rounds (Viking)": github_icon_base_url + "blizzard/btn-ability-hornerhan-viking-piercingattacks.png", + "W.I.L.D. Missiles (Viking)": github_icon_base_url + "blizzard/btn-ability-hornerhan-viking-missileupgrade.png", + "Cross-Spectrum Dampeners (Banshee)": github_icon_base_url + "original/btn-banshee-cross-spectrum-dampeners.png", + "Advanced Cross-Spectrum Dampeners (Banshee)": github_icon_base_url + "original/btn-permacloak-banshee.png", + "Shockwave Missile Battery (Banshee)": github_icon_base_url + "blizzard/btn-upgrade-raynor-shockwavemissilebattery.png", + "Hyperflight Rotors (Banshee)": github_icon_base_url + "blizzard/btn-upgrade-terran-hyperflightrotors.png", + "Laser Targeting System (Banshee)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Internal Tech Module (Banshee)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Shaped Hull (Banshee)": organics_icon_base_url + "ShapedHull.png", + "Advanced Targeting Optics (Banshee)": github_icon_base_url + "blizzard/btn-ability-terran-detectionconedebuff.png", + "Distortion Blasters (Banshee)": github_icon_base_url + "blizzard/btn-techupgrade-terran-cloakdistortionfield.png", + "Rocket Barrage (Banshee)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-bansheemissilestrik.png", + "Missile Pods (Battlecruiser) Level 1": organics_icon_base_url + "MissilePods.png", + "Missile Pods (Battlecruiser) Level 2": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-bansheemissilestrik.png", + "Defensive Matrix (Battlecruiser)": github_icon_base_url + "blizzard/btn-upgrade-swann-defensivematrix.png", + "Advanced Defensive Matrix (Battlecruiser)": github_icon_base_url + "blizzard/btn-upgrade-swann-defensivematrix.png", + "Tactical Jump (Battlecruiser)": github_icon_base_url + "blizzard/btn-ability-terran-warpjump.png", + "Cloak (Battlecruiser)": github_icon_base_url + "blizzard/btn-ability-terran-cloak-color.png", + "ATX Laser Battery (Battlecruiser)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-specialordance.png", + "Optimized Logistics (Battlecruiser)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Internal Tech Module (Battlecruiser)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Behemoth Plating (Battlecruiser)": github_icon_base_url + "original/btn-research-zerg-fortifiedbunker.png", + "Covert Ops Engines (Battlecruiser)": github_icon_base_url + "blizzard/btn-ability-terran-emergencythrusters.png", + "Bio Mechanical Repair Drone (Raven)": github_icon_base_url + "blizzard/btn-unit-biomechanicaldrone.png", + "Spider Mines (Raven)": github_icon_base_url + "blizzard/btn-upgrade-siegetank-spidermines.png", + "Railgun Turret (Raven)": github_icon_base_url + "blizzard/btn-unit-terran-autoturretblackops.png", + "Hunter-Seeker Weapon (Raven)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-specialordance.png", + "Interference Matrix (Raven)": github_icon_base_url + "blizzard/btn-upgrade-terran-interferencematrix.png", + "Anti-Armor Missile (Raven)": github_icon_base_url + "blizzard/btn-ability-terran-shreddermissile-color.png", + "Internal Tech Module (Raven)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Resource Efficiency (Raven)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Durable Materials (Raven)": github_icon_base_url + "blizzard/btn-upgrade-terran-durablematerials.png", + "EMP Shockwave (Science Vessel)": github_icon_base_url + "blizzard/btn-ability-mengsk-ghost-staticempblast.png", + "Defensive Matrix (Science Vessel)": github_icon_base_url + "blizzard/btn-upgrade-swann-defensivematrix.png", + "Improved Nano-Repair (Science Vessel)": github_icon_base_url + "blizzard/btn-upgrade-swann-improvednanorepair.png", + "Advanced AI Systems (Science Vessel)": github_icon_base_url + "blizzard/btn-ability-mengsk-medivac-doublehealbeam.png", + "Internal Fusion Module (Hercules)": github_icon_base_url + "blizzard/btn-upgrade-terran-internalizedtechmodule.png", + "Tactical Jump (Hercules)": github_icon_base_url + "blizzard/btn-ability-terran-hercules-tacticaljump.png", + "Advanced Ballistics (Liberator)": github_icon_base_url + "blizzard/btn-upgrade-terran-advanceballistics.png", + "Raid Artillery (Liberator)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-terrandefendermodestructureattack.png", + "Cloak (Liberator)": github_icon_base_url + "blizzard/btn-ability-terran-cloak-color.png", + "Laser Targeting System (Liberator)": github_icon_base_url + "blizzard/btn-upgrade-terran-lazertargetingsystem.png", + "Optimized Logistics (Liberator)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Smart Servos (Liberator)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Resource Efficiency (Liberator)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Enhanced Cluster Launchers (Valkyrie)": github_icon_base_url + "blizzard/btn-ability-stetmann-corruptormissilebarrage.png", + "Shaped Hull (Valkyrie)": organics_icon_base_url + "ShapedHull.png", + "Flechette Missiles (Valkyrie)": github_icon_base_url + "blizzard/btn-ability-hornerhan-viking-missileupgrade.png", + "Afterburners (Valkyrie)": github_icon_base_url + "blizzard/btn-upgrade-terran-medivacemergencythrusters.png", + "Launching Vector Compensator (Valkyrie)": github_icon_base_url + "blizzard/btn-ability-terran-emergencythrusters.png", + "Resource Efficiency (Valkyrie)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", "War Pigs": "https://static.wikia.nocookie.net/starcraft/images/e/ed/WarPigs_SC2_Icon1.jpg", "Devil Dogs": "https://static.wikia.nocookie.net/starcraft/images/3/33/DevilDogs_SC2_Icon1.jpg", "Hammer Securities": "https://static.wikia.nocookie.net/starcraft/images/3/3b/HammerSecurity_SC2_Icon1.jpg", "Spartan Company": "https://static.wikia.nocookie.net/starcraft/images/b/be/SpartanCompany_SC2_Icon1.jpg", "Siege Breakers": "https://static.wikia.nocookie.net/starcraft/images/3/31/SiegeBreakers_SC2_Icon1.jpg", - "Hel's Angel": "https://static.wikia.nocookie.net/starcraft/images/6/63/HelsAngels_SC2_Icon1.jpg", + "Hel's Angels": "https://static.wikia.nocookie.net/starcraft/images/6/63/HelsAngels_SC2_Icon1.jpg", "Dusk Wings": "https://static.wikia.nocookie.net/starcraft/images/5/52/DuskWings_SC2_Icon1.jpg", "Jackson's Revenge": "https://static.wikia.nocookie.net/starcraft/images/9/95/JacksonsRevenge_SC2_Icon1.jpg", + "Skibi's Angels": github_icon_base_url + "blizzard/btn-unit-terran-medicelite.png", + "Death Heads": github_icon_base_url + "blizzard/btn-unit-terran-deathhead.png", + "Winged Nightmares": github_icon_base_url + "blizzard/btn-unit-collection-wraith-junker.png", + "Midnight Riders": github_icon_base_url + "blizzard/btn-unit-terran-liberatorblackops.png", + "Brynhilds": github_icon_base_url + "blizzard/btn-unit-collection-vikingfighter-covertops.png", + "Jotun": github_icon_base_url + "blizzard/btn-unit-terran-thormengsk.png", "Ultra-Capacitors": "https://static.wikia.nocookie.net/starcraft/images/2/23/SC2_Lab_Ultra_Capacitors_Icon.png", "Vanadium Plating": "https://static.wikia.nocookie.net/starcraft/images/6/67/SC2_Lab_VanPlating_Icon.png", @@ -1766,8 +1852,6 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int "Micro-Filtering": "https://static.wikia.nocookie.net/starcraft/images/2/20/SC2_Lab_MicroFilter_Icon.png", "Automated Refinery": "https://static.wikia.nocookie.net/starcraft/images/7/71/SC2_Lab_Auto_Refinery_Icon.png", "Command Center Reactor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/SC2_Lab_CC_Reactor_Icon.png", - "Raven": "https://static.wikia.nocookie.net/starcraft/images/1/19/SC2_Lab_Raven_Icon.png", - "Science Vessel": "https://static.wikia.nocookie.net/starcraft/images/c/c3/SC2_Lab_SciVes_Icon.png", "Tech Reactor": "https://static.wikia.nocookie.net/starcraft/images/c/c5/SC2_Lab_Tech_Reactor_Icon.png", "Orbital Strike": "https://static.wikia.nocookie.net/starcraft/images/d/df/SC2_Lab_Orb_Strike_Icon.png", @@ -1775,23 +1859,372 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int "Fortified Bunker (Bunker)": "https://static.wikia.nocookie.net/starcraft/images/4/4f/SC2_Lab_FortBunker_Icon.png", "Planetary Fortress": "https://static.wikia.nocookie.net/starcraft/images/0/0b/SC2_Lab_PlanetFortress_Icon.png", "Perdition Turret": "https://static.wikia.nocookie.net/starcraft/images/a/af/SC2_Lab_PerdTurret_Icon.png", - "Predator": "https://static.wikia.nocookie.net/starcraft/images/8/83/SC2_Lab_Predator_Icon.png", - "Hercules": "https://static.wikia.nocookie.net/starcraft/images/4/40/SC2_Lab_Hercules_Icon.png", "Cellular Reactor": "https://static.wikia.nocookie.net/starcraft/images/d/d8/SC2_Lab_CellReactor_Icon.png", - "Regenerative Bio-Steel Level 1": "/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png", - "Regenerative Bio-Steel Level 2": "/static/static/icons/sc2/SC2_Lab_BioSteel_L2.png", + "Regenerative Bio-Steel Level 1": github_icon_base_url + "original/btn-regenerativebiosteel-green.png", + "Regenerative Bio-Steel Level 2": github_icon_base_url + "original/btn-regenerativebiosteel-blue.png", + "Regenerative Bio-Steel Level 3": github_icon_base_url + "blizzard/btn-research-zerg-regenerativebio-steel.png", "Hive Mind Emulator": "https://static.wikia.nocookie.net/starcraft/images/b/bc/SC2_Lab_Hive_Emulator_Icon.png", "Psi Disrupter": "https://static.wikia.nocookie.net/starcraft/images/c/cf/SC2_Lab_Psi_Disruptor_Icon.png", - "Zealot": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Icon_Protoss_Zealot.jpg", + "Structure Armor": github_icon_base_url + "blizzard/btn-upgrade-terran-buildingarmor.png", + "Hi-Sec Auto Tracking": github_icon_base_url + "blizzard/btn-upgrade-terran-hisecautotracking.png", + "Advanced Optics": github_icon_base_url + "blizzard/btn-upgrade-swann-vehiclerangeincrease.png", + "Rogue Forces": github_icon_base_url + "blizzard/btn-unit-terran-tosh.png", + + "Ghost Visor (Nova Equipment)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-ghostvisor.png", + "Rangefinder Oculus (Nova Equipment)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-rangefinderoculus.png", + "Domination (Nova Ability)": github_icon_base_url + "blizzard/btn-ability-nova-domination.png", + "Blink (Nova Ability)": github_icon_base_url + "blizzard/btn-upgrade-nova-blink.png", + "Stealth Suit Module (Nova Suit Module)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-stealthsuit.png", + "Cloak (Nova Suit Module)": github_icon_base_url + "blizzard/btn-ability-terran-cloak-color.png", + "Permanently Cloaked (Nova Suit Module)": github_icon_base_url + "blizzard/btn-upgrade-nova-tacticalstealthsuit.png", + "Energy Suit Module (Nova Suit Module)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-apolloinfantrysuit.png", + "Armored Suit Module (Nova Suit Module)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-blinksuit.png", + "Jump Suit Module (Nova Suit Module)": github_icon_base_url + "blizzard/btn-upgrade-nova-jetpack.png", + "C20A Canister Rifle (Nova Weapon)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-canisterrifle.png", + "Hellfire Shotgun (Nova Weapon)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-shotgun.png", + "Plasma Rifle (Nova Weapon)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-plasmagun.png", + "Monomolecular Blade (Nova Weapon)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-monomolecularblade.png", + "Blazefire Gunblade (Nova Weapon)": github_icon_base_url + "blizzard/btn-upgrade-nova-equipment-gunblade_sword.png", + "Stim Infusion (Nova Gadget)": github_icon_base_url + "blizzard/btn-upgrade-terran-superstimppack.png", + "Pulse Grenades (Nova Gadget)": github_icon_base_url + "blizzard/btn-upgrade-nova-btn-upgrade-nova-pulsegrenade.png", + "Flashbang Grenades (Nova Gadget)": github_icon_base_url + "blizzard/btn-upgrade-nova-btn-upgrade-nova-flashgrenade.png", + "Ionic Force Field (Nova Gadget)": github_icon_base_url + "blizzard/btn-upgrade-terran-nova-personaldefensivematrix.png", + "Holo Decoy (Nova Gadget)": github_icon_base_url + "blizzard/btn-upgrade-nova-holographicdecoy.png", + "Tac Nuke Strike (Nova Ability)": github_icon_base_url + "blizzard/btn-ability-terran-nuclearstrike-color.png", + + "Zerg Melee Attack Level 1": github_icon_base_url + "blizzard/btn-upgrade-zerg-meleeattacks-level1.png", + "Zerg Melee Attack Level 2": github_icon_base_url + "blizzard/btn-upgrade-zerg-meleeattacks-level2.png", + "Zerg Melee Attack Level 3": github_icon_base_url + "blizzard/btn-upgrade-zerg-meleeattacks-level3.png", + "Zerg Missile Attack Level 1": github_icon_base_url + "blizzard/btn-upgrade-zerg-missileattacks-level1.png", + "Zerg Missile Attack Level 2": github_icon_base_url + "blizzard/btn-upgrade-zerg-missileattacks-level2.png", + "Zerg Missile Attack Level 3": github_icon_base_url + "blizzard/btn-upgrade-zerg-missileattacks-level3.png", + "Zerg Ground Carapace Level 1": github_icon_base_url + "blizzard/btn-upgrade-zerg-groundcarapace-level1.png", + "Zerg Ground Carapace Level 2": github_icon_base_url + "blizzard/btn-upgrade-zerg-groundcarapace-level2.png", + "Zerg Ground Carapace Level 3": github_icon_base_url + "blizzard/btn-upgrade-zerg-groundcarapace-level3.png", + "Zerg Flyer Attack Level 1": github_icon_base_url + "blizzard/btn-upgrade-zerg-airattacks-level1.png", + "Zerg Flyer Attack Level 2": github_icon_base_url + "blizzard/btn-upgrade-zerg-airattacks-level2.png", + "Zerg Flyer Attack Level 3": github_icon_base_url + "blizzard/btn-upgrade-zerg-airattacks-level3.png", + "Zerg Flyer Carapace Level 1": github_icon_base_url + "blizzard/btn-upgrade-zerg-flyercarapace-level1.png", + "Zerg Flyer Carapace Level 2": github_icon_base_url + "blizzard/btn-upgrade-zerg-flyercarapace-level2.png", + "Zerg Flyer Carapace Level 3": github_icon_base_url + "blizzard/btn-upgrade-zerg-flyercarapace-level3.png", + + "Automated Extractors (Kerrigan Tier 3)": github_icon_base_url + "blizzard/btn-ability-kerrigan-automatedextractors.png", + "Vespene Efficiency (Kerrigan Tier 5)": github_icon_base_url + "blizzard/btn-ability-kerrigan-vespeneefficiency.png", + "Twin Drones (Kerrigan Tier 5)": github_icon_base_url + "blizzard/btn-ability-kerrigan-twindrones.png", + "Improved Overlords (Kerrigan Tier 3)": github_icon_base_url + "blizzard/btn-ability-kerrigan-improvedoverlords.png", + "Ventral Sacs (Overlord)": github_icon_base_url + "blizzard/btn-upgrade-zerg-ventralsacs.png", + "Malignant Creep (Kerrigan Tier 5)": github_icon_base_url + "blizzard/btn-ability-kerrigan-malignantcreep.png", + + "Spine Crawler": github_icon_base_url + "blizzard/btn-building-zerg-spinecrawler.png", + "Spore Crawler": github_icon_base_url + "blizzard/btn-building-zerg-sporecrawler.png", + + "Zergling": github_icon_base_url + "blizzard/btn-unit-zerg-zergling.png", + "Swarm Queen": github_icon_base_url + "blizzard/btn-unit-zerg-broodqueen.png", + "Roach": github_icon_base_url + "blizzard/btn-unit-zerg-roach.png", + "Hydralisk": github_icon_base_url + "blizzard/btn-unit-zerg-hydralisk.png", + "Aberration": github_icon_base_url + "blizzard/btn-unit-zerg-aberration.png", + "Mutalisk": github_icon_base_url + "blizzard/btn-unit-zerg-mutalisk.png", + "Corruptor": github_icon_base_url + "blizzard/btn-unit-zerg-corruptor.png", + "Swarm Host": github_icon_base_url + "blizzard/btn-unit-zerg-swarmhost.png", + "Infestor": github_icon_base_url + "blizzard/btn-unit-zerg-infestor.png", + "Defiler": github_icon_base_url + "original/btn-unit-zerg-defiler@scbw.png", + "Ultralisk": github_icon_base_url + "blizzard/btn-unit-zerg-ultralisk.png", + "Brood Queen": github_icon_base_url + "blizzard/btn-unit-zerg-classicqueen.png", + "Scourge": github_icon_base_url + "blizzard/btn-unit-zerg-scourge.png", + + "Baneling Aspect (Zergling)": github_icon_base_url + "blizzard/btn-unit-zerg-baneling.png", + "Ravager Aspect (Roach)": github_icon_base_url + "blizzard/btn-unit-zerg-ravager.png", + "Impaler Aspect (Hydralisk)": github_icon_base_url + "blizzard/btn-unit-zerg-impaler.png", + "Lurker Aspect (Hydralisk)": github_icon_base_url + "blizzard/btn-unit-zerg-lurker.png", + "Brood Lord Aspect (Mutalisk/Corruptor)": github_icon_base_url + "blizzard/btn-unit-zerg-broodlord.png", + "Viper Aspect (Mutalisk/Corruptor)": github_icon_base_url + "blizzard/btn-unit-zerg-viper.png", + "Guardian Aspect (Mutalisk/Corruptor)": github_icon_base_url + "blizzard/btn-unit-zerg-primalguardian.png", + "Devourer Aspect (Mutalisk/Corruptor)": github_icon_base_url + "blizzard/btn-unit-zerg-devourerex3.png", + + "Raptor Strain (Zergling)": github_icon_base_url + "blizzard/btn-unit-zerg-zergling-raptor.png", + "Swarmling Strain (Zergling)": github_icon_base_url + "blizzard/btn-unit-zerg-zergling-swarmling.png", + "Hardened Carapace (Zergling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-hardenedcarapace.png", + "Adrenal Overload (Zergling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-adrenaloverload.png", + "Metabolic Boost (Zergling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-hotsmetabolicboost.png", + "Shredding Claws (Zergling)": github_icon_base_url + "blizzard/btn-upgrade-zergling-armorshredding.png", + "Zergling Reconstitution (Kerrigan Tier 3)": github_icon_base_url + "blizzard/btn-ability-kerrigan-zerglingreconstitution.png", + "Splitter Strain (Baneling)": github_icon_base_url + "blizzard/talent-zagara-level14-unlocksplitterling.png", + "Hunter Strain (Baneling)": github_icon_base_url + "blizzard/btn-ability-zerg-cliffjump-baneling.png", + "Corrosive Acid (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-corrosiveacid.png", + "Rupture (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-rupture.png", + "Regenerative Acid (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-regenerativebile.png", + "Centrifugal Hooks (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-centrifugalhooks.png", + "Tunneling Jaws (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-zerg-tunnelingjaws.png", + "Rapid Metamorph (Baneling)": github_icon_base_url + "blizzard/btn-upgrade-terran-optimizedlogistics.png", + "Spawn Larvae (Swarm Queen)": github_icon_base_url + "blizzard/btn-unit-zerg-larva.png", + "Deep Tunnel (Swarm Queen)": github_icon_base_url + "blizzard/btn-ability-zerg-deeptunnel.png", + "Organic Carapace (Swarm Queen)": github_icon_base_url + "blizzard/btn-upgrade-zerg-organiccarapace.png", + "Bio-Mechanical Transfusion (Swarm Queen)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-biomechanicaltransfusion.png", + "Resource Efficiency (Swarm Queen)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Incubator Chamber (Swarm Queen)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-incubationchamber.png", + "Vile Strain (Roach)": github_icon_base_url + "blizzard/btn-unit-zerg-roach-vile.png", + "Corpser Strain (Roach)": github_icon_base_url + "blizzard/btn-unit-zerg-roach-corpser.png", + "Hydriodic Bile (Roach)": github_icon_base_url + "blizzard/btn-upgrade-zerg-hydriaticacid.png", + "Adaptive Plating (Roach)": github_icon_base_url + "blizzard/btn-upgrade-zerg-adaptivecarapace.png", + "Tunneling Claws (Roach)": github_icon_base_url + "blizzard/btn-upgrade-zerg-hotstunnelingclaws.png", + "Glial Reconstitution (Roach)": github_icon_base_url + "blizzard/btn-upgrade-zerg-glialreconstitution.png", + "Organic Carapace (Roach)": github_icon_base_url + "blizzard/btn-upgrade-zerg-organiccarapace.png", + "Potent Bile (Ravager)": github_icon_base_url + "blizzard/potentbile_coop.png", + "Bloated Bile Ducts (Ravager)": github_icon_base_url + "blizzard/btn-ability-zerg-abathur-corrosivebilelarge.png", + "Deep Tunnel (Ravager)": github_icon_base_url + "blizzard/btn-ability-zerg-deeptunnel.png", + "Frenzy (Hydralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-frenzy.png", + "Ancillary Carapace (Hydralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-ancillaryarmor.png", + "Grooved Spines (Hydralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-hotsgroovedspines.png", + "Muscular Augments (Hydralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-evolvemuscularaugments.png", + "Resource Efficiency (Hydralisk)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Adaptive Talons (Impaler)": github_icon_base_url + "blizzard/btn-upgrade-zerg-adaptivetalons.png", + "Secretion Glands (Impaler)": github_icon_base_url + "blizzard/btn-ability-zerg-creepspread.png", + "Hardened Tentacle Spines (Impaler)": github_icon_base_url + "blizzard/btn-ability-zerg-dehaka-impaler-tenderize.png", + "Seismic Spines (Lurker)": github_icon_base_url + "blizzard/btn-upgrade-kerrigan-seismicspines.png", + "Adapted Spines (Lurker)": github_icon_base_url + "blizzard/btn-upgrade-zerg-groovedspines.png", + "Vicious Glaive (Mutalisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-viciousglaive.png", + "Rapid Regeneration (Mutalisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-rapidregeneration.png", + "Sundering Glaive (Mutalisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-explosiveglaive.png", + "Severing Glaive (Mutalisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-explosiveglaive.png", + "Aerodynamic Glaive Shape (Mutalisk)": github_icon_base_url + "blizzard/btn-ability-dehaka-airbonusdamage.png", + "Corruption (Corruptor)": github_icon_base_url + "blizzard/btn-ability-zerg-causticspray.png", + "Caustic Spray (Corruptor)": github_icon_base_url + "blizzard/btn-ability-zerg-corruption-color.png", + "Porous Cartilage (Brood Lord)": github_icon_base_url + "blizzard/btn-upgrade-kerrigan-broodlordspeed.png", + "Evolved Carapace (Brood Lord)": github_icon_base_url + "blizzard/btn-upgrade-zerg-chitinousplating.png", + "Splitter Mitosis (Brood Lord)": github_icon_base_url + "blizzard/abilityicon_spawnbroodlings_square.png", + "Resource Efficiency (Brood Lord)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Parasitic Bomb (Viper)": github_icon_base_url + "blizzard/btn-ability-zerg-parasiticbomb.png", + "Paralytic Barbs (Viper)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-abduct.png", + "Virulent Microbes (Viper)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-castrange.png", + "Prolonged Dispersion (Guardian)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-prolongeddispersion.png", + "Primal Adaptation (Guardian)": github_icon_base_url + "blizzard/biomassrecovery_coop.png", + "Soronan Acid (Guardian)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-biomass.png", + "Corrosive Spray (Devourer)": github_icon_base_url + "blizzard/btn-upgrade-zerg-abathur-devourer-corrosivespray.png", + "Gaping Maw (Devourer)": github_icon_base_url + "blizzard/btn-ability-zerg-explode-color.png", + "Improved Osmosis (Devourer)": github_icon_base_url + "blizzard/btn-upgrade-zerg-pneumatizedcarapace.png", + "Prescient Spores (Devourer)": github_icon_base_url + "blizzard/btn-upgrade-zerg-airattacks-level2.png", + "Carrion Strain (Swarm Host)": github_icon_base_url + "blizzard/btn-unit-zerg-swarmhost-carrion.png", + "Creeper Strain (Swarm Host)": github_icon_base_url + "blizzard/btn-unit-zerg-swarmhost-creeper.png", + "Burrow (Swarm Host)": github_icon_base_url + "blizzard/btn-ability-zerg-burrow-color.png", + "Rapid Incubation (Swarm Host)": github_icon_base_url + "blizzard/btn-upgrade-zerg-rapidincubation.png", + "Pressurized Glands (Swarm Host)": github_icon_base_url + "blizzard/btn-upgrade-zerg-pressurizedglands.png", + "Locust Metabolic Boost (Swarm Host)": github_icon_base_url + "blizzard/btn-upgrade-zerg-glialreconstitution.png", + "Enduring Locusts (Swarm Host)": github_icon_base_url + "blizzard/btn-upgrade-zerg-evolveincreasedlocustlifetime.png", + "Organic Carapace (Swarm Host)": github_icon_base_url + "blizzard/btn-upgrade-zerg-organiccarapace.png", + "Resource Efficiency (Swarm Host)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Infested Terran (Infestor)": github_icon_base_url + "blizzard/btn-unit-zerg-infestedmarine.png", + "Microbial Shroud (Infestor)": github_icon_base_url + "blizzard/btn-ability-zerg-darkswarm.png", + "Noxious Strain (Ultralisk)": github_icon_base_url + "blizzard/btn-unit-zerg-ultralisk-noxious.png", + "Torrasque Strain (Ultralisk)": github_icon_base_url + "blizzard/btn-unit-zerg-ultralisk-torrasque.png", + "Burrow Charge (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-burrowcharge.png", + "Tissue Assimilation (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-tissueassimilation.png", + "Monarch Blades (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-monarchblades.png", + "Anabolic Synthesis (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-anabolicsynthesis.png", + "Chitinous Plating (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-chitinousplating.png", + "Organic Carapace (Ultralisk)": github_icon_base_url + "blizzard/btn-upgrade-zerg-organiccarapace.png", + "Resource Efficiency (Ultralisk)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Fungal Growth (Brood Queen)": github_icon_base_url + "blizzard/btn-upgrade-zerg-stukov-researchqueenfungalgrowth.png", + "Ensnare (Brood Queen)": github_icon_base_url + "blizzard/btn-ability-zerg-fungalgrowth-color.png", + "Enhanced Mitochondria (Brood Queen)": github_icon_base_url + "blizzard/btn-upgrade-zerg-stukov-queenenergyregen.png", + "Virulent Spores (Scourge)": github_icon_base_url + "blizzard/btn-upgrade-zagara-scourgesplashdamage.png", + "Resource Efficiency (Scourge)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Swarm Scourge (Scourge)": github_icon_base_url + "original/btn-upgrade-custom-triple-scourge.png", + + "Infested Medics": github_icon_base_url + "blizzard/btn-unit-terran-medicelite.png", + "Infested Siege Tanks": github_icon_base_url + "original/btn-unit-terran-siegetankmercenary-tank.png", + "Infested Banshees": github_icon_base_url + "original/btn-unit-terran-bansheemercenary.png", + + "Primal Form (Kerrigan)": github_icon_base_url + "blizzard/btn-unit-zerg-kerriganinfested.png", + "Kinetic Blast (Kerrigan Tier 1)": github_icon_base_url + "blizzard/btn-ability-kerrigan-kineticblast.png", + "Heroic Fortitude (Kerrigan Tier 1)": github_icon_base_url + "blizzard/btn-ability-kerrigan-heroicfortitude.png", + "Leaping Strike (Kerrigan Tier 1)": github_icon_base_url + "blizzard/btn-ability-kerrigan-leapingstrike.png", + "Crushing Grip (Kerrigan Tier 2)": github_icon_base_url + "blizzard/btn-ability-swarm-kerrigan-crushinggrip.png", + "Chain Reaction (Kerrigan Tier 2)": github_icon_base_url + "blizzard/btn-ability-swarm-kerrigan-chainreaction.png", + "Psionic Shift (Kerrigan Tier 2)": github_icon_base_url + "blizzard/btn-ability-kerrigan-psychicshift.png", + "Wild Mutation (Kerrigan Tier 4)": github_icon_base_url + "blizzard/btn-ability-kerrigan-wildmutation.png", + "Spawn Banelings (Kerrigan Tier 4)": github_icon_base_url + "blizzard/abilityicon_spawnbanelings_square.png", + "Mend (Kerrigan Tier 4)": github_icon_base_url + "blizzard/btn-ability-zerg-transfusion-color.png", + "Infest Broodlings (Kerrigan Tier 6)": github_icon_base_url + "blizzard/abilityicon_spawnbroodlings_square.png", + "Fury (Kerrigan Tier 6)": github_icon_base_url + "blizzard/btn-ability-kerrigan-fury.png", + "Ability Efficiency (Kerrigan Tier 6)": github_icon_base_url + "blizzard/btn-ability-kerrigan-abilityefficiency.png", + "Apocalypse (Kerrigan Tier 7)": github_icon_base_url + "blizzard/btn-ability-kerrigan-apocalypse.png", + "Spawn Leviathan (Kerrigan Tier 7)": github_icon_base_url + "blizzard/btn-unit-zerg-leviathan.png", + "Drop-Pods (Kerrigan Tier 7)": github_icon_base_url + "blizzard/btn-ability-kerrigan-droppods.png", + + "Protoss Ground Weapon Level 1": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundweaponslevel1.png", + "Protoss Ground Weapon Level 2": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundweaponslevel2.png", + "Protoss Ground Weapon Level 3": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundweaponslevel3.png", + "Protoss Ground Armor Level 1": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundarmorlevel1.png", + "Protoss Ground Armor Level 2": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundarmorlevel2.png", + "Protoss Ground Armor Level 3": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundarmorlevel3.png", + "Protoss Shields Level 1": github_icon_base_url + "blizzard/btn-upgrade-protoss-shieldslevel1.png", + "Protoss Shields Level 2": github_icon_base_url + "blizzard/btn-upgrade-protoss-shieldslevel2.png", + "Protoss Shields Level 3": github_icon_base_url + "blizzard/btn-upgrade-protoss-shieldslevel3.png", + "Protoss Air Weapon Level 1": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel1.png", + "Protoss Air Weapon Level 2": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel2.png", + "Protoss Air Weapon Level 3": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel3.png", + "Protoss Air Armor Level 1": github_icon_base_url + "blizzard/btn-upgrade-protoss-airarmorlevel1.png", + "Protoss Air Armor Level 2": github_icon_base_url + "blizzard/btn-upgrade-protoss-airarmorlevel2.png", + "Protoss Air Armor Level 3": github_icon_base_url + "blizzard/btn-upgrade-protoss-airarmorlevel3.png", + + "Quatro": github_icon_base_url + "blizzard/btn-progression-protoss-fenix-6-forgeresearch.png", + + "Photon Cannon": github_icon_base_url + "blizzard/btn-building-protoss-photoncannon.png", + "Khaydarin Monolith": github_icon_base_url + "blizzard/btn-unit-protoss-khaydarinmonolith.png", + "Shield Battery": github_icon_base_url + "blizzard/btn-building-protoss-shieldbattery.png", + + "Enhanced Targeting": github_icon_base_url + "blizzard/btn-upgrade-karax-turretrange.png", + "Optimized Ordnance": github_icon_base_url + "blizzard/btn-upgrade-karax-turretattackspeed.png", + "Khalai Ingenuity": github_icon_base_url + "blizzard/btn-upgrade-karax-pylonwarpininstantly.png", + "Orbital Assimilators": github_icon_base_url + "blizzard/btn-ability-spearofadun-orbitalassimilator.png", + "Amplified Assimilators": github_icon_base_url + "original/btn-research-terran-microfiltering.png", + "Warp Harmonization": github_icon_base_url + "blizzard/btn-ability-spearofadun-warpharmonization.png", + "Superior Warp Gates": github_icon_base_url + "blizzard/talent-artanis-level03-warpgatecharges.png", + "Nexus Overcharge": github_icon_base_url + "blizzard/btn-ability-spearofadun-nexusovercharge.png", + + "Zealot": github_icon_base_url + "blizzard/btn-unit-protoss-zealot-aiur.png", + "Centurion": github_icon_base_url + "blizzard/btn-unit-protoss-zealot-nerazim.png", + "Sentinel": github_icon_base_url + "blizzard/btn-unit-protoss-zealot-purifier.png", + "Supplicant": github_icon_base_url + "blizzard/btn-unit-protoss-alarak-taldarim-supplicant.png", + "Sentry": github_icon_base_url + "blizzard/btn-unit-protoss-sentry.png", + "Energizer": github_icon_base_url + "blizzard/btn-unit-protoss-sentry-purifier.png", + "Havoc": github_icon_base_url + "blizzard/btn-unit-protoss-sentry-taldarim.png", "Stalker": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Icon_Protoss_Stalker.jpg", + "Instigator": github_icon_base_url + "blizzard/btn-unit-protoss-stalker-purifier.png", + "Slayer": github_icon_base_url + "blizzard/btn-unit-protoss-alarak-taldarim-stalker.png", + "Dragoon": github_icon_base_url + "blizzard/btn-unit-protoss-dragoon-void.png", + "Adept": github_icon_base_url + "blizzard/btn-unit-protoss-adept-purifier.png", "High Templar": "https://static.wikia.nocookie.net/starcraft/images/a/a0/Icon_Protoss_High_Templar.jpg", + "Signifier": github_icon_base_url + "original/btn-unit-protoss-hightemplar-nerazim.png", + "Ascendant": github_icon_base_url + "blizzard/btn-unit-protoss-hightemplar-taldarim.png", + "Dark Archon": github_icon_base_url + "blizzard/talent-vorazun-level05-unlockdarkarchon.png", "Dark Templar": "https://static.wikia.nocookie.net/starcraft/images/9/90/Icon_Protoss_Dark_Templar.jpg", + "Avenger": github_icon_base_url + "blizzard/btn-unit-protoss-darktemplar-aiur.png", + "Blood Hunter": github_icon_base_url + "blizzard/btn-unit-protoss-darktemplar-taldarim.png", + + "Leg Enhancements (Zealot/Sentinel/Centurion)": github_icon_base_url + "blizzard/btn-ability-protoss-charge-color.png", + "Shield Capacity (Zealot/Sentinel/Centurion)": github_icon_base_url + "blizzard/btn-upgrade-protoss-shieldslevel1.png", + "Blood Shield (Supplicant)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-supplicantarmor.png", + "Soul Augmentation (Supplicant)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-supplicantextrashields.png", + "Shield Regeneration (Supplicant)": github_icon_base_url + "blizzard/btn-ability-protoss-voidarmor.png", + "Force Field (Sentry)": github_icon_base_url + "blizzard/btn-ability-protoss-forcefield-color.png", + "Hallucination (Sentry)": github_icon_base_url + "blizzard/btn-ability-protoss-hallucination-color.png", + "Reclamation (Energizer)": github_icon_base_url + "blizzard/btn-ability-protoss-reclamation.png", + "Forged Chassis (Energizer)": github_icon_base_url + "blizzard/btn-upgrade-protoss-groundarmorlevel0.png", + "Detect Weakness (Havoc)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-havoctargetlockbuffed.png", + "Bloodshard Resonance (Havoc)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-rangeincrease.png", + "Cloaking Module (Sentry/Energizer/Havoc)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-permanentcloak.png", + "Rapid Recharging (Sentry/Energizer/Havoc/Shield Battery)": github_icon_base_url + "blizzard/btn-upgrade-karax-energyregen200.png", + "Disintegrating Particles (Stalker/Instigator/Slayer)": github_icon_base_url + "blizzard/btn-ability-protoss-phasedisruptor.png", + "Particle Reflection (Stalker/Instigator/Slayer)": github_icon_base_url + "blizzard/btn-upgrade-protoss-fenix-adeptchampionbounceattack.png", + "High Impact Phase Disruptor (Dragoon)": github_icon_base_url + "blizzard/btn-ability-protoss-phasedisruptor.png", + "Trillic Compression System (Dragoon)": github_icon_base_url + "blizzard/btn-ability-protoss-dragoonchassis.png", + "Singularity Charge (Dragoon)": github_icon_base_url + "blizzard/btn-upgrade-artanis-singularitycharge.png", + "Enhanced Strider Servos (Dragoon)": github_icon_base_url + "blizzard/btn-upgrade-terran-transformationservos.png", + "Shockwave (Adept)": github_icon_base_url + "blizzard/btn-upgrade-protoss-fenix-adept-recochetglaiveupgraded.png", + "Resonating Glaives (Adept)": github_icon_base_url + "blizzard/btn-upgrade-protoss-resonatingglaives.png", + "Phase Bulwark (Adept)": github_icon_base_url + "blizzard/btn-upgrade-protoss-adeptshieldupgrade.png", + "Unshackled Psionic Storm (High Templar/Signifier)": github_icon_base_url + "blizzard/btn-ability-protoss-psistorm.png", + "Hallucination (High Templar/Signifier)": github_icon_base_url + "blizzard/btn-ability-protoss-hallucination-color.png", + "Khaydarin Amulet (High Templar/Signifier)": github_icon_base_url + "blizzard/btn-upgrade-protoss-khaydarinamulet.png", + "High Archon (Archon)": github_icon_base_url + "blizzard/btn-upgrade-artanis-healingpsionicstorm.png", + "Power Overwhelming (Ascendant)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-ascendantspermanentlybetter.png", + "Chaotic Attunement (Ascendant)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-ascendant'spsiorbtravelsfurther.png", + "Blood Amulet (Ascendant)": github_icon_base_url + "blizzard/btn-upgrade-protoss-wrathwalker-chargetimeimproved.png", + "Feedback (Dark Archon)": github_icon_base_url + "blizzard/btn-ability-protoss-feedback-color.png", + "Maelstrom (Dark Archon)": github_icon_base_url + "blizzard/btn-ability-protoss-voidstasis.png", + "Argus Talisman (Dark Archon)": github_icon_base_url + "original/btn-upgrade-protoss-argustalisman@scbw.png", + "Dark Archon Meld (Dark Templar)": github_icon_base_url + "blizzard/talent-vorazun-level05-unlockdarkarchon.png", + "Shroud of Adun (Dark Templar/Avenger/Blood Hunter)": github_icon_base_url + "blizzard/talent-vorazun-level01-shadowstalk.png", + "Shadow Guard Training (Dark Templar/Avenger/Blood Hunter)": github_icon_base_url + "blizzard/btn-ability-terran-heal-color.png", + "Blink (Dark Templar/Avenger/Blood Hunter)": github_icon_base_url + "blizzard/btn-ability-protoss-shadowdash.png", + "Resource Efficiency (Dark Templar/Avenger/Blood Hunter)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + + "Warp Prism": github_icon_base_url + "blizzard/btn-unit-protoss-warpprism.png", "Immortal": "https://static.wikia.nocookie.net/starcraft/images/c/c1/Icon_Protoss_Immortal.jpg", - "Colossus": "https://static.wikia.nocookie.net/starcraft/images/4/40/Icon_Protoss_Colossus.jpg", + "Annihilator": github_icon_base_url + "blizzard/btn-unit-protoss-immortal-nerazim.png", + "Vanguard": github_icon_base_url + "blizzard/btn-unit-protoss-immortal-taldarim.png", + "Colossus": github_icon_base_url + "blizzard/btn-unit-protoss-colossus-purifier.png", + "Wrathwalker": github_icon_base_url + "blizzard/btn-unit-protoss-colossus-taldarim.png", + "Observer": github_icon_base_url + "blizzard/btn-unit-protoss-observer.png", + "Reaver": github_icon_base_url + "blizzard/btn-unit-protoss-reaver.png", + "Disruptor": github_icon_base_url + "blizzard/btn-unit-protoss-disruptor.png", + + "Gravitic Drive (Warp Prism)": github_icon_base_url + "blizzard/btn-upgrade-protoss-graviticdrive.png", + "Phase Blaster (Warp Prism)": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel0.png", + "War Configuration (Warp Prism)": github_icon_base_url + "blizzard/btn-upgrade-protoss-alarak-graviticdrive.png", + "Singularity Charge (Immortal/Annihilator)": github_icon_base_url + "blizzard/btn-upgrade-artanis-singularitycharge.png", + "Advanced Targeting Mechanics (Immortal/Annihilator)": github_icon_base_url + "blizzard/btn-ability-terran-detectionconedebuff.png", + "Agony Launchers (Vanguard)": github_icon_base_url + "blizzard/btn-upgrade-protoss-vanguard-aoeradiusincreased.png", + "Matter Dispersion (Vanguard)": github_icon_base_url + "blizzard/btn-ability-terran-detectionconedebuff.png", + "Pacification Protocol (Colossus)": github_icon_base_url + "blizzard/btn-ability-protoss-chargedblast.png", + "Rapid Power Cycling (Wrathwalker)": github_icon_base_url + "blizzard/btn-upgrade-protoss-wrathwalker-chargetimeimproved.png", + "Eye of Wrath (Wrathwalker)": github_icon_base_url + "blizzard/btn-upgrade-protoss-extendedthermallance.png", + "Gravitic Boosters (Observer)": github_icon_base_url + "blizzard/btn-upgrade-protoss-graviticbooster.png", + "Sensor Array (Observer)": github_icon_base_url + "blizzard/btn-ability-zeratul-observer-sensorarray.png", + "Scarab Damage (Reaver)": github_icon_base_url + "blizzard/btn-ability-protoss-scarabshot.png", + "Solarite Payload (Reaver)": github_icon_base_url + "blizzard/btn-upgrade-artanis-scarabsplashradius.png", + "Reaver Capacity (Reaver)": github_icon_base_url + "original/btn-upgrade-protoss-increasedscarabcapacity@scbw.png", + "Resource Efficiency (Reaver)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Phoenix": "https://static.wikia.nocookie.net/starcraft/images/b/b1/Icon_Protoss_Phoenix.jpg", - "Void Ray": "https://static.wikia.nocookie.net/starcraft/images/1/1d/VoidRay_SC2_Rend1.jpg", + "Mirage": github_icon_base_url + "blizzard/btn-unit-protoss-phoenix-purifier.png", + "Corsair": github_icon_base_url + "blizzard/btn-unit-protoss-corsair.png", + "Destroyer": github_icon_base_url + "blizzard/btn-unit-protoss-voidray-taldarim.png", + "Void Ray": github_icon_base_url + "blizzard/btn-unit-protoss-voidray-nerazim.png", "Carrier": "https://static.wikia.nocookie.net/starcraft/images/2/2c/Icon_Protoss_Carrier.jpg", + "Scout": github_icon_base_url + "original/btn-unit-protoss-scout.png", + "Tempest": github_icon_base_url + "blizzard/btn-unit-protoss-tempest-purifier.png", + "Mothership": github_icon_base_url + "blizzard/btn-unit-protoss-mothership-taldarim.png", + "Arbiter": github_icon_base_url + "blizzard/btn-unit-protoss-arbiter.png", + "Oracle": github_icon_base_url + "blizzard/btn-unit-protoss-oracle.png", + + "Ionic Wavelength Flux (Phoenix/Mirage)": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel0.png", + "Anion Pulse-Crystals (Phoenix/Mirage)": github_icon_base_url + "blizzard/btn-upgrade-protoss-phoenixrange.png", + "Stealth Drive (Corsair)": github_icon_base_url + "blizzard/btn-upgrade-vorazun-corsairpermanentlycloaked.png", + "Argus Jewel (Corsair)": github_icon_base_url + "blizzard/btn-ability-protoss-stasistrap.png", + "Sustaining Disruption (Corsair)": github_icon_base_url + "blizzard/btn-ability-protoss-disruptionweb.png", + "Neutron Shields (Corsair)": github_icon_base_url + "blizzard/btn-upgrade-protoss-shieldslevel1.png", + "Reforged Bloodshard Core (Destroyer)": github_icon_base_url + "blizzard/btn-amonshardsarmor.png", + "Flux Vanes (Void Ray/Destroyer)": github_icon_base_url + "blizzard/btn-upgrade-protoss-fluxvanes.png", + "Graviton Catapult (Carrier)": github_icon_base_url + "blizzard/btn-upgrade-protoss-gravitoncatapult.png", + "Hull of Past Glories (Carrier)": github_icon_base_url + "blizzard/btn-progression-protoss-fenix-14-colossusandcarrierchampionsresearch.png", + "Combat Sensor Array (Scout)": github_icon_base_url + "blizzard/btn-upgrade-protoss-fenix-scoutchampionrange.png", + "Apial Sensors (Scout)": github_icon_base_url + "blizzard/btn-upgrade-tychus-detection.png", + "Gravitic Thrusters (Scout)": github_icon_base_url + "blizzard/btn-upgrade-protoss-graviticbooster.png", + "Advanced Photon Blasters (Scout)": github_icon_base_url + "blizzard/btn-upgrade-protoss-airweaponslevel3.png", + "Tectonic Destabilizers (Tempest)": github_icon_base_url + "blizzard/btn-ability-protoss-disruptionblast.png", + "Quantic Reactor (Tempest)": github_icon_base_url + "blizzard/btn-upgrade-protoss-researchgravitysling.png", + "Gravity Sling (Tempest)": github_icon_base_url + "blizzard/btn-upgrade-protoss-tectonicdisruptors.png", + "Chronostatic Reinforcement (Arbiter)": github_icon_base_url + "blizzard/btn-upgrade-protoss-airarmorlevel2.png", + "Khaydarin Core (Arbiter)": github_icon_base_url + "blizzard/btn-upgrade-protoss-adeptshieldupgrade.png", + "Spacetime Anchor (Arbiter)": github_icon_base_url + "blizzard/btn-ability-protoss-stasisfield.png", + "Resource Efficiency (Arbiter)": github_icon_base_url + "blizzard/btn-ability-hornerhan-salvagebonus.png", + "Enhanced Cloak Field (Arbiter)": github_icon_base_url + "blizzard/btn-ability-stetmann-stetzonegenerator-speed.png", + "Stealth Drive (Oracle)": github_icon_base_url + "blizzard/btn-upgrade-vorazun-oraclepermanentlycloaked.png", + "Stasis Calibration (Oracle)": github_icon_base_url + "blizzard/btn-ability-protoss-oracle-stasiscalibration.png", + "Temporal Acceleration Beam (Oracle)": github_icon_base_url + "blizzard/btn-ability-protoss-oraclepulsarcannonon.png", + + "Matrix Overload": github_icon_base_url + "blizzard/btn-ability-spearofadun-matrixoverload.png", + "Guardian Shell": github_icon_base_url + "blizzard/btn-ability-spearofadun-guardianshell.png", + + "Chrono Surge (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-chronosurge.png", + "Proxy Pylon (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-deploypylon.png", + "Warp In Reinforcements (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-warpinreinforcements.png", + "Pylon Overcharge (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-protoss-purify.png", + "Orbital Strike (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-orbitalstrike.png", + "Temporal Field (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-temporalfield.png", + "Solar Lance (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-solarlance.png", + "Mass Recall (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-massrecall.png", + "Shield Overcharge (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-shieldovercharge.png", + "Deploy Fenix (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-unit-protoss-fenix.png", + "Purifier Beam (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-purifierbeam.png", + "Time Stop (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-timestop.png", + "Solar Bombardment (Spear of Adun Calldown)": github_icon_base_url + "blizzard/btn-ability-spearofadun-solarbombardment.png", + + "Reconstruction Beam (Spear of Adun Auto-Cast)": github_icon_base_url + "blizzard/btn-ability-spearofadun-reconstructionbeam.png", + "Overwatch (Spear of Adun Auto-Cast)": github_icon_base_url + "blizzard/btn-ability-zeratul-chargedcrystal-psionicwinds.png", "Nothing": "", } @@ -1824,97 +2257,310 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int "Gates of Hell": range(SC2WOL_LOC_ID_OFFSET + 2600, SC2WOL_LOC_ID_OFFSET + 2700), "Belly of the Beast": range(SC2WOL_LOC_ID_OFFSET + 2700, SC2WOL_LOC_ID_OFFSET + 2800), "Shatter the Sky": range(SC2WOL_LOC_ID_OFFSET + 2800, SC2WOL_LOC_ID_OFFSET + 2900), + "All-In": range(SC2WOL_LOC_ID_OFFSET + 2900, SC2WOL_LOC_ID_OFFSET + 3000), + + "Lab Rat": range(SC2HOTS_LOC_ID_OFFSET + 100, SC2HOTS_LOC_ID_OFFSET + 200), + "Back in the Saddle": range(SC2HOTS_LOC_ID_OFFSET + 200, SC2HOTS_LOC_ID_OFFSET + 300), + "Rendezvous": range(SC2HOTS_LOC_ID_OFFSET + 300, SC2HOTS_LOC_ID_OFFSET + 400), + "Harvest of Screams": range(SC2HOTS_LOC_ID_OFFSET + 400, SC2HOTS_LOC_ID_OFFSET + 500), + "Shoot the Messenger": range(SC2HOTS_LOC_ID_OFFSET + 500, SC2HOTS_LOC_ID_OFFSET + 600), + "Enemy Within": range(SC2HOTS_LOC_ID_OFFSET + 600, SC2HOTS_LOC_ID_OFFSET + 700), + "Domination": range(SC2HOTS_LOC_ID_OFFSET + 700, SC2HOTS_LOC_ID_OFFSET + 800), + "Fire in the Sky": range(SC2HOTS_LOC_ID_OFFSET + 800, SC2HOTS_LOC_ID_OFFSET + 900), + "Old Soldiers": range(SC2HOTS_LOC_ID_OFFSET + 900, SC2HOTS_LOC_ID_OFFSET + 1000), + "Waking the Ancient": range(SC2HOTS_LOC_ID_OFFSET + 1000, SC2HOTS_LOC_ID_OFFSET + 1100), + "The Crucible": range(SC2HOTS_LOC_ID_OFFSET + 1100, SC2HOTS_LOC_ID_OFFSET + 1200), + "Supreme": range(SC2HOTS_LOC_ID_OFFSET + 1200, SC2HOTS_LOC_ID_OFFSET + 1300), + "Infested": range(SC2HOTS_LOC_ID_OFFSET + 1300, SC2HOTS_LOC_ID_OFFSET + 1400), + "Hand of Darkness": range(SC2HOTS_LOC_ID_OFFSET + 1400, SC2HOTS_LOC_ID_OFFSET + 1500), + "Phantoms of the Void": range(SC2HOTS_LOC_ID_OFFSET + 1500, SC2HOTS_LOC_ID_OFFSET + 1600), + "With Friends Like These": range(SC2HOTS_LOC_ID_OFFSET + 1600, SC2HOTS_LOC_ID_OFFSET + 1700), + "Conviction": range(SC2HOTS_LOC_ID_OFFSET + 1700, SC2HOTS_LOC_ID_OFFSET + 1800), + "Planetfall": range(SC2HOTS_LOC_ID_OFFSET + 1800, SC2HOTS_LOC_ID_OFFSET + 1900), + "Death From Above": range(SC2HOTS_LOC_ID_OFFSET + 1900, SC2HOTS_LOC_ID_OFFSET + 2000), + "The Reckoning": range(SC2HOTS_LOC_ID_OFFSET + 2000, SC2HOTS_LOC_ID_OFFSET + 2100), + + "Dark Whispers": range(SC2LOTV_LOC_ID_OFFSET + 100, SC2LOTV_LOC_ID_OFFSET + 200), + "Ghosts in the Fog": range(SC2LOTV_LOC_ID_OFFSET + 200, SC2LOTV_LOC_ID_OFFSET + 300), + "Evil Awoken": range(SC2LOTV_LOC_ID_OFFSET + 300, SC2LOTV_LOC_ID_OFFSET + 400), + + "For Aiur!": range(SC2LOTV_LOC_ID_OFFSET + 400, SC2LOTV_LOC_ID_OFFSET + 500), + "The Growing Shadow": range(SC2LOTV_LOC_ID_OFFSET + 500, SC2LOTV_LOC_ID_OFFSET + 600), + "The Spear of Adun": range(SC2LOTV_LOC_ID_OFFSET + 600, SC2LOTV_LOC_ID_OFFSET + 700), + "Sky Shield": range(SC2LOTV_LOC_ID_OFFSET + 700, SC2LOTV_LOC_ID_OFFSET + 800), + "Brothers in Arms": range(SC2LOTV_LOC_ID_OFFSET + 800, SC2LOTV_LOC_ID_OFFSET + 900), + "Amon's Reach": range(SC2LOTV_LOC_ID_OFFSET + 900, SC2LOTV_LOC_ID_OFFSET + 1000), + "Last Stand": range(SC2LOTV_LOC_ID_OFFSET + 1000, SC2LOTV_LOC_ID_OFFSET + 1100), + "Forbidden Weapon": range(SC2LOTV_LOC_ID_OFFSET + 1100, SC2LOTV_LOC_ID_OFFSET + 1200), + "Temple of Unification": range(SC2LOTV_LOC_ID_OFFSET + 1200, SC2LOTV_LOC_ID_OFFSET + 1300), + "The Infinite Cycle": range(SC2LOTV_LOC_ID_OFFSET + 1300, SC2LOTV_LOC_ID_OFFSET + 1400), + "Harbinger of Oblivion": range(SC2LOTV_LOC_ID_OFFSET + 1400, SC2LOTV_LOC_ID_OFFSET + 1500), + "Unsealing the Past": range(SC2LOTV_LOC_ID_OFFSET + 1500, SC2LOTV_LOC_ID_OFFSET + 1600), + "Purification": range(SC2LOTV_LOC_ID_OFFSET + 1600, SC2LOTV_LOC_ID_OFFSET + 1700), + "Steps of the Rite": range(SC2LOTV_LOC_ID_OFFSET + 1700, SC2LOTV_LOC_ID_OFFSET + 1800), + "Rak'Shir": range(SC2LOTV_LOC_ID_OFFSET + 1800, SC2LOTV_LOC_ID_OFFSET + 1900), + "Templar's Charge": range(SC2LOTV_LOC_ID_OFFSET + 1900, SC2LOTV_LOC_ID_OFFSET + 2000), + "Templar's Return": range(SC2LOTV_LOC_ID_OFFSET + 2000, SC2LOTV_LOC_ID_OFFSET + 2100), + "The Host": range(SC2LOTV_LOC_ID_OFFSET + 2100, SC2LOTV_LOC_ID_OFFSET + 2200), + "Salvation": range(SC2LOTV_LOC_ID_OFFSET + 2200, SC2LOTV_LOC_ID_OFFSET + 2300), + + "Into the Void": range(SC2LOTV_LOC_ID_OFFSET + 2300, SC2LOTV_LOC_ID_OFFSET + 2400), + "The Essence of Eternity": range(SC2LOTV_LOC_ID_OFFSET + 2400, SC2LOTV_LOC_ID_OFFSET + 2500), + "Amon's Fall": range(SC2LOTV_LOC_ID_OFFSET + 2500, SC2LOTV_LOC_ID_OFFSET + 2600), + + "The Escape": range(SC2NCO_LOC_ID_OFFSET + 100, SC2NCO_LOC_ID_OFFSET + 200), + "Sudden Strike": range(SC2NCO_LOC_ID_OFFSET + 200, SC2NCO_LOC_ID_OFFSET + 300), + "Enemy Intelligence": range(SC2NCO_LOC_ID_OFFSET + 300, SC2NCO_LOC_ID_OFFSET + 400), + "Trouble In Paradise": range(SC2NCO_LOC_ID_OFFSET + 400, SC2NCO_LOC_ID_OFFSET + 500), + "Night Terrors": range(SC2NCO_LOC_ID_OFFSET + 500, SC2NCO_LOC_ID_OFFSET + 600), + "Flashpoint": range(SC2NCO_LOC_ID_OFFSET + 600, SC2NCO_LOC_ID_OFFSET + 700), + "In the Enemy's Shadow": range(SC2NCO_LOC_ID_OFFSET + 700, SC2NCO_LOC_ID_OFFSET + 800), + "Dark Skies": range(SC2NCO_LOC_ID_OFFSET + 800, SC2NCO_LOC_ID_OFFSET + 900), + "End Game": range(SC2NCO_LOC_ID_OFFSET + 900, SC2NCO_LOC_ID_OFFSET + 1000), } display_data = {} # Grouped Items grouped_item_ids = { - "Progressive Weapon Upgrade": 107 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Armor Upgrade": 108 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Infantry Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Vehicle Upgrade": 110 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Ship Upgrade": 111 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Weapon/Armor Upgrade": 112 + SC2WOL_ITEM_ID_OFFSET + "Progressive Terran Weapon Upgrade": 107 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Armor Upgrade": 108 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Infantry Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Vehicle Upgrade": 110 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Ship Upgrade": 111 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Weapon/Armor Upgrade": 112 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Zerg Weapon Upgrade": 105 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Armor Upgrade": 106 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Ground Upgrade": 107 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Flyer Upgrade": 108 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Weapon/Armor Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Protoss Weapon Upgrade": 105 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Armor Upgrade": 106 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Ground Upgrade": 107 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Air Upgrade": 108 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Weapon/Armor Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET, } grouped_item_replacements = { - "Progressive Weapon Upgrade": ["Progressive Infantry Weapon", "Progressive Vehicle Weapon", - "Progressive Ship Weapon"], - "Progressive Armor Upgrade": ["Progressive Infantry Armor", "Progressive Vehicle Armor", - "Progressive Ship Armor"], - "Progressive Infantry Upgrade": ["Progressive Infantry Weapon", "Progressive Infantry Armor"], - "Progressive Vehicle Upgrade": ["Progressive Vehicle Weapon", "Progressive Vehicle Armor"], - "Progressive Ship Upgrade": ["Progressive Ship Weapon", "Progressive Ship Armor"] + "Progressive Terran Weapon Upgrade": ["Progressive Terran Infantry Weapon", + "Progressive Terran Vehicle Weapon", + "Progressive Terran Ship Weapon"], + "Progressive Terran Armor Upgrade": ["Progressive Terran Infantry Armor", + "Progressive Terran Vehicle Armor", + "Progressive Terran Ship Armor"], + "Progressive Terran Infantry Upgrade": ["Progressive Terran Infantry Weapon", + "Progressive Terran Infantry Armor"], + "Progressive Terran Vehicle Upgrade": ["Progressive Terran Vehicle Weapon", + "Progressive Terran Vehicle Armor"], + "Progressive Terran Ship Upgrade": ["Progressive Terran Ship Weapon", "Progressive Terran Ship Armor"], + "Progressive Zerg Weapon Upgrade": ["Progressive Zerg Melee Attack", "Progressive Zerg Missile Attack", + "Progressive Zerg Flyer Attack"], + "Progressive Zerg Armor Upgrade": ["Progressive Zerg Ground Carapace", + "Progressive Zerg Flyer Carapace"], + "Progressive Zerg Ground Upgrade": ["Progressive Zerg Melee Attack", "Progressive Zerg Missile Attack", + "Progressive Zerg Ground Carapace"], + "Progressive Zerg Flyer Upgrade": ["Progressive Zerg Flyer Attack", "Progressive Zerg Flyer Carapace"], + "Progressive Protoss Weapon Upgrade": ["Progressive Protoss Ground Weapon", + "Progressive Protoss Air Weapon"], + "Progressive Protoss Armor Upgrade": ["Progressive Protoss Ground Armor", "Progressive Protoss Shields", + "Progressive Protoss Air Armor"], + "Progressive Protoss Ground Upgrade": ["Progressive Protoss Ground Weapon", + "Progressive Protoss Ground Armor", + "Progressive Protoss Shields"], + "Progressive Protoss Air Upgrade": ["Progressive Protoss Air Weapon", "Progressive Protoss Air Armor", + "Progressive Protoss Shields"] } - grouped_item_replacements["Progressive Weapon/Armor Upgrade"] = grouped_item_replacements[ - "Progressive Weapon Upgrade"] + \ - grouped_item_replacements[ - "Progressive Armor Upgrade"] + grouped_item_replacements["Progressive Terran Weapon/Armor Upgrade"] = \ + grouped_item_replacements["Progressive Terran Weapon Upgrade"] \ + + grouped_item_replacements["Progressive Terran Armor Upgrade"] + grouped_item_replacements["Progressive Zerg Weapon/Armor Upgrade"] = \ + grouped_item_replacements["Progressive Zerg Weapon Upgrade"] \ + + grouped_item_replacements["Progressive Zerg Armor Upgrade"] + grouped_item_replacements["Progressive Protoss Weapon/Armor Upgrade"] = \ + grouped_item_replacements["Progressive Protoss Weapon Upgrade"] \ + + grouped_item_replacements["Progressive Protoss Armor Upgrade"] replacement_item_ids = { - "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Zerg Melee Attack": 100 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Missile Attack": 101 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Ground Carapace": 102 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Flyer Attack": 103 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Flyer Carapace": 104 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Ground Weapon": 100 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Ground Armor": 101 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Shields": 102 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Air Weapon": 103 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Air Armor": 104 + SC2LOTV_ITEM_ID_OFFSET, } - inventory = tracker_data.get_player_inventory_counts(team, player) + inventory: collections.Counter = tracker_data.get_player_inventory_counts(team, player) for grouped_item_name, grouped_item_id in grouped_item_ids.items(): count: int = inventory[grouped_item_id] if count > 0: for replacement_item in grouped_item_replacements[grouped_item_name]: replacement_id: int = replacement_item_ids[replacement_item] - inventory[replacement_id] = count + if replacement_id not in inventory or count > inventory[replacement_id]: + # If two groups provide the same individual item, maximum is used + # (this behavior is used for Protoss Shields) + inventory[replacement_id] = count # Determine display for progressive items progressive_items = { - "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Stimpack (Marine)": 208 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Stimpack (Firebat)": 226 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Stimpack (Marauder)": 228 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Stimpack (Reaper)": 250 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Stimpack (Hellion)": 259 + SC2WOL_ITEM_ID_OFFSET, - "Progressive High Impact Payload (Thor)": 361 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Cross-Spectrum Dampeners (Banshee)": 316 + SC2WOL_ITEM_ID_OFFSET, - "Progressive Regenerative Bio-Steel": 617 + SC2WOL_ITEM_ID_OFFSET + "Progressive Terran Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Terran Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Fire-Suppression System": 206 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Orbital Command": 207 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stimpack (Marine)": 208 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stimpack (Firebat)": 226 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stimpack (Marauder)": 228 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stimpack (Reaper)": 250 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stimpack (Hellion)": 259 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Replenishable Magazine (Vulture)": 303 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Tri-Lithium Power Cell (Diamondback)": 306 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Tomahawk Power Cells (Wraith)": 312 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Cross-Spectrum Dampeners (Banshee)": 316 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Missile Pods (Battlecruiser)": 318 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Defensive Matrix (Battlecruiser)": 319 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Immortality Protocol (Thor)": 325 + SC2WOL_ITEM_ID_OFFSET, + "Progressive High Impact Payload (Thor)": 361 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Augmented Thrusters (Planetary Fortress)": 388 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Regenerative Bio-Steel": 617 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Stealth Suit Module (Nova Suit Module)": 904 + SC2WOL_ITEM_ID_OFFSET, + "Progressive Zerg Melee Attack": 100 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Missile Attack": 101 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Ground Carapace": 102 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Flyer Attack": 103 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Zerg Flyer Carapace": 104 + SC2HOTS_ITEM_ID_OFFSET, + "Progressive Protoss Ground Weapon": 100 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Ground Armor": 101 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Shields": 102 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Air Weapon": 103 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Protoss Air Armor": 104 + SC2LOTV_ITEM_ID_OFFSET, + "Progressive Proxy Pylon (Spear of Adun Calldown)": 701 + SC2LOTV_ITEM_ID_OFFSET, } + # Format: L0, L1, L2, L3 progressive_names = { - "Progressive Infantry Weapon": ["Infantry Weapons Level 1", "Infantry Weapons Level 1", - "Infantry Weapons Level 2", "Infantry Weapons Level 3"], - "Progressive Infantry Armor": ["Infantry Armor Level 1", "Infantry Armor Level 1", - "Infantry Armor Level 2", "Infantry Armor Level 3"], - "Progressive Vehicle Weapon": ["Vehicle Weapons Level 1", "Vehicle Weapons Level 1", - "Vehicle Weapons Level 2", "Vehicle Weapons Level 3"], - "Progressive Vehicle Armor": ["Vehicle Armor Level 1", "Vehicle Armor Level 1", - "Vehicle Armor Level 2", "Vehicle Armor Level 3"], - "Progressive Ship Weapon": ["Ship Weapons Level 1", "Ship Weapons Level 1", - "Ship Weapons Level 2", "Ship Weapons Level 3"], - "Progressive Ship Armor": ["Ship Armor Level 1", "Ship Armor Level 1", - "Ship Armor Level 2", "Ship Armor Level 3"], - "Progressive Stimpack (Marine)": ["Stimpack (Marine)", "Stimpack (Marine)", - "Super Stimpack (Marine)"], - "Progressive Stimpack (Firebat)": ["Stimpack (Firebat)", "Stimpack (Firebat)", - "Super Stimpack (Firebat)"], - "Progressive Stimpack (Marauder)": ["Stimpack (Marauder)", "Stimpack (Marauder)", - "Super Stimpack (Marauder)"], - "Progressive Stimpack (Reaper)": ["Stimpack (Reaper)", "Stimpack (Reaper)", - "Super Stimpack (Reaper)"], - "Progressive Stimpack (Hellion)": ["Stimpack (Hellion)", "Stimpack (Hellion)", - "Super Stimpack (Hellion)"], - "Progressive High Impact Payload (Thor)": ["High Impact Payload (Thor)", - "High Impact Payload (Thor)", "Smart Servos (Thor)"], - "Progressive Cross-Spectrum Dampeners (Banshee)": ["Cross-Spectrum Dampeners (Banshee)", - "Cross-Spectrum Dampeners (Banshee)", - "Advanced Cross-Spectrum Dampeners (Banshee)"], - "Progressive Regenerative Bio-Steel": ["Regenerative Bio-Steel Level 1", - "Regenerative Bio-Steel Level 1", - "Regenerative Bio-Steel Level 2"] + "Progressive Terran Infantry Weapon": ["Terran Infantry Weapons Level 1", + "Terran Infantry Weapons Level 1", + "Terran Infantry Weapons Level 2", + "Terran Infantry Weapons Level 3"], + "Progressive Terran Infantry Armor": ["Terran Infantry Armor Level 1", + "Terran Infantry Armor Level 1", + "Terran Infantry Armor Level 2", + "Terran Infantry Armor Level 3"], + "Progressive Terran Vehicle Weapon": ["Terran Vehicle Weapons Level 1", + "Terran Vehicle Weapons Level 1", + "Terran Vehicle Weapons Level 2", + "Terran Vehicle Weapons Level 3"], + "Progressive Terran Vehicle Armor": ["Terran Vehicle Armor Level 1", + "Terran Vehicle Armor Level 1", + "Terran Vehicle Armor Level 2", + "Terran Vehicle Armor Level 3"], + "Progressive Terran Ship Weapon": ["Terran Ship Weapons Level 1", + "Terran Ship Weapons Level 1", + "Terran Ship Weapons Level 2", + "Terran Ship Weapons Level 3"], + "Progressive Terran Ship Armor": ["Terran Ship Armor Level 1", + "Terran Ship Armor Level 1", + "Terran Ship Armor Level 2", + "Terran Ship Armor Level 3"], + "Progressive Fire-Suppression System": ["Fire-Suppression System Level 1", + "Fire-Suppression System Level 1", + "Fire-Suppression System Level 2"], + "Progressive Orbital Command": ["Orbital Command", "Orbital Command", + "Planetary Command Module"], + "Progressive Stimpack (Marine)": ["Stimpack (Marine)", "Stimpack (Marine)", + "Super Stimpack (Marine)"], + "Progressive Stimpack (Firebat)": ["Stimpack (Firebat)", "Stimpack (Firebat)", + "Super Stimpack (Firebat)"], + "Progressive Stimpack (Marauder)": ["Stimpack (Marauder)", "Stimpack (Marauder)", + "Super Stimpack (Marauder)"], + "Progressive Stimpack (Reaper)": ["Stimpack (Reaper)", "Stimpack (Reaper)", + "Super Stimpack (Reaper)"], + "Progressive Stimpack (Hellion)": ["Stimpack (Hellion)", "Stimpack (Hellion)", + "Super Stimpack (Hellion)"], + "Progressive Replenishable Magazine (Vulture)": ["Replenishable Magazine (Vulture)", + "Replenishable Magazine (Vulture)", + "Replenishable Magazine (Free) (Vulture)"], + "Progressive Tri-Lithium Power Cell (Diamondback)": ["Tri-Lithium Power Cell (Diamondback)", + "Tri-Lithium Power Cell (Diamondback)", + "Tungsten Spikes (Diamondback)"], + "Progressive Tomahawk Power Cells (Wraith)": ["Tomahawk Power Cells (Wraith)", + "Tomahawk Power Cells (Wraith)", + "Unregistered Cloaking Module (Wraith)"], + "Progressive Cross-Spectrum Dampeners (Banshee)": ["Cross-Spectrum Dampeners (Banshee)", + "Cross-Spectrum Dampeners (Banshee)", + "Advanced Cross-Spectrum Dampeners (Banshee)"], + "Progressive Missile Pods (Battlecruiser)": ["Missile Pods (Battlecruiser) Level 1", + "Missile Pods (Battlecruiser) Level 1", + "Missile Pods (Battlecruiser) Level 2"], + "Progressive Defensive Matrix (Battlecruiser)": ["Defensive Matrix (Battlecruiser)", + "Defensive Matrix (Battlecruiser)", + "Advanced Defensive Matrix (Battlecruiser)"], + "Progressive Immortality Protocol (Thor)": ["Immortality Protocol (Thor)", + "Immortality Protocol (Thor)", + "Immortality Protocol (Free) (Thor)"], + "Progressive High Impact Payload (Thor)": ["High Impact Payload (Thor)", + "High Impact Payload (Thor)", "Smart Servos (Thor)"], + "Progressive Augmented Thrusters (Planetary Fortress)": ["Lift Off (Planetary Fortress)", + "Lift Off (Planetary Fortress)", + "Armament Stabilizers (Planetary Fortress)"], + "Progressive Regenerative Bio-Steel": ["Regenerative Bio-Steel Level 1", + "Regenerative Bio-Steel Level 1", + "Regenerative Bio-Steel Level 2", + "Regenerative Bio-Steel Level 3"], + "Progressive Stealth Suit Module (Nova Suit Module)": ["Stealth Suit Module (Nova Suit Module)", + "Cloak (Nova Suit Module)", + "Permanently Cloaked (Nova Suit Module)"], + "Progressive Zerg Melee Attack": ["Zerg Melee Attack Level 1", + "Zerg Melee Attack Level 1", + "Zerg Melee Attack Level 2", + "Zerg Melee Attack Level 3"], + "Progressive Zerg Missile Attack": ["Zerg Missile Attack Level 1", + "Zerg Missile Attack Level 1", + "Zerg Missile Attack Level 2", + "Zerg Missile Attack Level 3"], + "Progressive Zerg Ground Carapace": ["Zerg Ground Carapace Level 1", + "Zerg Ground Carapace Level 1", + "Zerg Ground Carapace Level 2", + "Zerg Ground Carapace Level 3"], + "Progressive Zerg Flyer Attack": ["Zerg Flyer Attack Level 1", + "Zerg Flyer Attack Level 1", + "Zerg Flyer Attack Level 2", + "Zerg Flyer Attack Level 3"], + "Progressive Zerg Flyer Carapace": ["Zerg Flyer Carapace Level 1", + "Zerg Flyer Carapace Level 1", + "Zerg Flyer Carapace Level 2", + "Zerg Flyer Carapace Level 3"], + "Progressive Protoss Ground Weapon": ["Protoss Ground Weapon Level 1", + "Protoss Ground Weapon Level 1", + "Protoss Ground Weapon Level 2", + "Protoss Ground Weapon Level 3"], + "Progressive Protoss Ground Armor": ["Protoss Ground Armor Level 1", + "Protoss Ground Armor Level 1", + "Protoss Ground Armor Level 2", + "Protoss Ground Armor Level 3"], + "Progressive Protoss Shields": ["Protoss Shields Level 1", "Protoss Shields Level 1", + "Protoss Shields Level 2", "Protoss Shields Level 3"], + "Progressive Protoss Air Weapon": ["Protoss Air Weapon Level 1", + "Protoss Air Weapon Level 1", + "Protoss Air Weapon Level 2", + "Protoss Air Weapon Level 3"], + "Progressive Protoss Air Armor": ["Protoss Air Armor Level 1", + "Protoss Air Armor Level 1", + "Protoss Air Armor Level 2", + "Protoss Air Armor Level 3"], + "Progressive Proxy Pylon (Spear of Adun Calldown)": ["Proxy Pylon (Spear of Adun Calldown)", + "Proxy Pylon (Spear of Adun Calldown)", + "Warp In Reinforcements (Spear of Adun Calldown)"] } for item_name, item_id in progressive_items.items(): level = min(inventory[item_id], len(progressive_names[item_name]) - 1) @@ -1925,24 +2571,62 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int .replace("(", "") .replace(")", "")) display_data[base_name + "_level"] = level - display_data[base_name + "_url"] = icons[display_name] + display_data[base_name + "_url"] = icons[display_name] if display_name in icons else "FIXME" display_data[base_name + "_name"] = display_name # Multi-items multi_items = { - "+15 Starting Minerals": 800 + SC2WOL_ITEM_ID_OFFSET, - "+15 Starting Vespene": 801 + SC2WOL_ITEM_ID_OFFSET, - "+2 Starting Supply": 802 + SC2WOL_ITEM_ID_OFFSET + "Additional Starting Minerals": 800 + SC2WOL_ITEM_ID_OFFSET, + "Additional Starting Vespene": 801 + SC2WOL_ITEM_ID_OFFSET, + "Additional Starting Supply": 802 + SC2WOL_ITEM_ID_OFFSET } for item_name, item_id in multi_items.items(): base_name = item_name.split()[-1].lower() count = inventory[item_id] if base_name == "supply": - count = count * 2 - display_data[base_name + "_count"] = count - else: - count = count * 15 - display_data[base_name + "_count"] = count + count = count * starting_supply_per_item + elif base_name == "minerals": + count = count * minerals_per_item + elif base_name == "vespene": + count = count * vespene_per_item + display_data[base_name + "_count"] = count + # Kerrigan level + level_items = { + "1 Kerrigan Level": 509 + SC2HOTS_ITEM_ID_OFFSET, + "2 Kerrigan Levels": 508 + SC2HOTS_ITEM_ID_OFFSET, + "3 Kerrigan Levels": 507 + SC2HOTS_ITEM_ID_OFFSET, + "4 Kerrigan Levels": 506 + SC2HOTS_ITEM_ID_OFFSET, + "5 Kerrigan Levels": 505 + SC2HOTS_ITEM_ID_OFFSET, + "6 Kerrigan Levels": 504 + SC2HOTS_ITEM_ID_OFFSET, + "7 Kerrigan Levels": 503 + SC2HOTS_ITEM_ID_OFFSET, + "8 Kerrigan Levels": 502 + SC2HOTS_ITEM_ID_OFFSET, + "9 Kerrigan Levels": 501 + SC2HOTS_ITEM_ID_OFFSET, + "10 Kerrigan Levels": 500 + SC2HOTS_ITEM_ID_OFFSET, + "14 Kerrigan Levels": 510 + SC2HOTS_ITEM_ID_OFFSET, + "35 Kerrigan Levels": 511 + SC2HOTS_ITEM_ID_OFFSET, + "70 Kerrigan Levels": 512 + SC2HOTS_ITEM_ID_OFFSET, + } + level_amounts = { + "1 Kerrigan Level": 1, + "2 Kerrigan Levels": 2, + "3 Kerrigan Levels": 3, + "4 Kerrigan Levels": 4, + "5 Kerrigan Levels": 5, + "6 Kerrigan Levels": 6, + "7 Kerrigan Levels": 7, + "8 Kerrigan Levels": 8, + "9 Kerrigan Levels": 9, + "10 Kerrigan Levels": 10, + "14 Kerrigan Levels": 14, + "35 Kerrigan Levels": 35, + "70 Kerrigan Levels": 70, + } + kerrigan_level = 0 + for item_name, item_id in level_items.items(): + count = inventory[item_id] + amount = level_amounts[item_name] + kerrigan_level += count * amount + display_data["kerrigan_level"] = kerrigan_level # Victory condition game_state = tracker_data.get_player_client_status(team, player) @@ -1951,7 +2635,7 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int # Turn location IDs into mission objective counts locations = tracker_data.get_player_locations(team, player) checked_locations = tracker_data.get_player_checked_locations(team, player) - lookup_name = lambda id: tracker_data.location_id_to_name["Starcraft 2 Wings of Liberty"][id] + lookup_name = lambda id: tracker_data.location_id_to_name["Starcraft 2"][id] location_info = {mission_name: {lookup_name(id): (id in checked_locations) for id in mission_locations if id in set(locations)} for mission_name, mission_locations in sc2wol_location_ids.items()} @@ -1963,9 +2647,9 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int mission_name, mission_locations in sc2wol_location_ids.items()} checks_in_area['Total'] = sum(checks_in_area.values()) - lookup_any_item_id_to_name = tracker_data.item_id_to_name["Starcraft 2 Wings of Liberty"] + lookup_any_item_id_to_name = tracker_data.item_id_to_name["Starcraft 2"] return render_template( - "tracker__Starcraft2WingsOfLiberty.html", + "tracker__Starcraft2.html", inventory=inventory, icons=icons, acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0}, @@ -1979,4 +2663,4 @@ def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int **display_data, ) - _player_trackers["Starcraft 2 Wings of Liberty"] = render_Starcraft2WingsOfLiberty_tracker + _player_trackers["Starcraft 2"] = render_Starcraft2_tracker diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index d6730b7308ae..dea869fb5536 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -134,8 +134,8 @@ # Sonic Adventure 2 Battle /worlds/sa2b/ @PoryGone @RaspberrySpace -# Starcraft 2 Wings of Liberty -/worlds/sc2wol/ @Ziktofel +# Starcraft 2 +/worlds/sc2/ @Ziktofel # Super Metroid /worlds/sm/ @lordlou diff --git a/setup.py b/setup.py index 68cab1d5e25a..ffb7e02fabb3 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,6 @@ # LogicMixin is broken before 3.10 import revamp if sys.version_info < (3,10): non_apworlds.add("Hollow Knight") - non_apworlds.add("Starcraft 2 Wings of Liberty") def download_SNI(): print("Updating SNI") diff --git a/test/general/test_items.py b/test/general/test_items.py index 82b6030379d6..25623d4d8357 100644 --- a/test/general/test_items.py +++ b/test/general/test_items.py @@ -23,8 +23,8 @@ def test_item_name_group_has_valid_item(self): {"Pendants", "Crystals"}, "Ocarina of Time": {"medallions", "stones", "rewards", "logic_bottles"}, - "Starcraft 2 Wings of Liberty": - {"Missions"}, + "Starcraft 2": + {"Missions", "WoL Missions"}, } for game_name, world_type in AutoWorldRegister.world_types.items(): with self.subTest(game_name, game_name=game_name): diff --git a/worlds/_sc2common/bot/bot_ai.py b/worlds/_sc2common/bot/bot_ai.py index 79c11a5ad4a3..b08f8af29ac0 100644 --- a/worlds/_sc2common/bot/bot_ai.py +++ b/worlds/_sc2common/bot/bot_ai.py @@ -12,6 +12,8 @@ from .unit import Unit from .units import Units +from worlds._sc2common.bot import logger + if TYPE_CHECKING: from .game_info import Ramp @@ -310,6 +312,7 @@ async def chat_send(self, message: str, team_only: bool = False): :param message: :param team_only:""" assert isinstance(message, str), f"{message} is not a string" + logger.debug("Sending message: " + message) await self.client.chat_send(message, team_only) def in_map_bounds(self, pos: Union[Point2, tuple, list]) -> bool: diff --git a/worlds/sc2/Client.py b/worlds/sc2/Client.py new file mode 100644 index 000000000000..fe6efb9c3035 --- /dev/null +++ b/worlds/sc2/Client.py @@ -0,0 +1,1631 @@ +from __future__ import annotations + +import asyncio +import copy +import ctypes +import enum +import inspect +import logging +import multiprocessing +import os.path +import re +import sys +import tempfile +import typing +import queue +import zipfile +import io +import random +import concurrent.futures +from pathlib import Path + +# CommonClient import first to trigger ModuleUpdater +from CommonClient import CommonContext, server_loop, ClientCommandProcessor, gui_enabled, get_base_parser +from Utils import init_logging, is_windows, async_start +from worlds.sc2 import ItemNames +from worlds.sc2.ItemGroups import item_name_groups, unlisted_item_name_groups +from worlds.sc2 import Options +from worlds.sc2.Options import ( + MissionOrder, KerriganPrimalStatus, kerrigan_unit_available, KerriganPresence, + GameSpeed, GenericUpgradeItems, GenericUpgradeResearch, ColorChoice, GenericUpgradeMissions, + LocationInclusion, ExtraLocations, MasteryLocations, ChallengeLocations, VanillaLocations, + DisableForcedCamera, SkipCutscenes, GrantStoryTech, GrantStoryLevels, TakeOverAIAllies, RequiredTactics, + SpearOfAdunPresence, SpearOfAdunPresentInNoBuild, SpearOfAdunAutonomouslyCastAbilityPresence, + SpearOfAdunAutonomouslyCastPresentInNoBuild +) + + +if __name__ == "__main__": + init_logging("SC2Client", exception_logger="Client") + +logger = logging.getLogger("Client") +sc2_logger = logging.getLogger("Starcraft2") + +import nest_asyncio +from worlds._sc2common import bot +from worlds._sc2common.bot.data import Race +from worlds._sc2common.bot.main import run_game +from worlds._sc2common.bot.player import Bot +from worlds.sc2.Items import lookup_id_to_name, get_full_item_list, ItemData, type_flaggroups, upgrade_numbers, upgrade_numbers_all +from worlds.sc2.Locations import SC2WOL_LOC_ID_OFFSET, LocationType, SC2HOTS_LOC_ID_OFFSET +from worlds.sc2.MissionTables import lookup_id_to_mission, SC2Campaign, lookup_name_to_mission, \ + lookup_id_to_campaign, MissionConnection, SC2Mission, campaign_mission_table, SC2Race, get_no_build_missions +from worlds.sc2.Regions import MissionInfo + +import colorama +from Options import Option +from NetUtils import ClientStatus, NetworkItem, JSONtoTextParser, JSONMessagePart, add_json_item, add_json_location, add_json_text, JSONTypes +from MultiServer import mark_raw + +pool = concurrent.futures.ThreadPoolExecutor(1) +loop = asyncio.get_event_loop_policy().new_event_loop() +nest_asyncio.apply(loop) +MAX_BONUS: int = 28 +VICTORY_MODULO: int = 100 + +# GitHub repo where the Map/mod data is hosted for /download_data command +DATA_REPO_OWNER = "Ziktofel" +DATA_REPO_NAME = "Archipelago-SC2-data" +DATA_API_VERSION = "API3" + +# Bot controller +CONTROLLER_HEALTH: int = 38281 +CONTROLLER2_HEALTH: int = 38282 + +# Games +STARCRAFT2 = "Starcraft 2" +STARCRAFT2_WOL = "Starcraft 2 Wings of Liberty" + + +# Data version file path. +# This file is used to tell if the downloaded data are outdated +# Associated with /download_data command +def get_metadata_file() -> str: + return os.environ["SC2PATH"] + os.sep + "ArchipelagoSC2Metadata.txt" + + +class ConfigurableOptionType(enum.Enum): + INTEGER = enum.auto() + ENUM = enum.auto() + +class ConfigurableOptionInfo(typing.NamedTuple): + name: str + variable_name: str + option_class: typing.Type[Option] + option_type: ConfigurableOptionType = ConfigurableOptionType.ENUM + can_break_logic: bool = False + + +class ColouredMessage: + def __init__(self, text: str = '') -> None: + self.parts: typing.List[dict] = [] + if text: + self(text) + def __call__(self, text: str) -> 'ColouredMessage': + add_json_text(self.parts, text) + return self + def coloured(self, text: str, colour: str) -> 'ColouredMessage': + add_json_text(self.parts, text, type="color", color=colour) + return self + def location(self, location_id: int, player_id: int = 0) -> 'ColouredMessage': + add_json_location(self.parts, location_id, player_id) + return self + def item(self, item_id: int, player_id: int = 0, flags: int = 0) -> 'ColouredMessage': + add_json_item(self.parts, item_id, player_id, flags) + return self + def player(self, player_id: int) -> 'ColouredMessage': + add_json_text(self.parts, str(player_id), type=JSONTypes.player_id) + return self + def send(self, ctx: SC2Context) -> None: + ctx.on_print_json({"data": self.parts, "cmd": "PrintJSON"}) + + +class StarcraftClientProcessor(ClientCommandProcessor): + ctx: SC2Context + echo_commands = True + + def formatted_print(self, text: str) -> None: + """Prints with kivy formatting to the GUI, and also prints to command-line and to all logs""" + # Note(mm): Bold/underline can help readability, but unfortunately the CommonClient does not filter bold tags from command-line output. + # Regardless, using `on_print_json` to get formatted text in the GUI and output in the command-line and in the logs, + # without having to branch code from CommonClient + self.ctx.on_print_json({"data": [{"text": text}]}) + + def _cmd_difficulty(self, difficulty: str = "") -> bool: + """Overrides the current difficulty set for the world. Takes the argument casual, normal, hard, or brutal""" + options = difficulty.split() + num_options = len(options) + + if num_options > 0: + difficulty_choice = options[0].lower() + if difficulty_choice == "casual": + self.ctx.difficulty_override = 0 + elif difficulty_choice == "normal": + self.ctx.difficulty_override = 1 + elif difficulty_choice == "hard": + self.ctx.difficulty_override = 2 + elif difficulty_choice == "brutal": + self.ctx.difficulty_override = 3 + else: + self.output("Unable to parse difficulty '" + options[0] + "'") + return False + + self.output("Difficulty set to " + options[0]) + return True + + else: + if self.ctx.difficulty == -1: + self.output("Please connect to a seed before checking difficulty.") + else: + current_difficulty = self.ctx.difficulty + if self.ctx.difficulty_override >= 0: + current_difficulty = self.ctx.difficulty_override + self.output("Current difficulty: " + ["Casual", "Normal", "Hard", "Brutal"][current_difficulty]) + self.output("To change the difficulty, add the name of the difficulty after the command.") + return False + + + def _cmd_game_speed(self, game_speed: str = "") -> bool: + """Overrides the current game speed for the world. + Takes the arguments default, slower, slow, normal, fast, faster""" + options = game_speed.split() + num_options = len(options) + + if num_options > 0: + speed_choice = options[0].lower() + if speed_choice == "default": + self.ctx.game_speed_override = 0 + elif speed_choice == "slower": + self.ctx.game_speed_override = 1 + elif speed_choice == "slow": + self.ctx.game_speed_override = 2 + elif speed_choice == "normal": + self.ctx.game_speed_override = 3 + elif speed_choice == "fast": + self.ctx.game_speed_override = 4 + elif speed_choice == "faster": + self.ctx.game_speed_override = 5 + else: + self.output("Unable to parse game speed '" + options[0] + "'") + return False + + self.output("Game speed set to " + options[0]) + return True + + else: + if self.ctx.game_speed == -1: + self.output("Please connect to a seed before checking game speed.") + else: + current_speed = self.ctx.game_speed + if self.ctx.game_speed_override >= 0: + current_speed = self.ctx.game_speed_override + self.output("Current game speed: " + + ["Default", "Slower", "Slow", "Normal", "Fast", "Faster"][current_speed]) + self.output("To change the game speed, add the name of the speed after the command," + " or Default to select based on difficulty.") + return False + + @mark_raw + def _cmd_received(self, filter_search: str = "") -> bool: + """List received items. + Pass in a parameter to filter the search by partial item name or exact item group.""" + # Groups must be matched case-sensitively, so we properly capitalize the search term + # eg. "Spear of Adun" over "Spear Of Adun" or "spear of adun" + # This fails a lot of item name matches, but those should be found by partial name match + formatted_filter_search = " ".join([(part.lower() if len(part) <= 3 else part.lower().capitalize()) for part in filter_search.split()]) + + def item_matches_filter(item_name: str) -> bool: + # The filter can be an exact group name or a partial item name + # Partial item name can be matched case-insensitively + if filter_search.lower() in item_name.lower(): + return True + # The search term should already be formatted as a group name + if formatted_filter_search in item_name_groups and item_name in item_name_groups[formatted_filter_search]: + return True + return False + + items = get_full_item_list() + categorized_items: typing.Dict[SC2Race, typing.List[int]] = {} + parent_to_child: typing.Dict[int, typing.List[int]] = {} + items_received: typing.Dict[int, typing.List[NetworkItem]] = {} + filter_match_count = 0 + for item in self.ctx.items_received: + items_received.setdefault(item.item, []).append(item) + items_received_set = set(items_received) + for item_data in items.values(): + if item_data.parent_item: + parent_to_child.setdefault(items[item_data.parent_item].code, []).append(item_data.code) + else: + categorized_items.setdefault(item_data.race, []).append(item_data.code) + for faction in SC2Race: + has_printed_faction_title = False + def print_faction_title(): + if not has_printed_faction_title: + self.formatted_print(f" [u]{faction.name}[/u] ") + + for item_id in categorized_items[faction]: + item_name = self.ctx.item_names[item_id] + received_child_items = items_received_set.intersection(parent_to_child.get(item_id, [])) + matching_children = [child for child in received_child_items + if item_matches_filter(self.ctx.item_names[child])] + received_items_of_this_type = items_received.get(item_id, []) + item_is_match = item_matches_filter(item_name) + if item_is_match or len(matching_children) > 0: + # Print found item if it or its children match the filter + if item_is_match: + filter_match_count += len(received_items_of_this_type) + for item in received_items_of_this_type: + print_faction_title() + has_printed_faction_title = True + (ColouredMessage('* ').item(item.item, flags=item.flags) + (" from ").location(item.location, self.ctx.slot) + (" by ").player(item.player) + ).send(self.ctx) + + if received_child_items: + # We have this item's children + if len(matching_children) == 0: + # ...but none of them match the filter + continue + + if not received_items_of_this_type: + # We didn't receive the item itself + print_faction_title() + has_printed_faction_title = True + ColouredMessage("- ").coloured(item_name, "black")(" - not obtained").send(self.ctx) + + for child_item in matching_children: + received_items_of_this_type = items_received.get(child_item, []) + for item in received_items_of_this_type: + filter_match_count += len(received_items_of_this_type) + (ColouredMessage(' * ').item(item.item, flags=item.flags) + (" from ").location(item.location, self.ctx.slot) + (" by ").player(item.player) + ).send(self.ctx) + + non_matching_children = len(received_child_items) - len(matching_children) + if non_matching_children > 0: + self.formatted_print(f" + {non_matching_children} child items that don't match the filter") + if filter_search == "": + self.formatted_print(f"[b]Obtained: {len(self.ctx.items_received)} items[/b]") + else: + self.formatted_print(f"[b]Filter \"{filter_search}\" found {filter_match_count} out of {len(self.ctx.items_received)} obtained items[/b]") + return True + + def _cmd_option(self, option_name: str = "", option_value: str = "") -> None: + """Sets a Starcraft game option that can be changed after generation. Use "/option list" to see all options.""" + + LOGIC_WARNING = f" *Note changing this may result in logically unbeatable games*\n" + + options = ( + ConfigurableOptionInfo('kerrigan_presence', 'kerrigan_presence', Options.KerriganPresence, can_break_logic=True), + ConfigurableOptionInfo('soa_presence', 'spear_of_adun_presence', Options.SpearOfAdunPresence, can_break_logic=True), + ConfigurableOptionInfo('soa_in_nobuilds', 'spear_of_adun_present_in_no_build', Options.SpearOfAdunPresentInNoBuild, can_break_logic=True), + ConfigurableOptionInfo('control_ally', 'take_over_ai_allies', Options.TakeOverAIAllies, can_break_logic=True), + ConfigurableOptionInfo('minerals_per_item', 'minerals_per_item', Options.MineralsPerItem, ConfigurableOptionType.INTEGER), + ConfigurableOptionInfo('gas_per_item', 'vespene_per_item', Options.VespenePerItem, ConfigurableOptionType.INTEGER), + ConfigurableOptionInfo('supply_per_item', 'starting_supply_per_item', Options.StartingSupplyPerItem, ConfigurableOptionType.INTEGER), + ConfigurableOptionInfo('no_forced_camera', 'disable_forced_camera', Options.DisableForcedCamera), + ConfigurableOptionInfo('skip_cutscenes', 'skip_cutscenes', Options.SkipCutscenes), + ) + + WARNING_COLOUR = "salmon" + CMD_COLOUR = "slateblue" + boolean_option_map = { + 'y': 'true', 'yes': 'true', 'n': 'false', 'no': 'false', + } + + help_message = ColouredMessage(inspect.cleandoc(""" + Options + -------------------- + """))('\n') + for option in options: + option_help_text = inspect.cleandoc(option.option_class.__doc__ or "No description provided.").split('\n', 1)[0] + help_message.coloured(option.name, CMD_COLOUR)(": " + " | ".join(option.option_class.options) + + f" -- {option_help_text}\n") + if option.can_break_logic: + help_message.coloured(LOGIC_WARNING, WARNING_COLOUR) + help_message("--------------------\nEnter an option without arguments to see its current value.\n") + + if not option_name or option_name == 'list' or option_name == 'help': + help_message.send(self.ctx) + return + for option in options: + if option_name == option.name: + option_value = boolean_option_map.get(option_value, option_value) + if not option_value: + pass + elif option.option_type == ConfigurableOptionType.ENUM and option_value in option.option_class.options: + self.ctx.__dict__[option.variable_name] = option.option_class.options[option_value] + elif option.option_type == ConfigurableOptionType.INTEGER: + try: + self.ctx.__dict__[option.variable_name] = int(option_value, base=0) + except: + self.output(f"{option_value} is not a valid integer") + else: + self.output(f"Unknown option value '{option_value}'") + ColouredMessage(f"{option.name} is '{option.option_class.get_option_name(self.ctx.__dict__[option.variable_name])}'").send(self.ctx) + break + else: + self.output(f"Unknown option '{option_name}'") + help_message.send(self.ctx) + + def _cmd_color(self, faction: str = "", color: str = "") -> None: + """Changes the player color for a given faction.""" + player_colors = [ + "White", "Red", "Blue", "Teal", + "Purple", "Yellow", "Orange", "Green", + "LightPink", "Violet", "LightGrey", "DarkGreen", + "Brown", "LightGreen", "DarkGrey", "Pink", + "Rainbow", "Random", "Default" + ] + var_names = { + 'raynor': 'player_color_raynor', + 'kerrigan': 'player_color_zerg', + 'primal': 'player_color_zerg_primal', + 'protoss': 'player_color_protoss', + 'nova': 'player_color_nova', + } + faction = faction.lower() + if not faction: + for faction_name, key in var_names.items(): + self.output(f"Current player color for {faction_name}: {player_colors[self.ctx.__dict__[key]]}") + self.output("To change your color, add the faction name and color after the command.") + self.output("Available factions: " + ', '.join(var_names)) + self.output("Available colors: " + ', '.join(player_colors)) + return + elif faction not in var_names: + self.output(f"Unknown faction '{faction}'.") + self.output("Available factions: " + ', '.join(var_names)) + return + match_colors = [player_color.lower() for player_color in player_colors] + if not color: + self.output(f"Current player color for {faction}: {player_colors[self.ctx.__dict__[var_names[faction]]]}") + self.output("To change this faction's colors, add the name of the color after the command.") + self.output("Available colors: " + ', '.join(player_colors)) + else: + if color.lower() not in match_colors: + self.output(color + " is not a valid color. Available colors: " + ', '.join(player_colors)) + return + if color.lower() == "random": + color = random.choice(player_colors[:16]) + self.ctx.__dict__[var_names[faction]] = match_colors.index(color.lower()) + self.ctx.pending_color_update = True + self.output(f"Color for {faction} set to " + player_colors[self.ctx.__dict__[var_names[faction]]]) + + def _cmd_disable_mission_check(self) -> bool: + """Disables the check to see if a mission is available to play. Meant for co-op runs where one player can play + the next mission in a chain the other player is doing.""" + self.ctx.missions_unlocked = True + sc2_logger.info("Mission check has been disabled") + return True + + def _cmd_play(self, mission_id: str = "") -> bool: + """Start a Starcraft 2 mission""" + + options = mission_id.split() + num_options = len(options) + + if num_options > 0: + mission_number = int(options[0]) + + self.ctx.play_mission(mission_number) + + else: + sc2_logger.info( + "Mission ID needs to be specified. Use /unfinished or /available to view ids for available missions.") + return False + + return True + + def _cmd_available(self) -> bool: + """Get what missions are currently available to play""" + + request_available_missions(self.ctx) + return True + + def _cmd_unfinished(self) -> bool: + """Get what missions are currently available to play and have not had all locations checked""" + + request_unfinished_missions(self.ctx) + return True + + @mark_raw + def _cmd_set_path(self, path: str = '') -> bool: + """Manually set the SC2 install directory (if the automatic detection fails).""" + if path: + os.environ["SC2PATH"] = path + is_mod_installed_correctly() + return True + else: + sc2_logger.warning("When using set_path, you must type the path to your SC2 install directory.") + return False + + def _cmd_download_data(self) -> bool: + """Download the most recent release of the necessary files for playing SC2 with + Archipelago. Will overwrite existing files.""" + pool.submit(self._download_data) + return True + + @staticmethod + def _download_data() -> bool: + if "SC2PATH" not in os.environ: + check_game_install_path() + + if os.path.exists(get_metadata_file()): + with open(get_metadata_file(), "r") as f: + metadata = f.read() + else: + metadata = None + + tempzip, metadata = download_latest_release_zip( + DATA_REPO_OWNER, DATA_REPO_NAME, DATA_API_VERSION, metadata=metadata, force_download=True) + + if tempzip: + try: + zipfile.ZipFile(tempzip).extractall(path=os.environ["SC2PATH"]) + sc2_logger.info(f"Download complete. Package installed.") + if metadata is not None: + with open(get_metadata_file(), "w") as f: + f.write(metadata) + finally: + os.remove(tempzip) + else: + sc2_logger.warning("Download aborted/failed. Read the log for more information.") + return False + return True + + +class SC2JSONtoTextParser(JSONtoTextParser): + def __init__(self, ctx) -> None: + self.handlers = { + "ItemSend": self._handle_color, + "ItemCheat": self._handle_color, + "Hint": self._handle_color, + } + super().__init__(ctx) + + def _handle_color(self, node: JSONMessagePart) -> str: + codes = node["color"].split(";") + buffer = "".join(self.color_code(code) for code in codes if code in self.color_codes) + return buffer + self._handle_text(node) + '' + + def color_code(self, code: str) -> str: + return '' + + +class SC2Context(CommonContext): + command_processor = StarcraftClientProcessor + game = STARCRAFT2 + items_handling = 0b111 + + def __init__(self, *args, **kwargs) -> None: + super(SC2Context, self).__init__(*args, **kwargs) + self.raw_text_parser = SC2JSONtoTextParser(self) + + self.difficulty = -1 + self.game_speed = -1 + self.disable_forced_camera = 0 + self.skip_cutscenes = 0 + self.all_in_choice = 0 + self.mission_order = 0 + self.player_color_raynor = ColorChoice.option_blue + self.player_color_zerg = ColorChoice.option_orange + self.player_color_zerg_primal = ColorChoice.option_purple + self.player_color_protoss = ColorChoice.option_blue + self.player_color_nova = ColorChoice.option_dark_grey + self.pending_color_update = False + self.kerrigan_presence = 0 + self.kerrigan_primal_status = 0 + self.levels_per_check = 0 + self.checks_per_level = 1 + self.mission_req_table: typing.Dict[SC2Campaign, typing.Dict[str, MissionInfo]] = {} + self.final_mission: int = 29 + self.announcements: queue.Queue = queue.Queue() + self.sc2_run_task: typing.Optional[asyncio.Task] = None + self.missions_unlocked: bool = False # allow launching missions ignoring requirements + self.generic_upgrade_missions = 0 + self.generic_upgrade_research = 0 + self.generic_upgrade_items = 0 + self.location_inclusions: typing.Dict[LocationType, int] = {} + self.plando_locations: typing.List[str] = [] + self.current_tooltip = None + self.last_loc_list = None + self.difficulty_override = -1 + self.game_speed_override = -1 + self.mission_id_to_location_ids: typing.Dict[int, typing.List[int]] = {} + self.last_bot: typing.Optional[ArchipelagoBot] = None + self.slot_data_version = 2 + self.grant_story_tech = 0 + self.required_tactics = RequiredTactics.option_standard + self.take_over_ai_allies = TakeOverAIAllies.option_false + self.spear_of_adun_presence = SpearOfAdunPresence.option_not_present + self.spear_of_adun_present_in_no_build = SpearOfAdunPresentInNoBuild.option_false + self.spear_of_adun_autonomously_cast_ability_presence = SpearOfAdunAutonomouslyCastAbilityPresence.option_not_present + self.spear_of_adun_autonomously_cast_present_in_no_build = SpearOfAdunAutonomouslyCastPresentInNoBuild.option_false + self.minerals_per_item = 15 + self.vespene_per_item = 15 + self.starting_supply_per_item = 2 + self.nova_covert_ops_only = False + self.kerrigan_levels_per_mission_completed = 0 + + async def server_auth(self, password_requested: bool = False) -> None: + self.game = STARCRAFT2 + if password_requested and not self.password: + await super(SC2Context, self).server_auth(password_requested) + await self.get_username() + await self.send_connect() + if self.ui: + self.ui.first_check = True + + def is_legacy_game(self): + return self.game == STARCRAFT2_WOL + + def event_invalid_game(self): + if self.is_legacy_game(): + self.game = STARCRAFT2 + super().event_invalid_game() + else: + self.game = STARCRAFT2_WOL + async_start(self.send_connect()) + + def on_package(self, cmd: str, args: dict) -> None: + if cmd == "Connected": + self.difficulty = args["slot_data"]["game_difficulty"] + self.game_speed = args["slot_data"].get("game_speed", GameSpeed.option_default) + self.disable_forced_camera = args["slot_data"].get("disable_forced_camera", DisableForcedCamera.default) + self.skip_cutscenes = args["slot_data"].get("skip_cutscenes", SkipCutscenes.default) + self.all_in_choice = args["slot_data"]["all_in_map"] + self.slot_data_version = args["slot_data"].get("version", 2) + slot_req_table: dict = args["slot_data"]["mission_req"] + + first_item = list(slot_req_table.keys())[0] + # Maintaining backwards compatibility with older slot data + if first_item in [str(campaign.id) for campaign in SC2Campaign]: + # Multi-campaign + self.mission_req_table = {} + for campaign_id in slot_req_table: + campaign = lookup_id_to_campaign[int(campaign_id)] + self.mission_req_table[campaign] = { + mission: self.parse_mission_info(mission_info) + for mission, mission_info in slot_req_table[campaign_id].items() + } + else: + # Old format + self.mission_req_table = {SC2Campaign.GLOBAL: { + mission: self.parse_mission_info(mission_info) + for mission, mission_info in slot_req_table.items() + } + } + + self.mission_order = args["slot_data"].get("mission_order", MissionOrder.option_vanilla) + self.final_mission = args["slot_data"].get("final_mission", SC2Mission.ALL_IN.id) + self.player_color_raynor = args["slot_data"].get("player_color_terran_raynor", ColorChoice.option_blue) + self.player_color_zerg = args["slot_data"].get("player_color_zerg", ColorChoice.option_orange) + self.player_color_zerg_primal = args["slot_data"].get("player_color_zerg_primal", ColorChoice.option_purple) + self.player_color_protoss = args["slot_data"].get("player_color_protoss", ColorChoice.option_blue) + self.player_color_nova = args["slot_data"].get("player_color_nova", ColorChoice.option_dark_grey) + self.generic_upgrade_missions = args["slot_data"].get("generic_upgrade_missions", GenericUpgradeMissions.default) + self.generic_upgrade_items = args["slot_data"].get("generic_upgrade_items", GenericUpgradeItems.option_individual_items) + self.generic_upgrade_research = args["slot_data"].get("generic_upgrade_research", GenericUpgradeResearch.option_vanilla) + self.kerrigan_presence = args["slot_data"].get("kerrigan_presence", KerriganPresence.option_vanilla) + self.kerrigan_primal_status = args["slot_data"].get("kerrigan_primal_status", KerriganPrimalStatus.option_vanilla) + self.kerrigan_levels_per_mission_completed = args["slot_data"].get("kerrigan_levels_per_mission_completed", 0) + self.kerrigan_levels_per_mission_completed_cap = args["slot_data"].get("kerrigan_levels_per_mission_completed_cap", -1) + self.kerrigan_total_level_cap = args["slot_data"].get("kerrigan_total_level_cap", -1) + self.grant_story_tech = args["slot_data"].get("grant_story_tech", GrantStoryTech.option_false) + self.grant_story_levels = args["slot_data"].get("grant_story_levels", GrantStoryLevels.option_additive) + self.required_tactics = args["slot_data"].get("required_tactics", RequiredTactics.option_standard) + self.take_over_ai_allies = args["slot_data"].get("take_over_ai_allies", TakeOverAIAllies.option_false) + self.spear_of_adun_presence = args["slot_data"].get("spear_of_adun_presence", SpearOfAdunPresence.option_not_present) + self.spear_of_adun_present_in_no_build = args["slot_data"].get("spear_of_adun_present_in_no_build", SpearOfAdunPresentInNoBuild.option_false) + self.spear_of_adun_autonomously_cast_ability_presence = args["slot_data"].get("spear_of_adun_autonomously_cast_ability_presence", SpearOfAdunAutonomouslyCastAbilityPresence.option_not_present) + self.spear_of_adun_autonomously_cast_present_in_no_build = args["slot_data"].get("spear_of_adun_autonomously_cast_present_in_no_build", SpearOfAdunAutonomouslyCastPresentInNoBuild.option_false) + self.minerals_per_item = args["slot_data"].get("minerals_per_item", 15) + self.vespene_per_item = args["slot_data"].get("vespene_per_item", 15) + self.starting_supply_per_item = args["slot_data"].get("starting_supply_per_item", 2) + self.nova_covert_ops_only = args["slot_data"].get("nova_covert_ops_only", False) + + if self.required_tactics == RequiredTactics.option_no_logic: + # Locking Grant Story Tech/Levels if no logic + self.grant_story_tech = GrantStoryTech.option_true + self.grant_story_levels = GrantStoryLevels.option_minimum + + self.location_inclusions = { + LocationType.VICTORY: LocationInclusion.option_enabled, # Victory checks are always enabled + LocationType.VANILLA: args["slot_data"].get("vanilla_locations", VanillaLocations.default), + LocationType.EXTRA: args["slot_data"].get("extra_locations", ExtraLocations.default), + LocationType.CHALLENGE: args["slot_data"].get("challenge_locations", ChallengeLocations.default), + LocationType.MASTERY: args["slot_data"].get("mastery_locations", MasteryLocations.default), + } + self.plando_locations = args["slot_data"].get("plando_locations", []) + + self.build_location_to_mission_mapping() + + # Looks for the required maps and mods for SC2. Runs check_game_install_path. + maps_present = is_mod_installed_correctly() + if os.path.exists(get_metadata_file()): + with open(get_metadata_file(), "r") as f: + current_ver = f.read() + sc2_logger.debug(f"Current version: {current_ver}") + if is_mod_update_available(DATA_REPO_OWNER, DATA_REPO_NAME, DATA_API_VERSION, current_ver): + sc2_logger.info("NOTICE: Update for required files found. Run /download_data to install.") + elif maps_present: + sc2_logger.warning("NOTICE: Your map files may be outdated (version number not found). " + "Run /download_data to update them.") + + @staticmethod + def parse_mission_info(mission_info: dict[str, typing.Any]) -> MissionInfo: + if mission_info.get("id") is not None: + mission_info["mission"] = lookup_id_to_mission[mission_info["id"]] + elif isinstance(mission_info["mission"], int): + mission_info["mission"] = lookup_id_to_mission[mission_info["mission"]] + + return MissionInfo( + **{field: value for field, value in mission_info.items() if field in MissionInfo._fields} + ) + + def find_campaign(self, mission_name: str) -> SC2Campaign: + data = self.mission_req_table + for campaign in data.keys(): + if mission_name in data[campaign].keys(): + return campaign + sc2_logger.info(f"Attempted to find campaign of unknown mission '{mission_name}'; defaulting to GLOBAL") + return SC2Campaign.GLOBAL + + + + def on_print_json(self, args: dict) -> None: + # goes to this world + if "receiving" in args and self.slot_concerns_self(args["receiving"]): + relevant = True + # found in this world + elif "item" in args and self.slot_concerns_self(args["item"].player): + relevant = True + # not related + else: + relevant = False + + if relevant: + self.announcements.put(self.raw_text_parser(copy.deepcopy(args["data"]))) + + super(SC2Context, self).on_print_json(args) + + def run_gui(self) -> None: + from .ClientGui import start_gui + start_gui(self) + + + async def shutdown(self) -> None: + await super(SC2Context, self).shutdown() + if self.last_bot: + self.last_bot.want_close = True + if self.sc2_run_task: + self.sc2_run_task.cancel() + + def play_mission(self, mission_id: int) -> bool: + if self.missions_unlocked or is_mission_available(self, mission_id): + if self.sc2_run_task: + if not self.sc2_run_task.done(): + sc2_logger.warning("Starcraft 2 Client is still running!") + self.sc2_run_task.cancel() # doesn't actually close the game, just stops the python task + if self.slot is None: + sc2_logger.warning("Launching Mission without Archipelago authentication, " + "checks will not be registered to server.") + self.sc2_run_task = asyncio.create_task(starcraft_launch(self, mission_id), + name="Starcraft 2 Launch") + return True + else: + sc2_logger.info( + f"{lookup_id_to_mission[mission_id].mission_name} is not currently unlocked. " + f"Use /unfinished or /available to see what is available.") + return False + + def build_location_to_mission_mapping(self) -> None: + mission_id_to_location_ids: typing.Dict[int, typing.Set[int]] = { + mission_info.mission.id: set() for campaign_mission in self.mission_req_table.values() for mission_info in campaign_mission.values() + } + + for loc in self.server_locations: + offset = SC2WOL_LOC_ID_OFFSET if loc < SC2HOTS_LOC_ID_OFFSET \ + else (SC2HOTS_LOC_ID_OFFSET - SC2Mission.ALL_IN.id * VICTORY_MODULO) + mission_id, objective = divmod(loc - offset, VICTORY_MODULO) + mission_id_to_location_ids[mission_id].add(objective) + self.mission_id_to_location_ids = {mission_id: sorted(objectives) for mission_id, objectives in + mission_id_to_location_ids.items()} + + def locations_for_mission(self, mission_name: str): + mission = lookup_name_to_mission[mission_name] + mission_id: int = mission.id + objectives = self.mission_id_to_location_ids[mission_id] + for objective in objectives: + yield get_location_offset(mission_id) + mission_id * VICTORY_MODULO + objective + + +class CompatItemHolder(typing.NamedTuple): + name: str + quantity: int = 1 + + +async def main(): + multiprocessing.freeze_support() + parser = get_base_parser() + parser.add_argument('--name', default=None, help="Slot Name to connect as.") + args = parser.parse_args() + + ctx = SC2Context(args.connect, args.password) + ctx.auth = args.name + if ctx.server_task is None: + ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop") + + if gui_enabled: + ctx.run_gui() + ctx.run_cli() + + await ctx.exit_event.wait() + + await ctx.shutdown() + +# These items must be given to the player if the game is generated on version 2 +API2_TO_API3_COMPAT_ITEMS: typing.Set[CompatItemHolder] = { + CompatItemHolder(ItemNames.PHOTON_CANNON), + CompatItemHolder(ItemNames.OBSERVER), + CompatItemHolder(ItemNames.WARP_HARMONIZATION), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_GROUND_WEAPON, 3), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_GROUND_ARMOR, 3), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_SHIELDS, 3), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_AIR_WEAPON, 3), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_AIR_ARMOR, 3), + CompatItemHolder(ItemNames.PROGRESSIVE_PROTOSS_WEAPON_ARMOR_UPGRADE, 3) +} + + +def compat_item_to_network_items(compat_item: CompatItemHolder) -> typing.List[NetworkItem]: + item_id = get_full_item_list()[compat_item.name].code + network_item = NetworkItem(item_id, 0, 0, 0) + return compat_item.quantity * [network_item] + + +def calculate_items(ctx: SC2Context) -> typing.Dict[SC2Race, typing.List[int]]: + items = ctx.items_received.copy() + # Items unlocked in API2 by default (Prophecy default items) + if ctx.slot_data_version < 3: + for compat_item in API2_TO_API3_COMPAT_ITEMS: + items.extend(compat_item_to_network_items(compat_item)) + + network_item: NetworkItem + accumulators: typing.Dict[SC2Race, typing.List[int]] = {race: [0 for _ in type_flaggroups[race]] for race in SC2Race} + + # Protoss Shield grouped item specific logic + shields_from_ground_upgrade: int = 0 + shields_from_air_upgrade: int = 0 + + item_list = get_full_item_list() + for network_item in items: + name: str = lookup_id_to_name[network_item.item] + item_data: ItemData = item_list[name] + + # exists exactly once + if item_data.quantity == 1: + accumulators[item_data.race][type_flaggroups[item_data.race][item_data.type]] |= 1 << item_data.number + + # exists multiple times + elif item_data.type in ["Upgrade", "Progressive Upgrade","Progressive Upgrade 2"]: + flaggroup = type_flaggroups[item_data.race][item_data.type] + + # Generic upgrades apply only to Weapon / Armor upgrades + if item_data.type != "Upgrade" or ctx.generic_upgrade_items == 0: + accumulators[item_data.race][flaggroup] += 1 << item_data.number + else: + if name == ItemNames.PROGRESSIVE_PROTOSS_GROUND_UPGRADE: + shields_from_ground_upgrade += 1 + if name == ItemNames.PROGRESSIVE_PROTOSS_AIR_UPGRADE: + shields_from_air_upgrade += 1 + for bundled_number in upgrade_numbers[item_data.number]: + accumulators[item_data.race][flaggroup] += 1 << bundled_number + + # Regen bio-steel nerf with API3 - undo for older games + if ctx.slot_data_version < 3 and name == ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL: + current_level = (accumulators[item_data.race][flaggroup] >> item_data.number) % 4 + if current_level == 2: + # Switch from level 2 to level 3 for compatibility + accumulators[item_data.race][flaggroup] += 1 << item_data.number + # sum + else: + if name == ItemNames.STARTING_MINERALS: + accumulators[item_data.race][type_flaggroups[item_data.race][item_data.type]] += ctx.minerals_per_item + elif name == ItemNames.STARTING_VESPENE: + accumulators[item_data.race][type_flaggroups[item_data.race][item_data.type]] += ctx.vespene_per_item + elif name == ItemNames.STARTING_SUPPLY: + accumulators[item_data.race][type_flaggroups[item_data.race][item_data.type]] += ctx.starting_supply_per_item + else: + accumulators[item_data.race][type_flaggroups[item_data.race][item_data.type]] += item_data.number + + # Fix Shields from generic upgrades by unit class (Maximum of ground/air upgrades) + if shields_from_ground_upgrade > 0 or shields_from_air_upgrade > 0: + shield_upgrade_level = max(shields_from_ground_upgrade, shields_from_air_upgrade) + shield_upgrade_item = item_list[ItemNames.PROGRESSIVE_PROTOSS_SHIELDS] + for _ in range(0, shield_upgrade_level): + accumulators[shield_upgrade_item.race][type_flaggroups[shield_upgrade_item.race][shield_upgrade_item.type]] += 1 << shield_upgrade_item.number + + # Kerrigan levels per check + accumulators[SC2Race.ZERG][type_flaggroups[SC2Race.ZERG]["Level"]] += (len(ctx.checked_locations) // ctx.checks_per_level) * ctx.levels_per_check + + # Upgrades from completed missions + if ctx.generic_upgrade_missions > 0: + total_missions = sum(len(ctx.mission_req_table[campaign]) for campaign in ctx.mission_req_table) + for race in SC2Race: + if "Upgrade" not in type_flaggroups[race]: + continue + upgrade_flaggroup = type_flaggroups[race]["Upgrade"] + num_missions = ctx.generic_upgrade_missions * total_missions + amounts = [ + num_missions // 100, + 2 * num_missions // 100, + 3 * num_missions // 100 + ] + upgrade_count = 0 + completed = len([id for id in ctx.mission_id_to_location_ids if get_location_offset(id) + VICTORY_MODULO * id in ctx.checked_locations]) + for amount in amounts: + if completed >= amount: + upgrade_count += 1 + # Equivalent to "Progressive Weapon/Armor Upgrade" item + for bundled_number in upgrade_numbers[upgrade_numbers_all[race]]: + accumulators[race][upgrade_flaggroup] += upgrade_count << bundled_number + + return accumulators + + +def calc_difficulty(difficulty: int): + if difficulty == 0: + return 'C' + elif difficulty == 1: + return 'N' + elif difficulty == 2: + return 'H' + elif difficulty == 3: + return 'B' + + return 'X' + + +def get_kerrigan_level(ctx: SC2Context, items: typing.Dict[SC2Race, typing.List[int]], missions_beaten: int) -> int: + item_value = items[SC2Race.ZERG][type_flaggroups[SC2Race.ZERG]["Level"]] + mission_value = missions_beaten * ctx.kerrigan_levels_per_mission_completed + if ctx.kerrigan_levels_per_mission_completed_cap != -1: + mission_value = min(mission_value, ctx.kerrigan_levels_per_mission_completed_cap) + total_value = item_value + mission_value + if ctx.kerrigan_total_level_cap != -1: + total_value = min(total_value, ctx.kerrigan_total_level_cap) + return total_value + + +def calculate_kerrigan_options(ctx: SC2Context) -> int: + options = 0 + + # Bits 0, 1 + # Kerrigan unit available + if ctx.kerrigan_presence in kerrigan_unit_available: + options |= 1 << 0 + + # Bit 2 + # Kerrigan primal status by map + if ctx.kerrigan_primal_status == KerriganPrimalStatus.option_vanilla: + options |= 1 << 2 + + return options + + +def caclulate_soa_options(ctx: SC2Context) -> int: + options = 0 + + # Bits 0, 1 + # SoA Calldowns available + soa_presence_value = 0 + if ctx.spear_of_adun_presence == SpearOfAdunPresence.option_not_present: + soa_presence_value = 0 + elif ctx.spear_of_adun_presence == SpearOfAdunPresence.option_lotv_protoss: + soa_presence_value = 1 + elif ctx.spear_of_adun_presence == SpearOfAdunPresence.option_protoss: + soa_presence_value = 2 + elif ctx.spear_of_adun_presence == SpearOfAdunPresence.option_everywhere: + soa_presence_value = 3 + options |= soa_presence_value << 0 + + # Bit 2 + # SoA Calldowns for no-builds + if ctx.spear_of_adun_present_in_no_build == SpearOfAdunPresentInNoBuild.option_true: + options |= 1 << 2 + + # Bits 3,4 + # Autocasts + soa_autocasts_presence_value = 0 + if ctx.spear_of_adun_autonomously_cast_ability_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_not_present: + soa_autocasts_presence_value = 0 + elif ctx.spear_of_adun_autonomously_cast_ability_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_lotv_protoss: + soa_autocasts_presence_value = 1 + elif ctx.spear_of_adun_autonomously_cast_ability_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_protoss: + soa_autocasts_presence_value = 2 + elif ctx.spear_of_adun_autonomously_cast_ability_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_everywhere: + soa_autocasts_presence_value = 3 + options |= soa_autocasts_presence_value << 3 + + # Bit 5 + # Autocasts in no-builds + if ctx.spear_of_adun_autonomously_cast_present_in_no_build == SpearOfAdunAutonomouslyCastPresentInNoBuild.option_true: + options |= 1 << 5 + + return options + +def kerrigan_primal(ctx: SC2Context, items: typing.Dict[SC2Race, typing.List[int]]) -> bool: + if ctx.kerrigan_primal_status == KerriganPrimalStatus.option_always_zerg: + return True + elif ctx.kerrigan_primal_status == KerriganPrimalStatus.option_always_human: + return False + elif ctx.kerrigan_primal_status == KerriganPrimalStatus.option_level_35: + return items[SC2Race.ZERG][type_flaggroups[SC2Race.ZERG]["Level"]] >= 35 + elif ctx.kerrigan_primal_status == KerriganPrimalStatus.option_half_completion: + total_missions = len(ctx.mission_id_to_location_ids) + completed = len([(mission_id * VICTORY_MODULO + get_location_offset(mission_id)) in ctx.checked_locations + for mission_id in ctx.mission_id_to_location_ids]) + return completed >= (total_missions / 2) + elif ctx.kerrigan_primal_status == KerriganPrimalStatus.option_item: + codes = [item.item for item in ctx.items_received] + return get_full_item_list()[ItemNames.KERRIGAN_PRIMAL_FORM].code in codes + return False + +async def starcraft_launch(ctx: SC2Context, mission_id: int): + sc2_logger.info(f"Launching {lookup_id_to_mission[mission_id].mission_name}. If game does not launch check log file for errors.") + + with DllDirectory(None): + run_game(bot.maps.get(lookup_id_to_mission[mission_id].map_file), [Bot(Race.Terran, ArchipelagoBot(ctx, mission_id), + name="Archipelago", fullscreen=True)], realtime=True) + + +class ArchipelagoBot(bot.bot_ai.BotAI): + __slots__ = [ + 'game_running', + 'mission_completed', + 'boni', + 'setup_done', + 'ctx', + 'mission_id', + 'want_close', + 'can_read_game', + 'last_received_update', + ] + + def __init__(self, ctx: SC2Context, mission_id: int): + self.game_running = False + self.mission_completed = False + self.want_close = False + self.can_read_game = False + self.last_received_update: int = 0 + self.setup_done = False + self.ctx = ctx + self.ctx.last_bot = self + self.mission_id = mission_id + self.boni = [False for _ in range(MAX_BONUS)] + + super(ArchipelagoBot, self).__init__() + + async def on_step(self, iteration: int): + if self.want_close: + self.want_close = False + await self._client.leave() + return + game_state = 0 + if not self.setup_done: + self.setup_done = True + start_items = calculate_items(self.ctx) + missions_beaten = self.missions_beaten_count() + kerrigan_level = get_kerrigan_level(self.ctx, start_items, missions_beaten) + kerrigan_options = calculate_kerrigan_options(self.ctx) + soa_options = caclulate_soa_options(self.ctx) + if self.ctx.difficulty_override >= 0: + difficulty = calc_difficulty(self.ctx.difficulty_override) + else: + difficulty = calc_difficulty(self.ctx.difficulty) + if self.ctx.game_speed_override >= 0: + game_speed = self.ctx.game_speed_override + else: + game_speed = self.ctx.game_speed + await self.chat_send("?SetOptions {} {} {} {} {} {} {} {} {} {} {} {} {}".format( + difficulty, + self.ctx.generic_upgrade_research, + self.ctx.all_in_choice, + game_speed, + self.ctx.disable_forced_camera, + self.ctx.skip_cutscenes, + kerrigan_options, + self.ctx.grant_story_tech, + self.ctx.take_over_ai_allies, + soa_options, + self.ctx.mission_order, + 1 if self.ctx.nova_covert_ops_only else 0, + self.ctx.grant_story_levels + )) + await self.chat_send("?GiveResources {} {} {}".format( + start_items[SC2Race.ANY][0], + start_items[SC2Race.ANY][1], + start_items[SC2Race.ANY][2] + )) + await self.updateTerranTech(start_items) + await self.updateZergTech(start_items, kerrigan_level) + await self.updateProtossTech(start_items) + await self.updateColors() + await self.chat_send("?LoadFinished") + self.last_received_update = len(self.ctx.items_received) + + else: + if self.ctx.pending_color_update: + await self.updateColors() + + if not self.ctx.announcements.empty(): + message = self.ctx.announcements.get(timeout=1) + await self.chat_send("?SendMessage " + message) + self.ctx.announcements.task_done() + + # Archipelago reads the health + controller1_state = 0 + controller2_state = 0 + for unit in self.all_own_units(): + if unit.health_max == CONTROLLER_HEALTH: + controller1_state = int(CONTROLLER_HEALTH - unit.health) + self.can_read_game = True + elif unit.health_max == CONTROLLER2_HEALTH: + controller2_state = int(CONTROLLER2_HEALTH - unit.health) + self.can_read_game = True + game_state = controller1_state + (controller2_state << 15) + + if iteration == 160 and not game_state & 1: + await self.chat_send("?SendMessage Warning: Archipelago unable to connect or has lost connection to " + + "Starcraft 2 (This is likely a map issue)") + + if self.last_received_update < len(self.ctx.items_received): + current_items = calculate_items(self.ctx) + missions_beaten = self.missions_beaten_count() + kerrigan_level = get_kerrigan_level(self.ctx, current_items, missions_beaten) + await self.updateTerranTech(current_items) + await self.updateZergTech(current_items, kerrigan_level) + await self.updateProtossTech(current_items) + self.last_received_update = len(self.ctx.items_received) + + if game_state & 1: + if not self.game_running: + print("Archipelago Connected") + self.game_running = True + + if self.can_read_game: + if game_state & (1 << 1) and not self.mission_completed: + if self.mission_id != self.ctx.final_mission: + print("Mission Completed") + await self.ctx.send_msgs( + [{"cmd": 'LocationChecks', + "locations": [get_location_offset(self.mission_id) + VICTORY_MODULO * self.mission_id]}]) + self.mission_completed = True + else: + print("Game Complete") + await self.ctx.send_msgs([{"cmd": 'StatusUpdate', "status": ClientStatus.CLIENT_GOAL}]) + self.mission_completed = True + + for x, completed in enumerate(self.boni): + if not completed and game_state & (1 << (x + 2)): + await self.ctx.send_msgs( + [{"cmd": 'LocationChecks', + "locations": [get_location_offset(self.mission_id) + VICTORY_MODULO * self.mission_id + x + 1]}]) + self.boni[x] = True + else: + await self.chat_send("?SendMessage LostConnection - Lost connection to game.") + + def missions_beaten_count(self): + return len([location for location in self.ctx.checked_locations if location % VICTORY_MODULO == 0]) + + async def updateColors(self): + await self.chat_send("?SetColor rr " + str(self.ctx.player_color_raynor)) + await self.chat_send("?SetColor ks " + str(self.ctx.player_color_zerg)) + await self.chat_send("?SetColor pz " + str(self.ctx.player_color_zerg_primal)) + await self.chat_send("?SetColor da " + str(self.ctx.player_color_protoss)) + await self.chat_send("?SetColor nova " + str(self.ctx.player_color_nova)) + self.ctx.pending_color_update = False + + async def updateTerranTech(self, current_items): + terran_items = current_items[SC2Race.TERRAN] + await self.chat_send("?GiveTerranTech {} {} {} {} {} {} {} {} {} {} {} {} {} {}".format( + terran_items[0], terran_items[1], terran_items[2], terran_items[3], terran_items[4], + terran_items[5], terran_items[6], terran_items[7], terran_items[8], terran_items[9], terran_items[10], + terran_items[11], terran_items[12], terran_items[13])) + + async def updateZergTech(self, current_items, kerrigan_level): + zerg_items = current_items[SC2Race.ZERG] + kerrigan_primal_by_items = kerrigan_primal(self.ctx, current_items) + kerrigan_primal_bot_value = 1 if kerrigan_primal_by_items else 0 + await self.chat_send("?GiveZergTech {} {} {} {} {} {} {} {} {} {} {} {}".format( + kerrigan_level, kerrigan_primal_bot_value, zerg_items[0], zerg_items[1], zerg_items[2], + zerg_items[3], zerg_items[4], zerg_items[5], zerg_items[6], zerg_items[9], zerg_items[10], zerg_items[11] + )) + + async def updateProtossTech(self, current_items): + protoss_items = current_items[SC2Race.PROTOSS] + await self.chat_send("?GiveProtossTech {} {} {} {} {} {} {} {} {} {}".format( + protoss_items[0], protoss_items[1], protoss_items[2], protoss_items[3], protoss_items[4], + protoss_items[5], protoss_items[6], protoss_items[7], protoss_items[8], protoss_items[9] + )) + + +def request_unfinished_missions(ctx: SC2Context) -> None: + if ctx.mission_req_table: + message = "Unfinished Missions: " + unlocks = initialize_blank_mission_dict(ctx.mission_req_table) + unfinished_locations: typing.Dict[SC2Mission, typing.List[str]] = {} + + _, unfinished_missions = calc_unfinished_missions(ctx, unlocks=unlocks) + + for mission in unfinished_missions: + objectives = set(ctx.locations_for_mission(mission)) + if objectives: + remaining_objectives = objectives.difference(ctx.checked_locations) + unfinished_locations[mission] = [ctx.location_names[location_id] for location_id in remaining_objectives] + else: + unfinished_locations[mission] = [] + + # Removing All-In from location pool + final_mission = lookup_id_to_mission[ctx.final_mission] + if final_mission in unfinished_missions.keys(): + message = f"Final Mission Available: {final_mission}[{ctx.final_mission}]\n" + message + if unfinished_missions[final_mission] == -1: + unfinished_missions.pop(final_mission) + + message += ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}[{ctx.mission_req_table[ctx.find_campaign(mission)][mission].mission.id}] " + + mark_up_objectives( + f"[{len(unfinished_missions[mission])}/" + f"{sum(1 for _ in ctx.locations_for_mission(mission))}]", + ctx, unfinished_locations, mission) + for mission in unfinished_missions) + + if ctx.ui: + ctx.ui.log_panels['All'].on_message_markup(message) + ctx.ui.log_panels['Starcraft2'].on_message_markup(message) + else: + sc2_logger.info(message) + else: + sc2_logger.warning("No mission table found, you are likely not connected to a server.") + + +def calc_unfinished_missions(ctx: SC2Context, unlocks: typing.Optional[typing.Dict] = None): + unfinished_missions: typing.List[str] = [] + locations_completed: typing.List[typing.Union[typing.Set[int], typing.Literal[-1]]] = [] + + if not unlocks: + unlocks = initialize_blank_mission_dict(ctx.mission_req_table) + + available_missions = calc_available_missions(ctx, unlocks) + + for name in available_missions: + objectives = set(ctx.locations_for_mission(name)) + if objectives: + objectives_completed = ctx.checked_locations & objectives + if len(objectives_completed) < len(objectives): + unfinished_missions.append(name) + locations_completed.append(objectives_completed) + + else: # infer that this is the final mission as it has no objectives + unfinished_missions.append(name) + locations_completed.append(-1) + + return available_missions, dict(zip(unfinished_missions, locations_completed)) + + +def is_mission_available(ctx: SC2Context, mission_id_to_check: int) -> bool: + unfinished_missions = calc_available_missions(ctx) + + return any(mission_id_to_check == ctx.mission_req_table[ctx.find_campaign(mission)][mission].mission.id for mission in unfinished_missions) + + +def mark_up_mission_name(ctx: SC2Context, mission_name: str, unlock_table: typing.Dict) -> str: + """Checks if the mission is required for game completion and adds '*' to the name to mark that.""" + + campaign = ctx.find_campaign(mission_name) + mission_info = ctx.mission_req_table[campaign][mission_name] + if mission_info.completion_critical: + if ctx.ui: + message = "[color=AF99EF]" + mission_name + "[/color]" + else: + message = "*" + mission_name + "*" + else: + message = mission_name + + if ctx.ui: + campaign_missions = list(ctx.mission_req_table[campaign].keys()) + unlocks: typing.List[str] + index = campaign_missions.index(mission_name) + if index in unlock_table[campaign]: + unlocks = unlock_table[campaign][index] + else: + unlocks = [] + + if len(unlocks) > 0: + pre_message = f"[ref={mission_info.mission.id}|Unlocks: " + pre_message += ", ".join(f"{unlock}({ctx.mission_req_table[ctx.find_campaign(unlock)][unlock].mission.id})" for unlock in unlocks) + pre_message += f"]" + message = pre_message + message + "[/ref]" + + return message + + +def mark_up_objectives(message, ctx, unfinished_locations, mission): + formatted_message = message + + if ctx.ui: + locations = unfinished_locations[mission] + campaign = ctx.find_campaign(mission) + + pre_message = f"[ref={list(ctx.mission_req_table[campaign]).index(mission) + 30}|" + pre_message += "
".join(location for location in locations) + pre_message += f"]" + formatted_message = pre_message + message + "[/ref]" + + return formatted_message + + +def request_available_missions(ctx: SC2Context): + if ctx.mission_req_table: + message = "Available Missions: " + + # Initialize mission unlock table + unlocks = initialize_blank_mission_dict(ctx.mission_req_table) + + missions = calc_available_missions(ctx, unlocks) + message += \ + ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}" + f"[{ctx.mission_req_table[ctx.find_campaign(mission)][mission].mission.id}]" + for mission in missions) + + if ctx.ui: + ctx.ui.log_panels['All'].on_message_markup(message) + ctx.ui.log_panels['Starcraft2'].on_message_markup(message) + else: + sc2_logger.info(message) + else: + sc2_logger.warning("No mission table found, you are likely not connected to a server.") + + +def calc_available_missions(ctx: SC2Context, unlocks: typing.Optional[dict] = None) -> typing.List[str]: + available_missions: typing.List[str] = [] + missions_complete = 0 + + # Get number of missions completed + for loc in ctx.checked_locations: + if loc % VICTORY_MODULO == 0: + missions_complete += 1 + + for campaign in ctx.mission_req_table: + # Go through the required missions for each mission and fill up unlock table used later for hover-over tooltips + for mission_name in ctx.mission_req_table[campaign]: + if unlocks: + for unlock in ctx.mission_req_table[campaign][mission_name].required_world: + parsed_unlock = parse_unlock(unlock) + # TODO prophecy-only wants to connect to WoL here + index = parsed_unlock.connect_to - 1 + unlock_mission = list(ctx.mission_req_table[parsed_unlock.campaign])[index] + unlock_campaign = ctx.find_campaign(unlock_mission) + if unlock_campaign in unlocks: + if index not in unlocks[unlock_campaign]: + unlocks[unlock_campaign][index] = list() + unlocks[unlock_campaign][index].append(mission_name) + + if mission_reqs_completed(ctx, mission_name, missions_complete): + available_missions.append(mission_name) + + return available_missions + + +def parse_unlock(unlock: typing.Union[typing.Dict[typing.Literal["connect_to", "campaign"], int], MissionConnection, int]) -> MissionConnection: + if isinstance(unlock, int): + # Legacy + return MissionConnection(unlock) + elif isinstance(unlock, MissionConnection): + return unlock + else: + # Multi-campaign + return MissionConnection(unlock["connect_to"], lookup_id_to_campaign[unlock["campaign"]]) + + +def mission_reqs_completed(ctx: SC2Context, mission_name: str, missions_complete: int) -> bool: + """Returns a bool signifying if the mission has all requirements complete and can be done + + Arguments: + ctx -- instance of SC2Context + locations_to_check -- the mission string name to check + missions_complete -- an int of how many missions have been completed + mission_path -- a list of missions that have already been checked + """ + campaign = ctx.find_campaign(mission_name) + + if len(ctx.mission_req_table[campaign][mission_name].required_world) >= 1: + # A check for when the requirements are being or'd + or_success = False + + # Loop through required missions + for req_mission in ctx.mission_req_table[campaign][mission_name].required_world: + req_success = True + parsed_req_mission = parse_unlock(req_mission) + + # Check if required mission has been completed + mission_id = ctx.mission_req_table[parsed_req_mission.campaign][ + list(ctx.mission_req_table[parsed_req_mission.campaign])[parsed_req_mission.connect_to - 1]].mission.id + if not (mission_id * VICTORY_MODULO + get_location_offset(mission_id)) in ctx.checked_locations: + if not ctx.mission_req_table[campaign][mission_name].or_requirements: + return False + else: + req_success = False + + # Grid-specific logic (to avoid long path checks and infinite recursion) + if ctx.mission_order in (MissionOrder.option_grid, MissionOrder.option_mini_grid, MissionOrder.option_medium_grid): + if req_success: + return True + else: + if parsed_req_mission == ctx.mission_req_table[campaign][mission_name].required_world[-1]: + return False + else: + continue + + # Recursively check required mission to see if it's requirements are met, in case !collect has been done + # Skipping recursive check on Grid settings to speed up checks and avoid infinite recursion + if not mission_reqs_completed(ctx, list(ctx.mission_req_table[parsed_req_mission.campaign])[parsed_req_mission.connect_to - 1], missions_complete): + if not ctx.mission_req_table[campaign][mission_name].or_requirements: + return False + else: + req_success = False + + # If requirement check succeeded mark or as satisfied + if ctx.mission_req_table[campaign][mission_name].or_requirements and req_success: + or_success = True + + if ctx.mission_req_table[campaign][mission_name].or_requirements: + # Return false if or requirements not met + if not or_success: + return False + + # Check number of missions + if missions_complete >= ctx.mission_req_table[campaign][mission_name].number: + return True + else: + return False + else: + return True + + +def initialize_blank_mission_dict(location_table: typing.Dict[SC2Campaign, typing.Dict[str, MissionInfo]]): + unlocks: typing.Dict[SC2Campaign, typing.Dict] = {} + + for mission in list(location_table): + unlocks[mission] = {} + + return unlocks + + +def check_game_install_path() -> bool: + # First thing: go to the default location for ExecuteInfo. + # An exception for Windows is included because it's very difficult to find ~\Documents if the user moved it. + if is_windows: + # The next five lines of utterly inscrutable code are brought to you by copy-paste from Stack Overflow. + # https://stackoverflow.com/questions/6227590/finding-the-users-my-documents-path/30924555# + import ctypes.wintypes + CSIDL_PERSONAL = 5 # My Documents + SHGFP_TYPE_CURRENT = 0 # Get current, not default value + + buf = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH) + ctypes.windll.shell32.SHGetFolderPathW(None, CSIDL_PERSONAL, None, SHGFP_TYPE_CURRENT, buf) + documentspath: str = buf.value + einfo = str(documentspath / Path("StarCraft II\\ExecuteInfo.txt")) + else: + einfo = str(bot.paths.get_home() / Path(bot.paths.USERPATH[bot.paths.PF])) + + # Check if the file exists. + if os.path.isfile(einfo): + + # Open the file and read it, picking out the latest executable's path. + with open(einfo) as f: + content = f.read() + if content: + search_result = re.search(r" = (.*)Versions", content) + if not search_result: + sc2_logger.warning(f"Found {einfo}, but it was empty. Run SC2 through the Blizzard launcher, " + "then try again.") + return False + base = search_result.group(1) + + if os.path.exists(base): + executable = bot.paths.latest_executeble(Path(base).expanduser() / "Versions") + + # Finally, check the path for an actual executable. + # If we find one, great. Set up the SC2PATH. + if os.path.isfile(executable): + sc2_logger.info(f"Found an SC2 install at {base}!") + sc2_logger.debug(f"Latest executable at {executable}.") + os.environ["SC2PATH"] = base + sc2_logger.debug(f"SC2PATH set to {base}.") + return True + else: + sc2_logger.warning(f"We may have found an SC2 install at {base}, but couldn't find {executable}.") + else: + sc2_logger.warning(f"{einfo} pointed to {base}, but we could not find an SC2 install there.") + else: + sc2_logger.warning(f"Couldn't find {einfo}. Run SC2 through the Blizzard launcher, then try again. " + f"If that fails, please run /set_path with your SC2 install directory.") + return False + + +def is_mod_installed_correctly() -> bool: + """Searches for all required files.""" + if "SC2PATH" not in os.environ: + check_game_install_path() + sc2_path: str = os.environ["SC2PATH"] + mapdir = sc2_path / Path('Maps/ArchipelagoCampaign') + mods = ["ArchipelagoCore", "ArchipelagoPlayer", "ArchipelagoPlayerSuper", "ArchipelagoPatches", + "ArchipelagoTriggers", "ArchipelagoPlayerWoL", "ArchipelagoPlayerHotS", + "ArchipelagoPlayerLotV", "ArchipelagoPlayerLotVPrologue", "ArchipelagoPlayerNCO"] + modfiles = [sc2_path / Path("Mods/" + mod + ".SC2Mod") for mod in mods] + wol_required_maps: typing.List[str] = ["WoL" + os.sep + mission.map_file + ".SC2Map" for mission in SC2Mission + if mission.campaign in (SC2Campaign.WOL, SC2Campaign.PROPHECY)] + hots_required_maps: typing.List[str] = ["HotS" + os.sep + mission.map_file + ".SC2Map" for mission in campaign_mission_table[SC2Campaign.HOTS]] + lotv_required_maps: typing.List[str] = ["LotV" + os.sep + mission.map_file + ".SC2Map" for mission in SC2Mission + if mission.campaign in (SC2Campaign.LOTV, SC2Campaign.PROLOGUE, SC2Campaign.EPILOGUE)] + nco_required_maps: typing.List[str] = ["NCO" + os.sep + mission.map_file + ".SC2Map" for mission in campaign_mission_table[SC2Campaign.NCO]] + required_maps = wol_required_maps + hots_required_maps + lotv_required_maps + nco_required_maps + needs_files = False + + # Check for maps. + missing_maps: typing.List[str] = [] + for mapfile in required_maps: + if not os.path.isfile(mapdir / mapfile): + missing_maps.append(mapfile) + if len(missing_maps) >= 19: + sc2_logger.warning(f"All map files missing from {mapdir}.") + needs_files = True + elif len(missing_maps) > 0: + for map in missing_maps: + sc2_logger.debug(f"Missing {map} from {mapdir}.") + sc2_logger.warning(f"Missing {len(missing_maps)} map files.") + needs_files = True + else: # Must be no maps missing + sc2_logger.info(f"All maps found in {mapdir}.") + + # Check for mods. + for modfile in modfiles: + if os.path.isfile(modfile) or os.path.isdir(modfile): + sc2_logger.info(f"Archipelago mod found at {modfile}.") + else: + sc2_logger.warning(f"Archipelago mod could not be found at {modfile}.") + needs_files = True + + # Final verdict. + if needs_files: + sc2_logger.warning(f"Required files are missing. Run /download_data to acquire them.") + return False + else: + sc2_logger.debug(f"All map/mod files are properly installed.") + return True + + +class DllDirectory: + # Credit to Black Sliver for this code. + # More info: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setdlldirectoryw + _old: typing.Optional[str] = None + _new: typing.Optional[str] = None + + def __init__(self, new: typing.Optional[str]): + self._new = new + + def __enter__(self): + old = self.get() + if self.set(self._new): + self._old = old + + def __exit__(self, *args): + if self._old is not None: + self.set(self._old) + + @staticmethod + def get() -> typing.Optional[str]: + if sys.platform == "win32": + n = ctypes.windll.kernel32.GetDllDirectoryW(0, None) + buf = ctypes.create_unicode_buffer(n) + ctypes.windll.kernel32.GetDllDirectoryW(n, buf) + return buf.value + # NOTE: other OS may support os.environ["LD_LIBRARY_PATH"], but this fix is windows-specific + return None + + @staticmethod + def set(s: typing.Optional[str]) -> bool: + if sys.platform == "win32": + return ctypes.windll.kernel32.SetDllDirectoryW(s) != 0 + # NOTE: other OS may support os.environ["LD_LIBRARY_PATH"], but this fix is windows-specific + return False + + +def download_latest_release_zip( + owner: str, + repo: str, + api_version: str, + metadata: typing.Optional[str] = None, + force_download=False +) -> typing.Tuple[str, typing.Optional[str]]: + """Downloads the latest release of a GitHub repo to the current directory as a .zip file.""" + import requests + + headers = {"Accept": 'application/vnd.github.v3+json'} + url = f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{api_version}" + + r1 = requests.get(url, headers=headers) + if r1.status_code == 200: + latest_metadata = r1.json() + cleanup_downloaded_metadata(latest_metadata) + latest_metadata = str(latest_metadata) + # sc2_logger.info(f"Latest version: {latest_metadata}.") + else: + sc2_logger.warning(f"Status code: {r1.status_code}") + sc2_logger.warning(f"Failed to reach GitHub. Could not find download link.") + sc2_logger.warning(f"text: {r1.text}") + return "", metadata + + if (force_download is False) and (metadata == latest_metadata): + sc2_logger.info("Latest version already installed.") + return "", metadata + + sc2_logger.info(f"Attempting to download latest version of API version {api_version} of {repo}.") + download_url = r1.json()["assets"][0]["browser_download_url"] + + r2 = requests.get(download_url, headers=headers) + if r2.status_code == 200 and zipfile.is_zipfile(io.BytesIO(r2.content)): + tempdir = tempfile.gettempdir() + file = tempdir + os.sep + f"{repo}.zip" + with open(file, "wb") as fh: + fh.write(r2.content) + sc2_logger.info(f"Successfully downloaded {repo}.zip.") + return file, latest_metadata + else: + sc2_logger.warning(f"Status code: {r2.status_code}") + sc2_logger.warning("Download failed.") + sc2_logger.warning(f"text: {r2.text}") + return "", metadata + + +def cleanup_downloaded_metadata(medatada_json: dict) -> None: + for asset in medatada_json['assets']: + del asset['download_count'] + + +def is_mod_update_available(owner: str, repo: str, api_version: str, metadata: str) -> bool: + import requests + + headers = {"Accept": 'application/vnd.github.v3+json'} + url = f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{api_version}" + + r1 = requests.get(url, headers=headers) + if r1.status_code == 200: + latest_metadata = r1.json() + cleanup_downloaded_metadata(latest_metadata) + latest_metadata = str(latest_metadata) + if metadata != latest_metadata: + return True + else: + return False + + else: + sc2_logger.warning(f"Failed to reach GitHub while checking for updates.") + sc2_logger.warning(f"Status code: {r1.status_code}") + sc2_logger.warning(f"text: {r1.text}") + return False + + +def get_location_offset(mission_id): + return SC2WOL_LOC_ID_OFFSET if mission_id <= SC2Mission.ALL_IN.id \ + else (SC2HOTS_LOC_ID_OFFSET - SC2Mission.ALL_IN.id * VICTORY_MODULO) + + +def launch(): + colorama.init() + asyncio.run(main()) + colorama.deinit() diff --git a/worlds/sc2/ClientGui.py b/worlds/sc2/ClientGui.py new file mode 100644 index 000000000000..167583fd1ecb --- /dev/null +++ b/worlds/sc2/ClientGui.py @@ -0,0 +1,304 @@ +from typing import * +import asyncio + +from kvui import GameManager, HoverBehavior, ServerToolTip +from kivy.app import App +from kivy.clock import Clock +from kivy.uix.tabbedpanel import TabbedPanelItem +from kivy.uix.gridlayout import GridLayout +from kivy.lang import Builder +from kivy.uix.label import Label +from kivy.uix.button import Button +from kivy.uix.floatlayout import FloatLayout +from kivy.uix.scrollview import ScrollView +from kivy.properties import StringProperty + +from worlds.sc2.Client import SC2Context, calc_unfinished_missions, parse_unlock +from worlds.sc2.MissionTables import lookup_id_to_mission, lookup_name_to_mission, campaign_race_exceptions, \ + SC2Mission, SC2Race, SC2Campaign +from worlds.sc2.Locations import LocationType, lookup_location_id_to_type +from worlds.sc2.Options import LocationInclusion +from worlds.sc2 import SC2World, get_first_mission + + +class HoverableButton(HoverBehavior, Button): + pass + + +class MissionButton(HoverableButton): + tooltip_text = StringProperty("Test") + + def __init__(self, *args, **kwargs): + super(HoverableButton, self).__init__(*args, **kwargs) + self.layout = FloatLayout() + self.popuplabel = ServerToolTip(text=self.text, markup=True) + self.popuplabel.padding = [5, 2, 5, 2] + self.layout.add_widget(self.popuplabel) + + def on_enter(self): + self.popuplabel.text = self.tooltip_text + + if self.ctx.current_tooltip: + App.get_running_app().root.remove_widget(self.ctx.current_tooltip) + + if self.tooltip_text == "": + self.ctx.current_tooltip = None + else: + App.get_running_app().root.add_widget(self.layout) + self.ctx.current_tooltip = self.layout + + def on_leave(self): + self.ctx.ui.clear_tooltip() + + @property + def ctx(self) -> SC2Context: + return App.get_running_app().ctx + +class CampaignScroll(ScrollView): + pass + +class MultiCampaignLayout(GridLayout): + pass + +class CampaignLayout(GridLayout): + pass + +class MissionLayout(GridLayout): + pass + +class MissionCategory(GridLayout): + pass + +class SC2Manager(GameManager): + logging_pairs = [ + ("Client", "Archipelago"), + ("Starcraft2", "Starcraft2"), + ] + base_title = "Archipelago Starcraft 2 Client" + + campaign_panel: Optional[CampaignLayout] = None + last_checked_locations: Set[int] = set() + mission_id_to_button: Dict[int, MissionButton] = {} + launching: Union[bool, int] = False # if int -> mission ID + refresh_from_launching = True + first_check = True + first_mission = "" + ctx: SC2Context + + def __init__(self, ctx) -> None: + super().__init__(ctx) + + def clear_tooltip(self) -> None: + if self.ctx.current_tooltip: + App.get_running_app().root.remove_widget(self.ctx.current_tooltip) + + self.ctx.current_tooltip = None + + def build(self): + container = super().build() + + panel = TabbedPanelItem(text="Starcraft 2 Launcher") + panel.content = CampaignScroll() + self.campaign_panel = MultiCampaignLayout() + panel.content.add_widget(self.campaign_panel) + + self.tabs.add_widget(panel) + + Clock.schedule_interval(self.build_mission_table, 0.5) + + return container + + def build_mission_table(self, dt) -> None: + if (not self.launching and (not self.last_checked_locations == self.ctx.checked_locations or + not self.refresh_from_launching)) or self.first_check: + assert self.campaign_panel is not None + self.refresh_from_launching = True + + self.campaign_panel.clear_widgets() + if self.ctx.mission_req_table: + self.last_checked_locations = self.ctx.checked_locations.copy() + self.first_check = False + self.first_mission = get_first_mission(self.ctx.mission_req_table) + + self.mission_id_to_button = {} + + available_missions, unfinished_missions = calc_unfinished_missions(self.ctx) + + multi_campaign_layout_height = 0 + + for campaign, missions in sorted(self.ctx.mission_req_table.items(), key=lambda item: item[0].id): + categories: Dict[str, List[str]] = {} + + # separate missions into categories + for mission_index in missions: + mission_info = self.ctx.mission_req_table[campaign][mission_index] + if mission_info.category not in categories: + categories[mission_info.category] = [] + + categories[mission_info.category].append(mission_index) + + max_mission_count = max(len(categories[category]) for category in categories) + if max_mission_count == 1: + campaign_layout_height = 115 + else: + campaign_layout_height = (max_mission_count + 2) * 50 + multi_campaign_layout_height += campaign_layout_height + campaign_layout = CampaignLayout(size_hint_y=None, height=campaign_layout_height) + if campaign != SC2Campaign.GLOBAL: + campaign_layout.add_widget( + Label(text=campaign.campaign_name, size_hint_y=None, height=25, outline_width=1) + ) + mission_layout = MissionLayout() + + for category in categories: + category_name_height = 0 + category_spacing = 3 + if category.startswith('_'): + category_display_name = '' + else: + category_display_name = category + category_name_height += 25 + category_spacing = 10 + category_panel = MissionCategory(padding=[category_spacing,6,category_spacing,6]) + category_panel.add_widget( + Label(text=category_display_name, size_hint_y=None, height=category_name_height, outline_width=1)) + + for mission in categories[category]: + text: str = mission + tooltip: str = "" + mission_obj: SC2Mission = lookup_name_to_mission[mission] + mission_id: int = mission_obj.id + mission_data = self.ctx.mission_req_table[campaign][mission] + remaining_locations, plando_locations, remaining_count = self.sort_unfinished_locations(mission) + # Map has uncollected locations + if mission in unfinished_missions: + if self.any_valuable_locations(remaining_locations): + text = f"[color=6495ED]{text}[/color]" + else: + text = f"[color=A0BEF4]{text}[/color]" + elif mission in available_missions: + text = f"[color=FFFFFF]{text}[/color]" + # Map requirements not met + else: + text = f"[color=a9a9a9]{text}[/color]" + tooltip = f"Requires: " + if mission_data.required_world: + tooltip += ", ".join(list(self.ctx.mission_req_table[parse_unlock(req_mission).campaign])[parse_unlock(req_mission).connect_to - 1] for + req_mission in + mission_data.required_world) + + if mission_data.number: + tooltip += " and " + if mission_data.number: + tooltip += f"{self.ctx.mission_req_table[campaign][mission].number} missions completed" + + if mission_id == self.ctx.final_mission: + if mission in available_missions: + text = f"[color=FFBC95]{mission}[/color]" + else: + text = f"[color=D0C0BE]{mission}[/color]" + if tooltip: + tooltip += "\n" + tooltip += "Final Mission" + + if remaining_count > 0: + if tooltip: + tooltip += "\n\n" + tooltip += f"-- Uncollected locations --" + for loctype in LocationType: + if len(remaining_locations[loctype]) > 0: + if loctype == LocationType.VICTORY: + tooltip += f"\n- {remaining_locations[loctype][0]}" + else: + tooltip += f"\n{self.get_location_type_title(loctype)}:\n- " + tooltip += "\n- ".join(remaining_locations[loctype]) + if len(plando_locations) > 0: + tooltip += f"\nPlando:\n- " + tooltip += "\n- ".join(plando_locations) + + MISSION_BUTTON_HEIGHT = 50 + for pad in range(mission_data.ui_vertical_padding): + column_spacer = Label(text='', size_hint_y=None, height=MISSION_BUTTON_HEIGHT) + category_panel.add_widget(column_spacer) + mission_button = MissionButton(text=text, size_hint_y=None, height=MISSION_BUTTON_HEIGHT) + mission_race = mission_obj.race + if mission_race == SC2Race.ANY: + mission_race = mission_obj.campaign.race + race = campaign_race_exceptions.get(mission_obj, mission_race) + racial_colors = { + SC2Race.TERRAN: (0.24, 0.84, 0.68), + SC2Race.ZERG: (1, 0.65, 0.37), + SC2Race.PROTOSS: (0.55, 0.7, 1) + } + if race in racial_colors: + mission_button.background_color = racial_colors[race] + mission_button.tooltip_text = tooltip + mission_button.bind(on_press=self.mission_callback) + self.mission_id_to_button[mission_id] = mission_button + category_panel.add_widget(mission_button) + + category_panel.add_widget(Label(text="")) + mission_layout.add_widget(category_panel) + campaign_layout.add_widget(mission_layout) + self.campaign_panel.add_widget(campaign_layout) + self.campaign_panel.height = multi_campaign_layout_height + + elif self.launching: + assert self.campaign_panel is not None + self.refresh_from_launching = False + + self.campaign_panel.clear_widgets() + self.campaign_panel.add_widget(Label(text="Launching Mission: " + + lookup_id_to_mission[self.launching].mission_name)) + if self.ctx.ui: + self.ctx.ui.clear_tooltip() + + def mission_callback(self, button: MissionButton) -> None: + if not self.launching: + mission_id: int = next(k for k, v in self.mission_id_to_button.items() if v == button) + if self.ctx.play_mission(mission_id): + self.launching = mission_id + Clock.schedule_once(self.finish_launching, 10) + + def finish_launching(self, dt): + self.launching = False + + def sort_unfinished_locations(self, mission_name: str) -> Tuple[Dict[LocationType, List[str]], List[str], int]: + locations: Dict[LocationType, List[str]] = {loctype: [] for loctype in LocationType} + count = 0 + for loc in self.ctx.locations_for_mission(mission_name): + if loc in self.ctx.missing_locations: + count += 1 + locations[lookup_location_id_to_type[loc]].append(self.ctx.location_names[loc]) + + plando_locations = [] + for plando_loc in self.ctx.plando_locations: + for loctype in LocationType: + if plando_loc in locations[loctype]: + locations[loctype].remove(plando_loc) + plando_locations.append(plando_loc) + + return locations, plando_locations, count + + def any_valuable_locations(self, locations: Dict[LocationType, List[str]]) -> bool: + for loctype in LocationType: + if len(locations[loctype]) > 0 and self.ctx.location_inclusions[loctype] == LocationInclusion.option_enabled: + return True + return False + + def get_location_type_title(self, location_type: LocationType) -> str: + title = location_type.name.title().replace("_", " ") + if self.ctx.location_inclusions[location_type] == LocationInclusion.option_disabled: + title += " (Nothing)" + elif self.ctx.location_inclusions[location_type] == LocationInclusion.option_resources: + title += " (Resources)" + else: + title += "" + return title + +def start_gui(context: SC2Context): + context.ui = SC2Manager(context) + context.ui_task = asyncio.create_task(context.ui.async_run(), name="UI") + import pkgutil + data = pkgutil.get_data(SC2World.__module__, "Starcraft2.kv").decode() + Builder.load_string(data) diff --git a/worlds/sc2/ItemGroups.py b/worlds/sc2/ItemGroups.py new file mode 100644 index 000000000000..a77fb920f64d --- /dev/null +++ b/worlds/sc2/ItemGroups.py @@ -0,0 +1,100 @@ +import typing +from . import Items, ItemNames +from .MissionTables import campaign_mission_table, SC2Campaign, SC2Mission + +""" +Item name groups, given to Archipelago and used in YAMLs and /received filtering. +For non-developers the following will be useful: +* Items with a bracket get groups named after the unbracketed part + * eg. "Advanced Healing AI (Medivac)" is accessible as "Advanced Healing AI" + * The exception to this are item names that would be ambiguous (eg. "Resource Efficiency") +* Item flaggroups get unique groups as well as combined groups for numbered flaggroups + * eg. "Unit" contains all units, "Armory" contains "Armory 1" through "Armory 6" + * The best place to look these up is at the bottom of Items.py +* Items that have a parent are grouped together + * eg. "Zergling Items" contains all items that have "Zergling" as a parent + * These groups do NOT contain the parent item + * This currently does not include items with multiple potential parents, like some LotV unit upgrades +* All items are grouped by their race ("Terran", "Protoss", "Zerg", "Any") +* Hand-crafted item groups can be found at the bottom of this file +""" + +item_name_groups: typing.Dict[str, typing.List[str]] = {} + +# Groups for use in world logic +item_name_groups["Missions"] = ["Beat " + mission.mission_name for mission in SC2Mission] +item_name_groups["WoL Missions"] = ["Beat " + mission.mission_name for mission in campaign_mission_table[SC2Campaign.WOL]] + \ + ["Beat " + mission.mission_name for mission in campaign_mission_table[SC2Campaign.PROPHECY]] + +# These item name groups should not show up in documentation +unlisted_item_name_groups = { + "Missions", "WoL Missions" +} + +# Some item names only differ in bracketed parts +# These items are ambiguous for short-hand name groups +bracketless_duplicates: typing.Set[str] +# This is a list of names in ItemNames with bracketed parts removed, for internal use +_shortened_names = [(name[:name.find(' (')] if '(' in name else name) + for name in [ItemNames.__dict__[name] for name in ItemNames.__dir__() if not name.startswith('_')]] +# Remove the first instance of every short-name from the full item list +bracketless_duplicates = set(_shortened_names) +for name in bracketless_duplicates: + _shortened_names.remove(name) +# The remaining short-names are the duplicates +bracketless_duplicates = set(_shortened_names) +del _shortened_names + +# All items get sorted into their data type +for item, data in Items.get_full_item_list().items(): + # Items get assigned to their flaggroup's type + item_name_groups.setdefault(data.type, []).append(item) + # Numbered flaggroups get sorted into an unnumbered group + # Currently supports numbers of one or two digits + if data.type[-2:].strip().isnumeric: + type_group = data.type[:-2].strip() + item_name_groups.setdefault(type_group, []).append(item) + # Flaggroups with numbers are unlisted + unlisted_item_name_groups.add(data.type) + # Items with a bracket get a short-hand name group for ease of use in YAMLs + if '(' in item: + short_name = item[:item.find(' (')] + # Ambiguous short-names are dropped + if short_name not in bracketless_duplicates: + item_name_groups[short_name] = [item] + # Short-name groups are unlisted + unlisted_item_name_groups.add(short_name) + # Items with a parent get assigned to their parent's group + if data.parent_item: + # The parent groups need a special name, otherwise they are ambiguous with the parent + parent_group = f"{data.parent_item} Items" + item_name_groups.setdefault(parent_group, []).append(item) + # Parent groups are unlisted + unlisted_item_name_groups.add(parent_group) + # All items get assigned to their race's group + race_group = data.race.name.capitalize() + item_name_groups.setdefault(race_group, []).append(item) + + +# Hand-made groups +item_name_groups["Aiur"] = [ + ItemNames.ZEALOT, ItemNames.DRAGOON, ItemNames.SENTRY, ItemNames.AVENGER, ItemNames.HIGH_TEMPLAR, + ItemNames.IMMORTAL, ItemNames.REAVER, + ItemNames.PHOENIX, ItemNames.SCOUT, ItemNames.ARBITER, ItemNames.CARRIER, +] +item_name_groups["Nerazim"] = [ + ItemNames.CENTURION, ItemNames.STALKER, ItemNames.DARK_TEMPLAR, ItemNames.SIGNIFIER, ItemNames.DARK_ARCHON, + ItemNames.ANNIHILATOR, + ItemNames.CORSAIR, ItemNames.ORACLE, ItemNames.VOID_RAY, +] +item_name_groups["Tal'Darim"] = [ + ItemNames.SUPPLICANT, ItemNames.SLAYER, ItemNames.HAVOC, ItemNames.BLOOD_HUNTER, ItemNames.ASCENDANT, + ItemNames.VANGUARD, ItemNames.WRATHWALKER, + ItemNames.DESTROYER, ItemNames.MOTHERSHIP, + ItemNames.WARP_PRISM_PHASE_BLASTER, +] +item_name_groups["Purifier"] = [ + ItemNames.SENTINEL, ItemNames.ADEPT, ItemNames.INSTIGATOR, ItemNames.ENERGIZER, + ItemNames.COLOSSUS, ItemNames.DISRUPTOR, + ItemNames.MIRAGE, ItemNames.TEMPEST, +] \ No newline at end of file diff --git a/worlds/sc2/ItemNames.py b/worlds/sc2/ItemNames.py new file mode 100644 index 000000000000..10c713910311 --- /dev/null +++ b/worlds/sc2/ItemNames.py @@ -0,0 +1,661 @@ +""" +A complete collection of Starcraft 2 item names as strings. +Users of this data may make some assumptions about the structure of a name: +* The upgrade for a unit will end with the unit's name in parentheses +* Weapon / armor upgrades may be grouped by a common prefix specified within this file +""" + +# Terran Units +MARINE = "Marine" +MEDIC = "Medic" +FIREBAT = "Firebat" +MARAUDER = "Marauder" +REAPER = "Reaper" +HELLION = "Hellion" +VULTURE = "Vulture" +GOLIATH = "Goliath" +DIAMONDBACK = "Diamondback" +SIEGE_TANK = "Siege Tank" +MEDIVAC = "Medivac" +WRAITH = "Wraith" +VIKING = "Viking" +BANSHEE = "Banshee" +BATTLECRUISER = "Battlecruiser" +GHOST = "Ghost" +SPECTRE = "Spectre" +THOR = "Thor" +RAVEN = "Raven" +SCIENCE_VESSEL = "Science Vessel" +PREDATOR = "Predator" +HERCULES = "Hercules" +# Extended units +LIBERATOR = "Liberator" +VALKYRIE = "Valkyrie" +WIDOW_MINE = "Widow Mine" +CYCLONE = "Cyclone" +HERC = "HERC" +WARHOUND = "Warhound" + +# Terran Buildings +BUNKER = "Bunker" +MISSILE_TURRET = "Missile Turret" +SENSOR_TOWER = "Sensor Tower" +PLANETARY_FORTRESS = "Planetary Fortress" +PERDITION_TURRET = "Perdition Turret" +HIVE_MIND_EMULATOR = "Hive Mind Emulator" +PSI_DISRUPTER = "Psi Disrupter" + +# Terran Weapon / Armor Upgrades +TERRAN_UPGRADE_PREFIX = "Progressive Terran" +TERRAN_INFANTRY_UPGRADE_PREFIX = f"{TERRAN_UPGRADE_PREFIX} Infantry" +TERRAN_VEHICLE_UPGRADE_PREFIX = f"{TERRAN_UPGRADE_PREFIX} Vehicle" +TERRAN_SHIP_UPGRADE_PREFIX = f"{TERRAN_UPGRADE_PREFIX} Ship" + +PROGRESSIVE_TERRAN_INFANTRY_WEAPON = f"{TERRAN_INFANTRY_UPGRADE_PREFIX} Weapon" +PROGRESSIVE_TERRAN_INFANTRY_ARMOR = f"{TERRAN_INFANTRY_UPGRADE_PREFIX} Armor" +PROGRESSIVE_TERRAN_VEHICLE_WEAPON = f"{TERRAN_VEHICLE_UPGRADE_PREFIX} Weapon" +PROGRESSIVE_TERRAN_VEHICLE_ARMOR = f"{TERRAN_VEHICLE_UPGRADE_PREFIX} Armor" +PROGRESSIVE_TERRAN_SHIP_WEAPON = f"{TERRAN_SHIP_UPGRADE_PREFIX} Weapon" +PROGRESSIVE_TERRAN_SHIP_ARMOR = f"{TERRAN_SHIP_UPGRADE_PREFIX} Armor" +PROGRESSIVE_TERRAN_WEAPON_UPGRADE = f"{TERRAN_UPGRADE_PREFIX} Weapon Upgrade" +PROGRESSIVE_TERRAN_ARMOR_UPGRADE = f"{TERRAN_UPGRADE_PREFIX} Armor Upgrade" +PROGRESSIVE_TERRAN_INFANTRY_UPGRADE = f"{TERRAN_INFANTRY_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_TERRAN_VEHICLE_UPGRADE = f"{TERRAN_VEHICLE_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_TERRAN_SHIP_UPGRADE = f"{TERRAN_SHIP_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_TERRAN_WEAPON_ARMOR_UPGRADE = f"{TERRAN_UPGRADE_PREFIX} Weapon/Armor Upgrade" + +# Mercenaries +WAR_PIGS = "War Pigs" +DEVIL_DOGS = "Devil Dogs" +HAMMER_SECURITIES = "Hammer Securities" +SPARTAN_COMPANY = "Spartan Company" +SIEGE_BREAKERS = "Siege Breakers" +HELS_ANGELS = "Hel's Angels" +DUSK_WINGS = "Dusk Wings" +JACKSONS_REVENGE = "Jackson's Revenge" +SKIBIS_ANGELS = "Skibi's Angels" +DEATH_HEADS = "Death Heads" +WINGED_NIGHTMARES = "Winged Nightmares" +MIDNIGHT_RIDERS = "Midnight Riders" +BRYNHILDS = "Brynhilds" +JOTUN = "Jotun" + +# Lab / Global +ULTRA_CAPACITORS = "Ultra-Capacitors" +VANADIUM_PLATING = "Vanadium Plating" +ORBITAL_DEPOTS = "Orbital Depots" +MICRO_FILTERING = "Micro-Filtering" +AUTOMATED_REFINERY = "Automated Refinery" +COMMAND_CENTER_REACTOR = "Command Center Reactor" +TECH_REACTOR = "Tech Reactor" +ORBITAL_STRIKE = "Orbital Strike" +CELLULAR_REACTOR = "Cellular Reactor" +PROGRESSIVE_REGENERATIVE_BIO_STEEL = "Progressive Regenerative Bio-Steel" +PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM = "Progressive Fire-Suppression System" +PROGRESSIVE_ORBITAL_COMMAND = "Progressive Orbital Command" +STRUCTURE_ARMOR = "Structure Armor" +HI_SEC_AUTO_TRACKING = "Hi-Sec Auto Tracking" +ADVANCED_OPTICS = "Advanced Optics" +ROGUE_FORCES = "Rogue Forces" + +# Terran Unit Upgrades +BANSHEE_HYPERFLIGHT_ROTORS = "Hyperflight Rotors (Banshee)" +BANSHEE_INTERNAL_TECH_MODULE = "Internal Tech Module (Banshee)" +BANSHEE_LASER_TARGETING_SYSTEM = "Laser Targeting System (Banshee)" +BANSHEE_PROGRESSIVE_CROSS_SPECTRUM_DAMPENERS = "Progressive Cross-Spectrum Dampeners (Banshee)" +BANSHEE_SHOCKWAVE_MISSILE_BATTERY = "Shockwave Missile Battery (Banshee)" +BANSHEE_SHAPED_HULL = "Shaped Hull (Banshee)" +BANSHEE_ADVANCED_TARGETING_OPTICS = "Advanced Targeting Optics (Banshee)" +BANSHEE_DISTORTION_BLASTERS = "Distortion Blasters (Banshee)" +BANSHEE_ROCKET_BARRAGE = "Rocket Barrage (Banshee)" +BATTLECRUISER_ATX_LASER_BATTERY = "ATX Laser Battery (Battlecruiser)" +BATTLECRUISER_CLOAK = "Cloak (Battlecruiser)" +BATTLECRUISER_PROGRESSIVE_DEFENSIVE_MATRIX = "Progressive Defensive Matrix (Battlecruiser)" +BATTLECRUISER_INTERNAL_TECH_MODULE = "Internal Tech Module (Battlecruiser)" +BATTLECRUISER_PROGRESSIVE_MISSILE_PODS = "Progressive Missile Pods (Battlecruiser)" +BATTLECRUISER_OPTIMIZED_LOGISTICS = "Optimized Logistics (Battlecruiser)" +BATTLECRUISER_TACTICAL_JUMP = "Tactical Jump (Battlecruiser)" +BATTLECRUISER_BEHEMOTH_PLATING = "Behemoth Plating (Battlecruiser)" +BATTLECRUISER_COVERT_OPS_ENGINES = "Covert Ops Engines (Battlecruiser)" +BUNKER_NEOSTEEL_BUNKER = "Neosteel Bunker (Bunker)" +BUNKER_PROJECTILE_ACCELERATOR = "Projectile Accelerator (Bunker)" +BUNKER_SHRIKE_TURRET = "Shrike Turret (Bunker)" +BUNKER_FORTIFIED_BUNKER = "Fortified Bunker (Bunker)" +CYCLONE_MAG_FIELD_ACCELERATORS = "Mag-Field Accelerators (Cyclone)" +CYCLONE_MAG_FIELD_LAUNCHERS = "Mag-Field Launchers (Cyclone)" +CYCLONE_RAPID_FIRE_LAUNCHERS = "Rapid Fire Launchers (Cyclone)" +CYCLONE_TARGETING_OPTICS = "Targeting Optics (Cyclone)" +CYCLONE_RESOURCE_EFFICIENCY = "Resource Efficiency (Cyclone)" +CYCLONE_INTERNAL_TECH_MODULE = "Internal Tech Module (Cyclone)" +DIAMONDBACK_BURST_CAPACITORS = "Burst Capacitors (Diamondback)" +DIAMONDBACK_HYPERFLUXOR = "Hyperfluxor (Diamondback)" +DIAMONDBACK_RESOURCE_EFFICIENCY = "Resource Efficiency (Diamondback)" +DIAMONDBACK_SHAPED_HULL = "Shaped Hull (Diamondback)" +DIAMONDBACK_PROGRESSIVE_TRI_LITHIUM_POWER_CELL = "Progressive Tri-Lithium Power Cell (Diamondback)" +DIAMONDBACK_ION_THRUSTERS = "Ion Thrusters (Diamondback)" +FIREBAT_INCINERATOR_GAUNTLETS = "Incinerator Gauntlets (Firebat)" +FIREBAT_JUGGERNAUT_PLATING = "Juggernaut Plating (Firebat)" +FIREBAT_RESOURCE_EFFICIENCY = "Resource Efficiency (Firebat)" +FIREBAT_PROGRESSIVE_STIMPACK = "Progressive Stimpack (Firebat)" +FIREBAT_INFERNAL_PRE_IGNITER = "Infernal Pre-Igniter (Firebat)" +FIREBAT_KINETIC_FOAM = "Kinetic Foam (Firebat)" +FIREBAT_NANO_PROJECTORS = "Nano Projectors (Firebat)" +GHOST_CRIUS_SUIT = "Crius Suit (Ghost)" +GHOST_EMP_ROUNDS = "EMP Rounds (Ghost)" +GHOST_LOCKDOWN = "Lockdown (Ghost)" +GHOST_OCULAR_IMPLANTS = "Ocular Implants (Ghost)" +GHOST_RESOURCE_EFFICIENCY = "Resource Efficiency (Ghost)" +GOLIATH_ARES_CLASS_TARGETING_SYSTEM = "Ares-Class Targeting System (Goliath)" +GOLIATH_JUMP_JETS = "Jump Jets (Goliath)" +GOLIATH_MULTI_LOCK_WEAPONS_SYSTEM = "Multi-Lock Weapons System (Goliath)" +GOLIATH_OPTIMIZED_LOGISTICS = "Optimized Logistics (Goliath)" +GOLIATH_SHAPED_HULL = "Shaped Hull (Goliath)" +GOLIATH_RESOURCE_EFFICIENCY = "Resource Efficiency (Goliath)" +GOLIATH_INTERNAL_TECH_MODULE = "Internal Tech Module (Goliath)" +HELLION_HELLBAT_ASPECT = "Hellbat Aspect (Hellion)" +HELLION_JUMP_JETS = "Jump Jets (Hellion)" +HELLION_OPTIMIZED_LOGISTICS = "Optimized Logistics (Hellion)" +HELLION_PROGRESSIVE_STIMPACK = "Progressive Stimpack (Hellion)" +HELLION_SMART_SERVOS = "Smart Servos (Hellion)" +HELLION_THERMITE_FILAMENTS = "Thermite Filaments (Hellion)" +HELLION_TWIN_LINKED_FLAMETHROWER = "Twin-Linked Flamethrower (Hellion)" +HELLION_INFERNAL_PLATING = "Infernal Plating (Hellion)" +HERC_JUGGERNAUT_PLATING = "Juggernaut Plating (HERC)" +HERC_KINETIC_FOAM = "Kinetic Foam (HERC)" +HERC_RESOURCE_EFFICIENCY = "Resource Efficiency (HERC)" +HERCULES_INTERNAL_FUSION_MODULE = "Internal Fusion Module (Hercules)" +HERCULES_TACTICAL_JUMP = "Tactical Jump (Hercules)" +LIBERATOR_ADVANCED_BALLISTICS = "Advanced Ballistics (Liberator)" +LIBERATOR_CLOAK = "Cloak (Liberator)" +LIBERATOR_LASER_TARGETING_SYSTEM = "Laser Targeting System (Liberator)" +LIBERATOR_OPTIMIZED_LOGISTICS = "Optimized Logistics (Liberator)" +LIBERATOR_RAID_ARTILLERY = "Raid Artillery (Liberator)" +LIBERATOR_SMART_SERVOS = "Smart Servos (Liberator)" +LIBERATOR_RESOURCE_EFFICIENCY = "Resource Efficiency (Liberator)" +MARAUDER_CONCUSSIVE_SHELLS = "Concussive Shells (Marauder)" +MARAUDER_INTERNAL_TECH_MODULE = "Internal Tech Module (Marauder)" +MARAUDER_KINETIC_FOAM = "Kinetic Foam (Marauder)" +MARAUDER_LASER_TARGETING_SYSTEM = "Laser Targeting System (Marauder)" +MARAUDER_MAGRAIL_MUNITIONS = "Magrail Munitions (Marauder)" +MARAUDER_PROGRESSIVE_STIMPACK = "Progressive Stimpack (Marauder)" +MARAUDER_JUGGERNAUT_PLATING = "Juggernaut Plating (Marauder)" +MARINE_COMBAT_SHIELD = "Combat Shield (Marine)" +MARINE_LASER_TARGETING_SYSTEM = "Laser Targeting System (Marine)" +MARINE_MAGRAIL_MUNITIONS = "Magrail Munitions (Marine)" +MARINE_OPTIMIZED_LOGISTICS = "Optimized Logistics (Marine)" +MARINE_PROGRESSIVE_STIMPACK = "Progressive Stimpack (Marine)" +MEDIC_ADVANCED_MEDIC_FACILITIES = "Advanced Medic Facilities (Medic)" +MEDIC_OPTICAL_FLARE = "Optical Flare (Medic)" +MEDIC_RESOURCE_EFFICIENCY = "Resource Efficiency (Medic)" +MEDIC_RESTORATION = "Restoration (Medic)" +MEDIC_STABILIZER_MEDPACKS = "Stabilizer Medpacks (Medic)" +MEDIC_ADAPTIVE_MEDPACKS = "Adaptive Medpacks (Medic)" +MEDIC_NANO_PROJECTOR = "Nano Projector (Medic)" +MEDIVAC_ADVANCED_HEALING_AI = "Advanced Healing AI (Medivac)" +MEDIVAC_AFTERBURNERS = "Afterburners (Medivac)" +MEDIVAC_EXPANDED_HULL = "Expanded Hull (Medivac)" +MEDIVAC_RAPID_DEPLOYMENT_TUBE = "Rapid Deployment Tube (Medivac)" +MEDIVAC_SCATTER_VEIL = "Scatter Veil (Medivac)" +MEDIVAC_ADVANCED_CLOAKING_FIELD = "Advanced Cloaking Field (Medivac)" +MISSILE_TURRET_HELLSTORM_BATTERIES = "Hellstorm Batteries (Missile Turret)" +MISSILE_TURRET_TITANIUM_HOUSING = "Titanium Housing (Missile Turret)" +PLANETARY_FORTRESS_PROGRESSIVE_AUGMENTED_THRUSTERS = "Progressive Augmented Thrusters (Planetary Fortress)" +PLANETARY_FORTRESS_ADVANCED_TARGETING = "Advanced Targeting (Planetary Fortress)" +PREDATOR_RESOURCE_EFFICIENCY = "Resource Efficiency (Predator)" +PREDATOR_CLOAK = "Cloak (Predator)" +PREDATOR_CHARGE = "Charge (Predator)" +PREDATOR_PREDATOR_S_FURY = "Predator's Fury (Predator)" +RAVEN_ANTI_ARMOR_MISSILE = "Anti-Armor Missile (Raven)" +RAVEN_BIO_MECHANICAL_REPAIR_DRONE = "Bio Mechanical Repair Drone (Raven)" +RAVEN_HUNTER_SEEKER_WEAPON = "Hunter-Seeker Weapon (Raven)" +RAVEN_INTERFERENCE_MATRIX = "Interference Matrix (Raven)" +RAVEN_INTERNAL_TECH_MODULE = "Internal Tech Module (Raven)" +RAVEN_RAILGUN_TURRET = "Railgun Turret (Raven)" +RAVEN_SPIDER_MINES = "Spider Mines (Raven)" +RAVEN_RESOURCE_EFFICIENCY = "Resource Efficiency (Raven)" +RAVEN_DURABLE_MATERIALS = "Durable Materials (Raven)" +REAPER_ADVANCED_CLOAKING_FIELD = "Advanced Cloaking Field (Reaper)" +REAPER_COMBAT_DRUGS = "Combat Drugs (Reaper)" +REAPER_G4_CLUSTERBOMB = "G-4 Clusterbomb (Reaper)" +REAPER_LASER_TARGETING_SYSTEM = "Laser Targeting System (Reaper)" +REAPER_PROGRESSIVE_STIMPACK = "Progressive Stimpack (Reaper)" +REAPER_SPIDER_MINES = "Spider Mines (Reaper)" +REAPER_U238_ROUNDS = "U-238 Rounds (Reaper)" +REAPER_JET_PACK_OVERDRIVE = "Jet Pack Overdrive (Reaper)" +SCIENCE_VESSEL_DEFENSIVE_MATRIX = "Defensive Matrix (Science Vessel)" +SCIENCE_VESSEL_EMP_SHOCKWAVE = "EMP Shockwave (Science Vessel)" +SCIENCE_VESSEL_IMPROVED_NANO_REPAIR = "Improved Nano-Repair (Science Vessel)" +SCIENCE_VESSEL_ADVANCED_AI_SYSTEMS = "Advanced AI Systems (Science Vessel)" +SCV_ADVANCED_CONSTRUCTION = "Advanced Construction (SCV)" +SCV_DUAL_FUSION_WELDERS = "Dual-Fusion Welders (SCV)" +SCV_HOSTILE_ENVIRONMENT_ADAPTATION = "Hostile Environment Adaptation (SCV)" +SIEGE_TANK_ADVANCED_SIEGE_TECH = "Advanced Siege Tech (Siege Tank)" +SIEGE_TANK_GRADUATING_RANGE = "Graduating Range (Siege Tank)" +SIEGE_TANK_INTERNAL_TECH_MODULE = "Internal Tech Module (Siege Tank)" +SIEGE_TANK_JUMP_JETS = "Jump Jets (Siege Tank)" +SIEGE_TANK_LASER_TARGETING_SYSTEM = "Laser Targeting System (Siege Tank)" +SIEGE_TANK_MAELSTROM_ROUNDS = "Maelstrom Rounds (Siege Tank)" +SIEGE_TANK_SHAPED_BLAST = "Shaped Blast (Siege Tank)" +SIEGE_TANK_SMART_SERVOS = "Smart Servos (Siege Tank)" +SIEGE_TANK_SPIDER_MINES = "Spider Mines (Siege Tank)" +SIEGE_TANK_SHAPED_HULL = "Shaped Hull (Siege Tank)" +SIEGE_TANK_RESOURCE_EFFICIENCY = "Resource Efficiency (Siege Tank)" +SPECTRE_IMPALER_ROUNDS = "Impaler Rounds (Spectre)" +SPECTRE_NYX_CLASS_CLOAKING_MODULE = "Nyx-Class Cloaking Module (Spectre)" +SPECTRE_PSIONIC_LASH = "Psionic Lash (Spectre)" +SPECTRE_RESOURCE_EFFICIENCY = "Resource Efficiency (Spectre)" +SPIDER_MINE_CERBERUS_MINE = "Cerberus Mine (Spider Mine)" +SPIDER_MINE_HIGH_EXPLOSIVE_MUNITION = "High Explosive Munition (Spider Mine)" +THOR_330MM_BARRAGE_CANNON = "330mm Barrage Cannon (Thor)" +THOR_PROGRESSIVE_IMMORTALITY_PROTOCOL = "Progressive Immortality Protocol (Thor)" +THOR_PROGRESSIVE_HIGH_IMPACT_PAYLOAD = "Progressive High Impact Payload (Thor)" +THOR_BUTTON_WITH_A_SKULL_ON_IT = "Button With a Skull on It (Thor)" +THOR_LASER_TARGETING_SYSTEM = "Laser Targeting System (Thor)" +THOR_LARGE_SCALE_FIELD_CONSTRUCTION = "Large Scale Field Construction (Thor)" +VALKYRIE_AFTERBURNERS = "Afterburners (Valkyrie)" +VALKYRIE_FLECHETTE_MISSILES = "Flechette Missiles (Valkyrie)" +VALKYRIE_ENHANCED_CLUSTER_LAUNCHERS = "Enhanced Cluster Launchers (Valkyrie)" +VALKYRIE_SHAPED_HULL = "Shaped Hull (Valkyrie)" +VALKYRIE_LAUNCHING_VECTOR_COMPENSATOR = "Launching Vector Compensator (Valkyrie)" +VALKYRIE_RESOURCE_EFFICIENCY = "Resource Efficiency (Valkyrie)" +VIKING_ANTI_MECHANICAL_MUNITION = "Anti-Mechanical Munition (Viking)" +VIKING_PHOBOS_CLASS_WEAPONS_SYSTEM = "Phobos-Class Weapons System (Viking)" +VIKING_RIPWAVE_MISSILES = "Ripwave Missiles (Viking)" +VIKING_SMART_SERVOS = "Smart Servos (Viking)" +VIKING_SHREDDER_ROUNDS = "Shredder Rounds (Viking)" +VIKING_WILD_MISSILES = "W.I.L.D. Missiles (Viking)" +VULTURE_AUTO_LAUNCHERS = "Auto Launchers (Vulture)" +VULTURE_ION_THRUSTERS = "Ion Thrusters (Vulture)" +VULTURE_PROGRESSIVE_REPLENISHABLE_MAGAZINE = "Progressive Replenishable Magazine (Vulture)" +VULTURE_AUTO_REPAIR = "Auto-Repair (Vulture)" +WARHOUND_RESOURCE_EFFICIENCY = "Resource Efficiency (Warhound)" +WARHOUND_REINFORCED_PLATING = "Reinforced Plating (Warhound)" +WIDOW_MINE_BLACK_MARKET_LAUNCHERS = "Black Market Launchers (Widow Mine)" +WIDOW_MINE_CONCEALMENT = "Concealment (Widow Mine)" +WIDOW_MINE_DRILLING_CLAWS = "Drilling Claws (Widow Mine)" +WIDOW_MINE_EXECUTIONER_MISSILES = "Executioner Missiles (Widow Mine)" +WRAITH_ADVANCED_LASER_TECHNOLOGY = "Advanced Laser Technology (Wraith)" +WRAITH_DISPLACEMENT_FIELD = "Displacement Field (Wraith)" +WRAITH_PROGRESSIVE_TOMAHAWK_POWER_CELLS = "Progressive Tomahawk Power Cells (Wraith)" +WRAITH_TRIGGER_OVERRIDE = "Trigger Override (Wraith)" +WRAITH_INTERNAL_TECH_MODULE = "Internal Tech Module (Wraith)" +WRAITH_RESOURCE_EFFICIENCY = "Resource Efficiency (Wraith)" + +# Nova +NOVA_GHOST_VISOR = "Ghost Visor (Nova Equipment)" +NOVA_RANGEFINDER_OCULUS = "Rangefinder Oculus (Nova Equipment)" +NOVA_DOMINATION = "Domination (Nova Ability)" +NOVA_BLINK = "Blink (Nova Ability)" +NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE = "Progressive Stealth Suit Module (Nova Suit Module)" +NOVA_ENERGY_SUIT_MODULE = "Energy Suit Module (Nova Suit Module)" +NOVA_ARMORED_SUIT_MODULE = "Armored Suit Module (Nova Suit Module)" +NOVA_JUMP_SUIT_MODULE = "Jump Suit Module (Nova Suit Module)" +NOVA_C20A_CANISTER_RIFLE = "C20A Canister Rifle (Nova Weapon)" +NOVA_HELLFIRE_SHOTGUN = "Hellfire Shotgun (Nova Weapon)" +NOVA_PLASMA_RIFLE = "Plasma Rifle (Nova Weapon)" +NOVA_MONOMOLECULAR_BLADE = "Monomolecular Blade (Nova Weapon)" +NOVA_BLAZEFIRE_GUNBLADE = "Blazefire Gunblade (Nova Weapon)" +NOVA_STIM_INFUSION = "Stim Infusion (Nova Gadget)" +NOVA_PULSE_GRENADES = "Pulse Grenades (Nova Gadget)" +NOVA_FLASHBANG_GRENADES = "Flashbang Grenades (Nova Gadget)" +NOVA_IONIC_FORCE_FIELD = "Ionic Force Field (Nova Gadget)" +NOVA_HOLO_DECOY = "Holo Decoy (Nova Gadget)" +NOVA_NUKE = "Tac Nuke Strike (Nova Ability)" + +# Zerg Units +ZERGLING = "Zergling" +SWARM_QUEEN = "Swarm Queen" +ROACH = "Roach" +HYDRALISK = "Hydralisk" +ABERRATION = "Aberration" +MUTALISK = "Mutalisk" +SWARM_HOST = "Swarm Host" +INFESTOR = "Infestor" +ULTRALISK = "Ultralisk" +CORRUPTOR = "Corruptor" +SCOURGE = "Scourge" +BROOD_QUEEN = "Brood Queen" +DEFILER = "Defiler" + +# Zerg Buildings +SPORE_CRAWLER = "Spore Crawler" +SPINE_CRAWLER = "Spine Crawler" + +# Zerg Weapon / Armor Upgrades +ZERG_UPGRADE_PREFIX = "Progressive Zerg" +ZERG_FLYER_UPGRADE_PREFIX = f"{ZERG_UPGRADE_PREFIX} Flyer" + +PROGRESSIVE_ZERG_MELEE_ATTACK = f"{ZERG_UPGRADE_PREFIX} Melee Attack" +PROGRESSIVE_ZERG_MISSILE_ATTACK = f"{ZERG_UPGRADE_PREFIX} Missile Attack" +PROGRESSIVE_ZERG_GROUND_CARAPACE = f"{ZERG_UPGRADE_PREFIX} Ground Carapace" +PROGRESSIVE_ZERG_FLYER_ATTACK = f"{ZERG_FLYER_UPGRADE_PREFIX} Attack" +PROGRESSIVE_ZERG_FLYER_CARAPACE = f"{ZERG_FLYER_UPGRADE_PREFIX} Carapace" +PROGRESSIVE_ZERG_WEAPON_UPGRADE = f"{ZERG_UPGRADE_PREFIX} Weapon Upgrade" +PROGRESSIVE_ZERG_ARMOR_UPGRADE = f"{ZERG_UPGRADE_PREFIX} Armor Upgrade" +PROGRESSIVE_ZERG_GROUND_UPGRADE = f"{ZERG_UPGRADE_PREFIX} Ground Upgrade" +PROGRESSIVE_ZERG_FLYER_UPGRADE = f"{ZERG_FLYER_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_ZERG_WEAPON_ARMOR_UPGRADE = f"{ZERG_UPGRADE_PREFIX} Weapon/Armor Upgrade" + +# Zerg Unit Upgrades +ZERGLING_HARDENED_CARAPACE = "Hardened Carapace (Zergling)" +ZERGLING_ADRENAL_OVERLOAD = "Adrenal Overload (Zergling)" +ZERGLING_METABOLIC_BOOST = "Metabolic Boost (Zergling)" +ZERGLING_SHREDDING_CLAWS = "Shredding Claws (Zergling)" +ROACH_HYDRIODIC_BILE = "Hydriodic Bile (Roach)" +ROACH_ADAPTIVE_PLATING = "Adaptive Plating (Roach)" +ROACH_TUNNELING_CLAWS = "Tunneling Claws (Roach)" +ROACH_GLIAL_RECONSTITUTION = "Glial Reconstitution (Roach)" +ROACH_ORGANIC_CARAPACE = "Organic Carapace (Roach)" +HYDRALISK_FRENZY = "Frenzy (Hydralisk)" +HYDRALISK_ANCILLARY_CARAPACE = "Ancillary Carapace (Hydralisk)" +HYDRALISK_GROOVED_SPINES = "Grooved Spines (Hydralisk)" +HYDRALISK_MUSCULAR_AUGMENTS = "Muscular Augments (Hydralisk)" +HYDRALISK_RESOURCE_EFFICIENCY = "Resource Efficiency (Hydralisk)" +BANELING_CORROSIVE_ACID = "Corrosive Acid (Baneling)" +BANELING_RUPTURE = "Rupture (Baneling)" +BANELING_REGENERATIVE_ACID = "Regenerative Acid (Baneling)" +BANELING_CENTRIFUGAL_HOOKS = "Centrifugal Hooks (Baneling)" +BANELING_TUNNELING_JAWS = "Tunneling Jaws (Baneling)" +BANELING_RAPID_METAMORPH = "Rapid Metamorph (Baneling)" +MUTALISK_VICIOUS_GLAIVE = "Vicious Glaive (Mutalisk)" +MUTALISK_RAPID_REGENERATION = "Rapid Regeneration (Mutalisk)" +MUTALISK_SUNDERING_GLAIVE = "Sundering Glaive (Mutalisk)" +MUTALISK_SEVERING_GLAIVE = "Severing Glaive (Mutalisk)" +MUTALISK_AERODYNAMIC_GLAIVE_SHAPE = "Aerodynamic Glaive Shape (Mutalisk)" +SWARM_HOST_BURROW = "Burrow (Swarm Host)" +SWARM_HOST_RAPID_INCUBATION = "Rapid Incubation (Swarm Host)" +SWARM_HOST_PRESSURIZED_GLANDS = "Pressurized Glands (Swarm Host)" +SWARM_HOST_LOCUST_METABOLIC_BOOST = "Locust Metabolic Boost (Swarm Host)" +SWARM_HOST_ENDURING_LOCUSTS = "Enduring Locusts (Swarm Host)" +SWARM_HOST_ORGANIC_CARAPACE = "Organic Carapace (Swarm Host)" +SWARM_HOST_RESOURCE_EFFICIENCY = "Resource Efficiency (Swarm Host)" +ULTRALISK_BURROW_CHARGE = "Burrow Charge (Ultralisk)" +ULTRALISK_TISSUE_ASSIMILATION = "Tissue Assimilation (Ultralisk)" +ULTRALISK_MONARCH_BLADES = "Monarch Blades (Ultralisk)" +ULTRALISK_ANABOLIC_SYNTHESIS = "Anabolic Synthesis (Ultralisk)" +ULTRALISK_CHITINOUS_PLATING = "Chitinous Plating (Ultralisk)" +ULTRALISK_ORGANIC_CARAPACE = "Organic Carapace (Ultralisk)" +ULTRALISK_RESOURCE_EFFICIENCY = "Resource Efficiency (Ultralisk)" +CORRUPTOR_CORRUPTION = "Corruption (Corruptor)" +CORRUPTOR_CAUSTIC_SPRAY = "Caustic Spray (Corruptor)" +SCOURGE_VIRULENT_SPORES = "Virulent Spores (Scourge)" +SCOURGE_RESOURCE_EFFICIENCY = "Resource Efficiency (Scourge)" +SCOURGE_SWARM_SCOURGE = "Swarm Scourge (Scourge)" +DEVOURER_CORROSIVE_SPRAY = "Corrosive Spray (Devourer)" +DEVOURER_GAPING_MAW = "Gaping Maw (Devourer)" +DEVOURER_IMPROVED_OSMOSIS = "Improved Osmosis (Devourer)" +DEVOURER_PRESCIENT_SPORES = "Prescient Spores (Devourer)" +GUARDIAN_PROLONGED_DISPERSION = "Prolonged Dispersion (Guardian)" +GUARDIAN_PRIMAL_ADAPTATION = "Primal Adaptation (Guardian)" +GUARDIAN_SORONAN_ACID = "Soronan Acid (Guardian)" +IMPALER_ADAPTIVE_TALONS = "Adaptive Talons (Impaler)" +IMPALER_SECRETION_GLANDS = "Secretion Glands (Impaler)" +IMPALER_HARDENED_TENTACLE_SPINES = "Hardened Tentacle Spines (Impaler)" +LURKER_SEISMIC_SPINES = "Seismic Spines (Lurker)" +LURKER_ADAPTED_SPINES = "Adapted Spines (Lurker)" +RAVAGER_POTENT_BILE = "Potent Bile (Ravager)" +RAVAGER_BLOATED_BILE_DUCTS = "Bloated Bile Ducts (Ravager)" +RAVAGER_DEEP_TUNNEL = "Deep Tunnel (Ravager)" +VIPER_PARASITIC_BOMB = "Parasitic Bomb (Viper)" +VIPER_PARALYTIC_BARBS = "Paralytic Barbs (Viper)" +VIPER_VIRULENT_MICROBES = "Virulent Microbes (Viper)" +BROOD_LORD_POROUS_CARTILAGE = "Porous Cartilage (Brood Lord)" +BROOD_LORD_EVOLVED_CARAPACE = "Evolved Carapace (Brood Lord)" +BROOD_LORD_SPLITTER_MITOSIS = "Splitter Mitosis (Brood Lord)" +BROOD_LORD_RESOURCE_EFFICIENCY = "Resource Efficiency (Brood Lord)" +INFESTOR_INFESTED_TERRAN = "Infested Terran (Infestor)" +INFESTOR_MICROBIAL_SHROUD = "Microbial Shroud (Infestor)" +SWARM_QUEEN_SPAWN_LARVAE = "Spawn Larvae (Swarm Queen)" +SWARM_QUEEN_DEEP_TUNNEL = "Deep Tunnel (Swarm Queen)" +SWARM_QUEEN_ORGANIC_CARAPACE = "Organic Carapace (Swarm Queen)" +SWARM_QUEEN_BIO_MECHANICAL_TRANSFUSION = "Bio-Mechanical Transfusion (Swarm Queen)" +SWARM_QUEEN_RESOURCE_EFFICIENCY = "Resource Efficiency (Swarm Queen)" +SWARM_QUEEN_INCUBATOR_CHAMBER = "Incubator Chamber (Swarm Queen)" +BROOD_QUEEN_FUNGAL_GROWTH = "Fungal Growth (Brood Queen)" +BROOD_QUEEN_ENSNARE = "Ensnare (Brood Queen)" +BROOD_QUEEN_ENHANCED_MITOCHONDRIA = "Enhanced Mitochondria (Brood Queen)" + +# Zerg Strains +ZERGLING_RAPTOR_STRAIN = "Raptor Strain (Zergling)" +ZERGLING_SWARMLING_STRAIN = "Swarmling Strain (Zergling)" +ROACH_VILE_STRAIN = "Vile Strain (Roach)" +ROACH_CORPSER_STRAIN = "Corpser Strain (Roach)" +BANELING_SPLITTER_STRAIN = "Splitter Strain (Baneling)" +BANELING_HUNTER_STRAIN = "Hunter Strain (Baneling)" +SWARM_HOST_CARRION_STRAIN = "Carrion Strain (Swarm Host)" +SWARM_HOST_CREEPER_STRAIN = "Creeper Strain (Swarm Host)" +ULTRALISK_NOXIOUS_STRAIN = "Noxious Strain (Ultralisk)" +ULTRALISK_TORRASQUE_STRAIN = "Torrasque Strain (Ultralisk)" + +# Morphs +ZERGLING_BANELING_ASPECT = "Baneling Aspect (Zergling)" +HYDRALISK_IMPALER_ASPECT = "Impaler Aspect (Hydralisk)" +HYDRALISK_LURKER_ASPECT = "Lurker Aspect (Hydralisk)" +MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT = "Brood Lord Aspect (Mutalisk/Corruptor)" +MUTALISK_CORRUPTOR_VIPER_ASPECT = "Viper Aspect (Mutalisk/Corruptor)" +MUTALISK_CORRUPTOR_GUARDIAN_ASPECT = "Guardian Aspect (Mutalisk/Corruptor)" +MUTALISK_CORRUPTOR_DEVOURER_ASPECT = "Devourer Aspect (Mutalisk/Corruptor)" +ROACH_RAVAGER_ASPECT = "Ravager Aspect (Roach)" + +# Zerg Mercs +INFESTED_MEDICS = "Infested Medics" +INFESTED_SIEGE_TANKS = "Infested Siege Tanks" +INFESTED_BANSHEES = "Infested Banshees" + +# Kerrigan Upgrades +KERRIGAN_KINETIC_BLAST = "Kinetic Blast (Kerrigan Tier 1)" +KERRIGAN_HEROIC_FORTITUDE = "Heroic Fortitude (Kerrigan Tier 1)" +KERRIGAN_LEAPING_STRIKE = "Leaping Strike (Kerrigan Tier 1)" +KERRIGAN_CRUSHING_GRIP = "Crushing Grip (Kerrigan Tier 2)" +KERRIGAN_CHAIN_REACTION = "Chain Reaction (Kerrigan Tier 2)" +KERRIGAN_PSIONIC_SHIFT = "Psionic Shift (Kerrigan Tier 2)" +KERRIGAN_WILD_MUTATION = "Wild Mutation (Kerrigan Tier 4)" +KERRIGAN_SPAWN_BANELINGS = "Spawn Banelings (Kerrigan Tier 4)" +KERRIGAN_MEND = "Mend (Kerrigan Tier 4)" +KERRIGAN_INFEST_BROODLINGS = "Infest Broodlings (Kerrigan Tier 6)" +KERRIGAN_FURY = "Fury (Kerrigan Tier 6)" +KERRIGAN_ABILITY_EFFICIENCY = "Ability Efficiency (Kerrigan Tier 6)" +KERRIGAN_APOCALYPSE = "Apocalypse (Kerrigan Tier 7)" +KERRIGAN_SPAWN_LEVIATHAN = "Spawn Leviathan (Kerrigan Tier 7)" +KERRIGAN_DROP_PODS = "Drop-Pods (Kerrigan Tier 7)" +KERRIGAN_PRIMAL_FORM = "Primal Form (Kerrigan)" + +# Misc Upgrades +KERRIGAN_ZERGLING_RECONSTITUTION = "Zergling Reconstitution (Kerrigan Tier 3)" +KERRIGAN_IMPROVED_OVERLORDS = "Improved Overlords (Kerrigan Tier 3)" +KERRIGAN_AUTOMATED_EXTRACTORS = "Automated Extractors (Kerrigan Tier 3)" +KERRIGAN_TWIN_DRONES = "Twin Drones (Kerrigan Tier 5)" +KERRIGAN_MALIGNANT_CREEP = "Malignant Creep (Kerrigan Tier 5)" +KERRIGAN_VESPENE_EFFICIENCY = "Vespene Efficiency (Kerrigan Tier 5)" +OVERLORD_VENTRAL_SACS = "Ventral Sacs (Overlord)" + +# Kerrigan Levels +KERRIGAN_LEVELS_1 = "1 Kerrigan Level" +KERRIGAN_LEVELS_2 = "2 Kerrigan Levels" +KERRIGAN_LEVELS_3 = "3 Kerrigan Levels" +KERRIGAN_LEVELS_4 = "4 Kerrigan Levels" +KERRIGAN_LEVELS_5 = "5 Kerrigan Levels" +KERRIGAN_LEVELS_6 = "6 Kerrigan Levels" +KERRIGAN_LEVELS_7 = "7 Kerrigan Levels" +KERRIGAN_LEVELS_8 = "8 Kerrigan Levels" +KERRIGAN_LEVELS_9 = "9 Kerrigan Levels" +KERRIGAN_LEVELS_10 = "10 Kerrigan Levels" +KERRIGAN_LEVELS_14 = "14 Kerrigan Levels" +KERRIGAN_LEVELS_35 = "35 Kerrigan Levels" +KERRIGAN_LEVELS_70 = "70 Kerrigan Levels" + +# Protoss Units +ZEALOT = "Zealot" +STALKER = "Stalker" +HIGH_TEMPLAR = "High Templar" +DARK_TEMPLAR = "Dark Templar" +IMMORTAL = "Immortal" +COLOSSUS = "Colossus" +PHOENIX = "Phoenix" +VOID_RAY = "Void Ray" +CARRIER = "Carrier" +OBSERVER = "Observer" +CENTURION = "Centurion" +SENTINEL = "Sentinel" +SUPPLICANT = "Supplicant" +INSTIGATOR = "Instigator" +SLAYER = "Slayer" +SENTRY = "Sentry" +ENERGIZER = "Energizer" +HAVOC = "Havoc" +SIGNIFIER = "Signifier" +ASCENDANT = "Ascendant" +AVENGER = "Avenger" +BLOOD_HUNTER = "Blood Hunter" +DRAGOON = "Dragoon" +DARK_ARCHON = "Dark Archon" +ADEPT = "Adept" +WARP_PRISM = "Warp Prism" +ANNIHILATOR = "Annihilator" +VANGUARD = "Vanguard" +WRATHWALKER = "Wrathwalker" +REAVER = "Reaver" +DISRUPTOR = "Disruptor" +MIRAGE = "Mirage" +CORSAIR = "Corsair" +DESTROYER = "Destroyer" +SCOUT = "Scout" +TEMPEST = "Tempest" +MOTHERSHIP = "Mothership" +ARBITER = "Arbiter" +ORACLE = "Oracle" + +# Upgrades +PROTOSS_UPGRADE_PREFIX = "Progressive Protoss" +PROTOSS_GROUND_UPGRADE_PREFIX = f"{PROTOSS_UPGRADE_PREFIX} Ground" +PROTOSS_AIR_UPGRADE_PREFIX = f"{PROTOSS_UPGRADE_PREFIX} Air" +PROGRESSIVE_PROTOSS_GROUND_WEAPON = f"{PROTOSS_GROUND_UPGRADE_PREFIX} Weapon" +PROGRESSIVE_PROTOSS_GROUND_ARMOR = f"{PROTOSS_GROUND_UPGRADE_PREFIX} Armor" +PROGRESSIVE_PROTOSS_SHIELDS = f"{PROTOSS_UPGRADE_PREFIX} Shields" +PROGRESSIVE_PROTOSS_AIR_WEAPON = f"{PROTOSS_AIR_UPGRADE_PREFIX} Weapon" +PROGRESSIVE_PROTOSS_AIR_ARMOR = f"{PROTOSS_AIR_UPGRADE_PREFIX} Armor" +PROGRESSIVE_PROTOSS_WEAPON_UPGRADE = f"{PROTOSS_UPGRADE_PREFIX} Weapon Upgrade" +PROGRESSIVE_PROTOSS_ARMOR_UPGRADE = f"{PROTOSS_UPGRADE_PREFIX} Armor Upgrade" +PROGRESSIVE_PROTOSS_GROUND_UPGRADE = f"{PROTOSS_GROUND_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_PROTOSS_AIR_UPGRADE = f"{PROTOSS_AIR_UPGRADE_PREFIX} Upgrade" +PROGRESSIVE_PROTOSS_WEAPON_ARMOR_UPGRADE = f"{PROTOSS_UPGRADE_PREFIX} Weapon/Armor Upgrade" + +# Buildings +PHOTON_CANNON = "Photon Cannon" +KHAYDARIN_MONOLITH = "Khaydarin Monolith" +SHIELD_BATTERY = "Shield Battery" + +# Unit Upgrades +SUPPLICANT_BLOOD_SHIELD = "Blood Shield (Supplicant)" +SUPPLICANT_SOUL_AUGMENTATION = "Soul Augmentation (Supplicant)" +SUPPLICANT_SHIELD_REGENERATION = "Shield Regeneration (Supplicant)" +ADEPT_SHOCKWAVE = "Shockwave (Adept)" +ADEPT_RESONATING_GLAIVES = "Resonating Glaives (Adept)" +ADEPT_PHASE_BULWARK = "Phase Bulwark (Adept)" +STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES = "Disintegrating Particles (Stalker/Instigator/Slayer)" +STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION = "Particle Reflection (Stalker/Instigator/Slayer)" +DRAGOON_HIGH_IMPACT_PHASE_DISRUPTORS = "High Impact Phase Disruptor (Dragoon)" +DRAGOON_TRILLIC_COMPRESSION_SYSTEM = "Trillic Compression System (Dragoon)" +DRAGOON_SINGULARITY_CHARGE = "Singularity Charge (Dragoon)" +DRAGOON_ENHANCED_STRIDER_SERVOS = "Enhanced Strider Servos (Dragoon)" +SCOUT_COMBAT_SENSOR_ARRAY = "Combat Sensor Array (Scout)" +SCOUT_APIAL_SENSORS = "Apial Sensors (Scout)" +SCOUT_GRAVITIC_THRUSTERS = "Gravitic Thrusters (Scout)" +SCOUT_ADVANCED_PHOTON_BLASTERS = "Advanced Photon Blasters (Scout)" +TEMPEST_TECTONIC_DESTABILIZERS = "Tectonic Destabilizers (Tempest)" +TEMPEST_QUANTIC_REACTOR = "Quantic Reactor (Tempest)" +TEMPEST_GRAVITY_SLING = "Gravity Sling (Tempest)" +PHOENIX_MIRAGE_IONIC_WAVELENGTH_FLUX = "Ionic Wavelength Flux (Phoenix/Mirage)" +PHOENIX_MIRAGE_ANION_PULSE_CRYSTALS = "Anion Pulse-Crystals (Phoenix/Mirage)" +CORSAIR_STEALTH_DRIVE = "Stealth Drive (Corsair)" +CORSAIR_ARGUS_JEWEL = "Argus Jewel (Corsair)" +CORSAIR_SUSTAINING_DISRUPTION = "Sustaining Disruption (Corsair)" +CORSAIR_NEUTRON_SHIELDS = "Neutron Shields (Corsair)" +ORACLE_STEALTH_DRIVE = "Stealth Drive (Oracle)" +ORACLE_STASIS_CALIBRATION = "Stasis Calibration (Oracle)" +ORACLE_TEMPORAL_ACCELERATION_BEAM = "Temporal Acceleration Beam (Oracle)" +ARBITER_CHRONOSTATIC_REINFORCEMENT = "Chronostatic Reinforcement (Arbiter)" +ARBITER_KHAYDARIN_CORE = "Khaydarin Core (Arbiter)" +ARBITER_SPACETIME_ANCHOR = "Spacetime Anchor (Arbiter)" +ARBITER_RESOURCE_EFFICIENCY = "Resource Efficiency (Arbiter)" +ARBITER_ENHANCED_CLOAK_FIELD = "Enhanced Cloak Field (Arbiter)" +CARRIER_GRAVITON_CATAPULT = "Graviton Catapult (Carrier)" +CARRIER_HULL_OF_PAST_GLORIES = "Hull of Past Glories (Carrier)" +VOID_RAY_DESTROYER_FLUX_VANES = "Flux Vanes (Void Ray/Destroyer)" +DESTROYER_REFORGED_BLOODSHARD_CORE = "Reforged Bloodshard Core (Destroyer)" +WARP_PRISM_GRAVITIC_DRIVE = "Gravitic Drive (Warp Prism)" +WARP_PRISM_PHASE_BLASTER = "Phase Blaster (Warp Prism)" +WARP_PRISM_WAR_CONFIGURATION = "War Configuration (Warp Prism)" +OBSERVER_GRAVITIC_BOOSTERS = "Gravitic Boosters (Observer)" +OBSERVER_SENSOR_ARRAY = "Sensor Array (Observer)" +REAVER_SCARAB_DAMAGE = "Scarab Damage (Reaver)" +REAVER_SOLARITE_PAYLOAD = "Solarite Payload (Reaver)" +REAVER_REAVER_CAPACITY = "Reaver Capacity (Reaver)" +REAVER_RESOURCE_EFFICIENCY = "Resource Efficiency (Reaver)" +VANGUARD_AGONY_LAUNCHERS = "Agony Launchers (Vanguard)" +VANGUARD_MATTER_DISPERSION = "Matter Dispersion (Vanguard)" +IMMORTAL_ANNIHILATOR_SINGULARITY_CHARGE = "Singularity Charge (Immortal/Annihilator)" +IMMORTAL_ANNIHILATOR_ADVANCED_TARGETING_MECHANICS = "Advanced Targeting Mechanics (Immortal/Annihilator)" +COLOSSUS_PACIFICATION_PROTOCOL = "Pacification Protocol (Colossus)" +WRATHWALKER_RAPID_POWER_CYCLING = "Rapid Power Cycling (Wrathwalker)" +WRATHWALKER_EYE_OF_WRATH = "Eye of Wrath (Wrathwalker)" +DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_SHROUD_OF_ADUN = "Shroud of Adun (Dark Templar/Avenger/Blood Hunter)" +DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_SHADOW_GUARD_TRAINING = "Shadow Guard Training (Dark Templar/Avenger/Blood Hunter)" +DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_BLINK = "Blink (Dark Templar/Avenger/Blood Hunter)" +DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_RESOURCE_EFFICIENCY = "Resource Efficiency (Dark Templar/Avenger/Blood Hunter)" +DARK_TEMPLAR_DARK_ARCHON_MELD = "Dark Archon Meld (Dark Templar)" +HIGH_TEMPLAR_SIGNIFIER_UNSHACKLED_PSIONIC_STORM = "Unshackled Psionic Storm (High Templar/Signifier)" +HIGH_TEMPLAR_SIGNIFIER_HALLUCINATION = "Hallucination (High Templar/Signifier)" +HIGH_TEMPLAR_SIGNIFIER_KHAYDARIN_AMULET = "Khaydarin Amulet (High Templar/Signifier)" +ARCHON_HIGH_ARCHON = "High Archon (Archon)" +DARK_ARCHON_FEEDBACK = "Feedback (Dark Archon)" +DARK_ARCHON_MAELSTROM = "Maelstrom (Dark Archon)" +DARK_ARCHON_ARGUS_TALISMAN = "Argus Talisman (Dark Archon)" +ASCENDANT_POWER_OVERWHELMING = "Power Overwhelming (Ascendant)" +ASCENDANT_CHAOTIC_ATTUNEMENT = "Chaotic Attunement (Ascendant)" +ASCENDANT_BLOOD_AMULET = "Blood Amulet (Ascendant)" +SENTRY_ENERGIZER_HAVOC_CLOAKING_MODULE = "Cloaking Module (Sentry/Energizer/Havoc)" +SENTRY_ENERGIZER_HAVOC_SHIELD_BATTERY_RAPID_RECHARGING = "Rapid Recharging (Sentry/Energizer/Havoc/Shield Battery)" +SENTRY_FORCE_FIELD = "Force Field (Sentry)" +SENTRY_HALLUCINATION = "Hallucination (Sentry)" +ENERGIZER_RECLAMATION = "Reclamation (Energizer)" +ENERGIZER_FORGED_CHASSIS = "Forged Chassis (Energizer)" +HAVOC_DETECT_WEAKNESS = "Detect Weakness (Havoc)" +HAVOC_BLOODSHARD_RESONANCE = "Bloodshard Resonance (Havoc)" +ZEALOT_SENTINEL_CENTURION_LEG_ENHANCEMENTS = "Leg Enhancements (Zealot/Sentinel/Centurion)" +ZEALOT_SENTINEL_CENTURION_SHIELD_CAPACITY = "Shield Capacity (Zealot/Sentinel/Centurion)" + +# Spear Of Adun +SOA_CHRONO_SURGE = "Chrono Surge (Spear of Adun Calldown)" +SOA_PROGRESSIVE_PROXY_PYLON = "Progressive Proxy Pylon (Spear of Adun Calldown)" +SOA_PYLON_OVERCHARGE = "Pylon Overcharge (Spear of Adun Calldown)" +SOA_ORBITAL_STRIKE = "Orbital Strike (Spear of Adun Calldown)" +SOA_TEMPORAL_FIELD = "Temporal Field (Spear of Adun Calldown)" +SOA_SOLAR_LANCE = "Solar Lance (Spear of Adun Calldown)" +SOA_MASS_RECALL = "Mass Recall (Spear of Adun Calldown)" +SOA_SHIELD_OVERCHARGE = "Shield Overcharge (Spear of Adun Calldown)" +SOA_DEPLOY_FENIX = "Deploy Fenix (Spear of Adun Calldown)" +SOA_PURIFIER_BEAM = "Purifier Beam (Spear of Adun Calldown)" +SOA_TIME_STOP = "Time Stop (Spear of Adun Calldown)" +SOA_SOLAR_BOMBARDMENT = "Solar Bombardment (Spear of Adun Calldown)" + +# Generic upgrades +MATRIX_OVERLOAD = "Matrix Overload" +QUATRO = "Quatro" +NEXUS_OVERCHARGE = "Nexus Overcharge" +ORBITAL_ASSIMILATORS = "Orbital Assimilators" +WARP_HARMONIZATION = "Warp Harmonization" +GUARDIAN_SHELL = "Guardian Shell" +RECONSTRUCTION_BEAM = "Reconstruction Beam (Spear of Adun Auto-Cast)" +OVERWATCH = "Overwatch (Spear of Adun Auto-Cast)" +SUPERIOR_WARP_GATES = "Superior Warp Gates" +ENHANCED_TARGETING = "Enhanced Targeting" +OPTIMIZED_ORDNANCE = "Optimized Ordnance" +KHALAI_INGENUITY = "Khalai Ingenuity" +AMPLIFIED_ASSIMILATORS = "Amplified Assimilators" + +# Filler items +STARTING_MINERALS = "Additional Starting Minerals" +STARTING_VESPENE = "Additional Starting Vespene" +STARTING_SUPPLY = "Additional Starting Supply" +NOTHING = "Nothing" diff --git a/worlds/sc2/Items.py b/worlds/sc2/Items.py new file mode 100644 index 000000000000..85fb34e875af --- /dev/null +++ b/worlds/sc2/Items.py @@ -0,0 +1,2553 @@ +import inspect +from pydoc import describe + +from BaseClasses import Item, ItemClassification, MultiWorld +import typing + +from .Options import get_option_value, RequiredTactics +from .MissionTables import SC2Mission, SC2Race, SC2Campaign, campaign_mission_table +from . import ItemNames +from worlds.AutoWorld import World + + +class ItemData(typing.NamedTuple): + code: int + type: str + number: int # Important for bot commands to send the item into the game + race: SC2Race + classification: ItemClassification = ItemClassification.useful + quantity: int = 1 + parent_item: typing.Optional[str] = None + origin: typing.Set[str] = {"wol"} + description: typing.Optional[str] = None + important_for_filtering: bool = False + + def is_important_for_filtering(self): + return self.important_for_filtering \ + or self.classification == ItemClassification.progression \ + or self.classification == ItemClassification.progression_skip_balancing + + +class StarcraftItem(Item): + game: str = "Starcraft 2" + + +def get_full_item_list(): + return item_table + + +SC2WOL_ITEM_ID_OFFSET = 1000 +SC2HOTS_ITEM_ID_OFFSET = SC2WOL_ITEM_ID_OFFSET + 1000 +SC2LOTV_ITEM_ID_OFFSET = SC2HOTS_ITEM_ID_OFFSET + 1000 + +# Descriptions +WEAPON_ARMOR_UPGRADE_NOTE = inspect.cleandoc(""" + Must be researched during the mission if the mission type isn't set to auto-unlock generic upgrades. +""") +LASER_TARGETING_SYSTEMS_DESCRIPTION = "Increases vision by 2 and weapon range by 1." +STIMPACK_SMALL_COST = 10 +STIMPACK_SMALL_HEAL = 30 +STIMPACK_LARGE_COST = 20 +STIMPACK_LARGE_HEAL = 60 +STIMPACK_TEMPLATE = inspect.cleandoc(""" + Level 1: Stimpack: Increases unit movement and attack speed for 15 seconds. Injures the unit for {} life. + Level 2: Super Stimpack: Instead of injuring the unit, heals the unit for {} life instead. +""") +STIMPACK_SMALL_DESCRIPTION = STIMPACK_TEMPLATE.format(STIMPACK_SMALL_COST, STIMPACK_SMALL_HEAL) +STIMPACK_LARGE_DESCRIPTION = STIMPACK_TEMPLATE.format(STIMPACK_LARGE_COST, STIMPACK_LARGE_HEAL) +SMART_SERVOS_DESCRIPTION = "Increases transformation speed between modes." +INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE = "{} can be trained from a {} without an attached Tech Lab." +RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE = "Reduces {} resource and supply cost." +RESOURCE_EFFICIENCY_NO_SUPPLY_DESCRIPTION_TEMPLATE = "Reduces {} resource cost." +CLOAK_DESCRIPTION_TEMPLATE = "Allows {} to use the Cloak ability." + + +# The items are sorted by their IDs. The IDs shall be kept for compatibility with older games. +item_table = { + # WoL + ItemNames.MARINE: + ItemData(0 + SC2WOL_ITEM_ID_OFFSET, "Unit", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="General-purpose infantry."), + ItemNames.MEDIC: + ItemData(1 + SC2WOL_ITEM_ID_OFFSET, "Unit", 1, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Support trooper. Heals nearby biological units."), + ItemNames.FIREBAT: + ItemData(2 + SC2WOL_ITEM_ID_OFFSET, "Unit", 2, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Specialized anti-infantry attacker."), + ItemNames.MARAUDER: + ItemData(3 + SC2WOL_ITEM_ID_OFFSET, "Unit", 3, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Heavy assault infantry."), + ItemNames.REAPER: + ItemData(4 + SC2WOL_ITEM_ID_OFFSET, "Unit", 4, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Raider. Capable of jumping up and down cliffs. Throws explosive mines."), + ItemNames.HELLION: + ItemData(5 + SC2WOL_ITEM_ID_OFFSET, "Unit", 5, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Fast scout. Has a flame attack that damages all enemy units in its line of fire."), + ItemNames.VULTURE: + ItemData(6 + SC2WOL_ITEM_ID_OFFSET, "Unit", 6, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Fast skirmish unit. Can use the Spider Mine ability."), + ItemNames.GOLIATH: + ItemData(7 + SC2WOL_ITEM_ID_OFFSET, "Unit", 7, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Heavy-fire support unit."), + ItemNames.DIAMONDBACK: + ItemData(8 + SC2WOL_ITEM_ID_OFFSET, "Unit", 8, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Fast, high-damage hovertank. Rail Gun can fire while the Diamondback is moving."), + ItemNames.SIEGE_TANK: + ItemData(9 + SC2WOL_ITEM_ID_OFFSET, "Unit", 9, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Heavy tank. Long-range artillery in Siege Mode."), + ItemNames.MEDIVAC: + ItemData(10 + SC2WOL_ITEM_ID_OFFSET, "Unit", 10, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Air transport. Heals nearby biological units."), + ItemNames.WRAITH: + ItemData(11 + SC2WOL_ITEM_ID_OFFSET, "Unit", 11, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Highly mobile flying unit. Excellent at surgical strikes."), + ItemNames.VIKING: + ItemData(12 + SC2WOL_ITEM_ID_OFFSET, "Unit", 12, SC2Race.TERRAN, + classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Durable support flyer. Loaded with strong anti-capital air missiles. + Can switch into Assault Mode to attack ground units. + """ + )), + ItemNames.BANSHEE: + ItemData(13 + SC2WOL_ITEM_ID_OFFSET, "Unit", 13, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Tactical-strike aircraft."), + ItemNames.BATTLECRUISER: + ItemData(14 + SC2WOL_ITEM_ID_OFFSET, "Unit", 14, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Powerful warship."), + ItemNames.GHOST: + ItemData(15 + SC2WOL_ITEM_ID_OFFSET, "Unit", 15, SC2Race.TERRAN, + classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Infiltration unit. Can use Snipe and Cloak abilities. Can also call down Tactical Nukes. + """ + )), + ItemNames.SPECTRE: + ItemData(16 + SC2WOL_ITEM_ID_OFFSET, "Unit", 16, SC2Race.TERRAN, + classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Infiltration unit. Can use Ultrasonic Pulse, Psionic Lash, and Cloak. + Can also call down Tactical Nukes. + """ + )), + ItemNames.THOR: + ItemData(17 + SC2WOL_ITEM_ID_OFFSET, "Unit", 17, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Heavy assault mech."), + # EE units + ItemNames.LIBERATOR: + ItemData(18 + SC2WOL_ITEM_ID_OFFSET, "Unit", 18, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"nco", "ext"}, + description=inspect.cleandoc( + """ + Artillery fighter. Loaded with missiles that deal area damage to enemy air targets. + Can switch into Defender Mode to provide siege support. + """ + )), + ItemNames.VALKYRIE: + ItemData(19 + SC2WOL_ITEM_ID_OFFSET, "Unit", 19, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"bw"}, + description=inspect.cleandoc( + """ + Advanced anti-aircraft fighter. + Able to use cluster missiles that deal area damage to air targets. + """ + )), + ItemNames.WIDOW_MINE: + ItemData(20 + SC2WOL_ITEM_ID_OFFSET, "Unit", 20, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description=inspect.cleandoc( + """ + Robotic mine. Launches missiles at nearby enemy units while burrowed. + Attacks deal splash damage in a small area around the target. + Widow Mine is revealed when Sentinel Missile is on cooldown. + """ + )), + ItemNames.CYCLONE: + ItemData(21 + SC2WOL_ITEM_ID_OFFSET, "Unit", 21, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description=inspect.cleandoc( + """ + Mobile assault vehicle. Can use Lock On to quickly fire while moving. + """ + )), + ItemNames.HERC: + ItemData(22 + SC2WOL_ITEM_ID_OFFSET, "Unit", 26, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description=inspect.cleandoc( + """ + Front-line infantry. Can use Grapple. + """ + )), + ItemNames.WARHOUND: + ItemData(23 + SC2WOL_ITEM_ID_OFFSET, "Unit", 27, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description=inspect.cleandoc( + """ + Anti-vehicle mech. Haywire missiles do bonus damage to mechanical units. + """ + )), + + # Some other items are moved to Upgrade group because of the way how the bot message is parsed + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_WEAPON: + ItemData(100 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 0, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases damage of Terran infantry units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_ARMOR: + ItemData(102 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 2, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases armor of Terran infantry units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_WEAPON: + ItemData(103 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 4, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases damage of Terran vehicle units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_ARMOR: + ItemData(104 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 6, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases armor of Terran vehicle units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + ItemNames.PROGRESSIVE_TERRAN_SHIP_WEAPON: + ItemData(105 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 8, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases damage of Terran starship units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + ItemNames.PROGRESSIVE_TERRAN_SHIP_ARMOR: + ItemData(106 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 10, SC2Race.TERRAN, + quantity=3, + description=inspect.cleandoc( + f""" + Increases armor of Terran starship units. + {WEAPON_ARMOR_UPGRADE_NOTE} + """ + )), + # Upgrade bundle 'number' values are used as indices to get affected 'number's + ItemNames.PROGRESSIVE_TERRAN_WEAPON_UPGRADE: ItemData(107 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 0, SC2Race.TERRAN, quantity=3), + ItemNames.PROGRESSIVE_TERRAN_ARMOR_UPGRADE: ItemData(108 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 1, SC2Race.TERRAN, quantity=3), + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_UPGRADE: ItemData(109 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 2, SC2Race.TERRAN, quantity=3), + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_UPGRADE: ItemData(110 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 3, SC2Race.TERRAN, quantity=3), + ItemNames.PROGRESSIVE_TERRAN_SHIP_UPGRADE: ItemData(111 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 4, SC2Race.TERRAN, quantity=3), + ItemNames.PROGRESSIVE_TERRAN_WEAPON_ARMOR_UPGRADE: ItemData(112 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 5, SC2Race.TERRAN, quantity=3), + + # Unit and structure upgrades + ItemNames.BUNKER_PROJECTILE_ACCELERATOR: + ItemData(200 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 0, SC2Race.TERRAN, + parent_item=ItemNames.BUNKER, + description="Increases range of all units in the Bunker by 1."), + ItemNames.BUNKER_NEOSTEEL_BUNKER: + ItemData(201 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 1, SC2Race.TERRAN, + parent_item=ItemNames.BUNKER, + description="Increases the number of Bunker slots by 2."), + ItemNames.MISSILE_TURRET_TITANIUM_HOUSING: + ItemData(202 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 2, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MISSILE_TURRET, + description="Increases Missile Turret life by 75."), + ItemNames.MISSILE_TURRET_HELLSTORM_BATTERIES: + ItemData(203 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 3, SC2Race.TERRAN, + parent_item=ItemNames.MISSILE_TURRET, + description="The Missile Turret unleashes an additional flurry of missiles with each attack."), + ItemNames.SCV_ADVANCED_CONSTRUCTION: + ItemData(204 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 4, SC2Race.TERRAN, + description="Multiple SCVs can construct a structure, reducing its construction time."), + ItemNames.SCV_DUAL_FUSION_WELDERS: + ItemData(205 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 5, SC2Race.TERRAN, + description="SCVs repair twice as fast."), + ItemNames.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM: + ItemData(206 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 24, SC2Race.TERRAN, + quantity=2, + description=inspect.cleandoc( + """ + Level 1: While on low health, Terran structures are repaired to half health instead of burning down. + Level 2: Terran structures are repaired to full health instead of half health + """ + )), + ItemNames.PROGRESSIVE_ORBITAL_COMMAND: + ItemData(207 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 26, SC2Race.TERRAN, + quantity=2, classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Level 1: Allows Command Centers to use Scanner Sweep and Calldown: MULE abilities. + Level 2: Orbital Command abilities work even in Planetary Fortress mode. + """ + )), + ItemNames.MARINE_PROGRESSIVE_STIMPACK: + ItemData(208 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.MARINE, quantity=2, + description=STIMPACK_SMALL_DESCRIPTION), + ItemNames.MARINE_COMBAT_SHIELD: + ItemData(209 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 9, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.MARINE, + description="Increases Marine life by 10."), + ItemNames.MEDIC_ADVANCED_MEDIC_FACILITIES: + ItemData(210 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 10, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIC, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Medics", "Barracks")), + ItemNames.MEDIC_STABILIZER_MEDPACKS: + ItemData(211 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 11, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.MEDIC, + description="Increases Medic heal speed. Reduces the amount of energy required for each heal."), + ItemNames.FIREBAT_INCINERATOR_GAUNTLETS: + ItemData(212 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 12, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.FIREBAT, + description="Increases Firebat's damage radius by 40%"), + ItemNames.FIREBAT_JUGGERNAUT_PLATING: + ItemData(213 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 13, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, + description="Increases Firebat's armor by 2."), + ItemNames.MARAUDER_CONCUSSIVE_SHELLS: + ItemData(214 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 14, SC2Race.TERRAN, + parent_item=ItemNames.MARAUDER, + description="Marauder attack temporarily slows all units in target area."), + ItemNames.MARAUDER_KINETIC_FOAM: + ItemData(215 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 15, SC2Race.TERRAN, + parent_item=ItemNames.MARAUDER, + description="Increases Marauder life by 25."), + ItemNames.REAPER_U238_ROUNDS: + ItemData(216 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 16, SC2Race.TERRAN, + parent_item=ItemNames.REAPER, + description=inspect.cleandoc( + """ + Increases Reaper pistol attack range by 1. + Reaper pistols do additional 3 damage to Light Armor. + """ + )), + ItemNames.REAPER_G4_CLUSTERBOMB: + ItemData(217 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 17, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.REAPER, + description="Timed explosive that does heavy area damage."), + ItemNames.CYCLONE_MAG_FIELD_ACCELERATORS: + ItemData(218 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 18, SC2Race.TERRAN, + parent_item=ItemNames.CYCLONE, origin={"ext"}, + description="Increases Cyclone Lock On damage"), + ItemNames.CYCLONE_MAG_FIELD_LAUNCHERS: + ItemData(219 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 19, SC2Race.TERRAN, + parent_item=ItemNames.CYCLONE, origin={"ext"}, + description="Increases Cyclone attack range by 2."), + ItemNames.MARINE_LASER_TARGETING_SYSTEM: + ItemData(220 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 8, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MARINE, origin={"nco"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.MARINE_MAGRAIL_MUNITIONS: + ItemData(221 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 20, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.MARINE, origin={"nco"}, + description="Deals 20 damage to target unit. Autocast on attack with a cooldown."), + ItemNames.MARINE_OPTIMIZED_LOGISTICS: + ItemData(222 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 21, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MARINE, origin={"nco"}, + description="Increases Marine training speed."), + ItemNames.MEDIC_RESTORATION: + ItemData(223 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 22, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIC, origin={"bw"}, + description="Removes negative status effects from target allied unit."), + ItemNames.MEDIC_OPTICAL_FLARE: + ItemData(224 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 23, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIC, origin={"bw"}, + description="Reduces vision range of target enemy unit. Disables detection."), + ItemNames.MEDIC_RESOURCE_EFFICIENCY: + ItemData(225 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 24, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIC, origin={"bw"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Medic")), + ItemNames.FIREBAT_PROGRESSIVE_STIMPACK: + ItemData(226 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 6, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, quantity=2, origin={"bw"}, + description=STIMPACK_LARGE_DESCRIPTION), + ItemNames.FIREBAT_RESOURCE_EFFICIENCY: + ItemData(227 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 25, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, origin={"bw"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Firebat")), + ItemNames.MARAUDER_PROGRESSIVE_STIMPACK: + ItemData(228 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 8, SC2Race.TERRAN, + parent_item=ItemNames.MARAUDER, quantity=2, origin={"nco"}, + description=STIMPACK_LARGE_DESCRIPTION), + ItemNames.MARAUDER_LASER_TARGETING_SYSTEM: + ItemData(229 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 26, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MARAUDER, origin={"nco"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.MARAUDER_MAGRAIL_MUNITIONS: + ItemData(230 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 27, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MARAUDER, origin={"nco"}, + description="Deals 20 damage to target unit. Autocast on attack with a cooldown."), + ItemNames.MARAUDER_INTERNAL_TECH_MODULE: + ItemData(231 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 28, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MARAUDER, origin={"nco"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Marauders", "Barracks")), + ItemNames.SCV_HOSTILE_ENVIRONMENT_ADAPTATION: + ItemData(232 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 29, SC2Race.TERRAN, + classification=ItemClassification.filler, origin={"bw"}, + description="Increases SCV life by 15 and attack speed slightly."), + ItemNames.MEDIC_ADAPTIVE_MEDPACKS: + ItemData(233 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.MEDIC, origin={"ext"}, + description="Allows Medics to heal mechanical and air units."), + ItemNames.MEDIC_NANO_PROJECTOR: + ItemData(234 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 1, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIC, origin={"ext"}, + description="Increases Medic heal range by 2."), + ItemNames.FIREBAT_INFERNAL_PRE_IGNITER: + ItemData(235 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 2, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, origin={"bw"}, + description="Firebats do an additional 4 damage to Light Armor."), + ItemNames.FIREBAT_KINETIC_FOAM: + ItemData(236 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 3, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, origin={"ext"}, + description="Increases Firebat life by 100."), + ItemNames.FIREBAT_NANO_PROJECTORS: + ItemData(237 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 4, SC2Race.TERRAN, + parent_item=ItemNames.FIREBAT, origin={"ext"}, + description="Increases Firebat attack range by 2"), + ItemNames.MARAUDER_JUGGERNAUT_PLATING: + ItemData(238 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 5, SC2Race.TERRAN, + parent_item=ItemNames.MARAUDER, origin={"ext"}, + description="Increases Marauder's armor by 2."), + ItemNames.REAPER_JET_PACK_OVERDRIVE: + ItemData(239 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 6, SC2Race.TERRAN, + parent_item=ItemNames.REAPER, origin={"ext"}, + description=inspect.cleandoc( + """ + Allows the Reaper to fly for 10 seconds. + While flying, the Reaper can attack air units. + """ + )), + ItemNames.HELLION_INFERNAL_PLATING: + ItemData(240 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 7, SC2Race.TERRAN, + parent_item=ItemNames.HELLION, origin={"ext"}, + description="Increases Hellion and Hellbat armor by 2."), + ItemNames.VULTURE_AUTO_REPAIR: + ItemData(241 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 8, SC2Race.TERRAN, + parent_item=ItemNames.VULTURE, origin={"ext"}, + description="Vultures regenerate life."), + ItemNames.GOLIATH_SHAPED_HULL: + ItemData(242 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 9, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.GOLIATH, origin={"nco", "ext"}, + description="Increases Goliath life by 25."), + ItemNames.GOLIATH_RESOURCE_EFFICIENCY: + ItemData(243 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 10, SC2Race.TERRAN, + parent_item=ItemNames.GOLIATH, origin={"nco", "bw"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Goliath")), + ItemNames.GOLIATH_INTERNAL_TECH_MODULE: + ItemData(244 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 11, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.GOLIATH, origin={"nco", "bw"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Goliaths", "Factory")), + ItemNames.SIEGE_TANK_SHAPED_HULL: + ItemData(245 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 12, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.SIEGE_TANK, origin={"nco", "ext"}, + description="Increases Siege Tank life by 25."), + ItemNames.SIEGE_TANK_RESOURCE_EFFICIENCY: + ItemData(246 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 13, SC2Race.TERRAN, + parent_item=ItemNames.SIEGE_TANK, origin={"bw"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Siege Tank")), + ItemNames.PREDATOR_CLOAK: + ItemData(247 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 14, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.PREDATOR, origin={"ext"}, + description=CLOAK_DESCRIPTION_TEMPLATE.format("Predators")), + ItemNames.PREDATOR_CHARGE: + ItemData(248 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 15, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.PREDATOR, origin={"ext"}, + description="Allows Predators to intercept enemy ground units."), + ItemNames.MEDIVAC_SCATTER_VEIL: + ItemData(249 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 16, SC2Race.TERRAN, + parent_item=ItemNames.MEDIVAC, origin={"ext"}, + description="Medivacs get 100 shields."), + ItemNames.REAPER_PROGRESSIVE_STIMPACK: + ItemData(250 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 10, SC2Race.TERRAN, + parent_item=ItemNames.REAPER, quantity=2, origin={"nco"}, + description=STIMPACK_SMALL_DESCRIPTION), + ItemNames.REAPER_LASER_TARGETING_SYSTEM: + ItemData(251 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 17, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.REAPER, origin={"nco"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.REAPER_ADVANCED_CLOAKING_FIELD: + ItemData(252 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 18, SC2Race.TERRAN, + parent_item=ItemNames.REAPER, origin={"nco"}, + description="Reapers are permanently cloaked."), + ItemNames.REAPER_SPIDER_MINES: + ItemData(253 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 19, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.REAPER, origin={"nco"}, + important_for_filtering=True, + description="Allows Reapers to lay Spider Mines. 3 charges per Reaper."), + ItemNames.REAPER_COMBAT_DRUGS: + ItemData(254 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 20, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.REAPER, origin={"ext"}, + description="Reapers regenerate life while out of combat."), + ItemNames.HELLION_HELLBAT_ASPECT: + ItemData(255 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 21, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.HELLION, origin={"nco"}, + description="Allows Hellions to transform into Hellbats."), + ItemNames.HELLION_SMART_SERVOS: + ItemData(256 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 22, SC2Race.TERRAN, + parent_item=ItemNames.HELLION, origin={"nco"}, + description="Transforms faster between modes. Hellions can attack while moving."), + ItemNames.HELLION_OPTIMIZED_LOGISTICS: + ItemData(257 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 23, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.HELLION, origin={"nco"}, + description="Increases Hellion training speed."), + ItemNames.HELLION_JUMP_JETS: + ItemData(258 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 24, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.HELLION, origin={"nco"}, + description=inspect.cleandoc( + """ + Increases movement speed in Hellion mode. + In Hellbat mode, launches the Hellbat toward enemy ground units and briefly stuns them. + """ + )), + ItemNames.HELLION_PROGRESSIVE_STIMPACK: + ItemData(259 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 12, SC2Race.TERRAN, + parent_item=ItemNames.HELLION, quantity=2, origin={"nco"}, + description=STIMPACK_LARGE_DESCRIPTION), + ItemNames.VULTURE_ION_THRUSTERS: + ItemData(260 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 25, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.VULTURE, origin={"bw"}, + description="Increases Vulture movement speed."), + ItemNames.VULTURE_AUTO_LAUNCHERS: + ItemData(261 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 26, SC2Race.TERRAN, + parent_item=ItemNames.VULTURE, origin={"bw"}, + description="Allows Vultures to attack while moving."), + ItemNames.SPIDER_MINE_HIGH_EXPLOSIVE_MUNITION: + ItemData(262 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 27, SC2Race.TERRAN, + origin={"bw"}, + description="Increases Spider mine damage."), + ItemNames.GOLIATH_JUMP_JETS: + ItemData(263 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 28, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.GOLIATH, origin={"nco"}, + description="Allows Goliaths to jump up and down cliffs."), + ItemNames.GOLIATH_OPTIMIZED_LOGISTICS: + ItemData(264 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 29, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.GOLIATH, origin={"nco"}, + description="Increases Goliath training speed."), + ItemNames.DIAMONDBACK_HYPERFLUXOR: + ItemData(265 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 0, SC2Race.TERRAN, + parent_item=ItemNames.DIAMONDBACK, origin={"ext"}, + description="Increases Diamondback attack speed."), + ItemNames.DIAMONDBACK_BURST_CAPACITORS: + ItemData(266 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 1, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.DIAMONDBACK, origin={"ext"}, + description=inspect.cleandoc( + """ + While not attacking, the Diamondback charges its weapon. + The next attack does 10 additional damage. + """ + )), + ItemNames.DIAMONDBACK_RESOURCE_EFFICIENCY: + ItemData(267 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 2, SC2Race.TERRAN, + parent_item=ItemNames.DIAMONDBACK, origin={"ext"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Diamondback")), + ItemNames.SIEGE_TANK_JUMP_JETS: + ItemData(268 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 3, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.SIEGE_TANK, origin={"nco"}, + description=inspect.cleandoc( + """ + Repositions Siege Tank to a target location. + Can be used in either mode and to jump up and down cliffs. + """ + )), + ItemNames.SIEGE_TANK_SPIDER_MINES: + ItemData(269 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 4, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.SIEGE_TANK, origin={"nco"}, + important_for_filtering=True, + description=inspect.cleandoc( + """ + Allows Siege Tanks to lay Spider Mines. + Lays 3 Spider Mines at once. 3 charges + """ + )), + ItemNames.SIEGE_TANK_SMART_SERVOS: + ItemData(270 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 5, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.SIEGE_TANK, origin={"nco"}, + description=SMART_SERVOS_DESCRIPTION), + ItemNames.SIEGE_TANK_GRADUATING_RANGE: + ItemData(271 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 6, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.SIEGE_TANK, origin={"ext"}, + description=inspect.cleandoc( + """ + Increases the Siege Tank's attack range by 1 every 3 seconds while in Siege Mode, + up to a maximum of 5 additional range. + """ + )), + ItemNames.SIEGE_TANK_LASER_TARGETING_SYSTEM: + ItemData(272 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 7, SC2Race.TERRAN, + parent_item=ItemNames.SIEGE_TANK, origin={"nco"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.SIEGE_TANK_ADVANCED_SIEGE_TECH: + ItemData(273 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 8, SC2Race.TERRAN, + parent_item=ItemNames.SIEGE_TANK, origin={"ext"}, + description="Siege Tanks gain +3 armor in Siege Mode."), + ItemNames.SIEGE_TANK_INTERNAL_TECH_MODULE: + ItemData(274 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 9, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.SIEGE_TANK, origin={"nco"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Siege Tanks", "Factory")), + ItemNames.PREDATOR_RESOURCE_EFFICIENCY: + ItemData(275 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 10, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.PREDATOR, origin={"ext"}, + description="Decreases Predator resource and supply cost."), + ItemNames.MEDIVAC_EXPANDED_HULL: + ItemData(276 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 11, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIVAC, origin={"ext"}, + description="Increases Medivac cargo space by 4."), + ItemNames.MEDIVAC_AFTERBURNERS: + ItemData(277 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 12, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIVAC, origin={"ext"}, + description="Ability. Temporarily increases the Medivac's movement speed by 70%."), + ItemNames.WRAITH_ADVANCED_LASER_TECHNOLOGY: + ItemData(278 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 13, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.WRAITH, origin={"ext"}, + description=inspect.cleandoc( + """ + Burst Lasers do more damage and can hit both ground and air targets. + Replaces Gemini Missiles weapon. + """ + )), + ItemNames.VIKING_SMART_SERVOS: + ItemData(279 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 14, SC2Race.TERRAN, + parent_item=ItemNames.VIKING, origin={"ext"}, + description=SMART_SERVOS_DESCRIPTION), + ItemNames.VIKING_ANTI_MECHANICAL_MUNITION: + ItemData(280 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 15, SC2Race.TERRAN, + parent_item=ItemNames.VIKING, origin={"ext"}, + description="Increases Viking damage to mechanical units while in Assault Mode."), + ItemNames.DIAMONDBACK_ION_THRUSTERS: + ItemData(281 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 21, SC2Race.TERRAN, + parent_item=ItemNames.DIAMONDBACK, origin={"ext"}, + description="Increases Diamondback movement speed."), + ItemNames.WARHOUND_RESOURCE_EFFICIENCY: + ItemData(282 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 13, SC2Race.TERRAN, + parent_item=ItemNames.WARHOUND, origin={"ext"}, + description=RESOURCE_EFFICIENCY_NO_SUPPLY_DESCRIPTION_TEMPLATE.format("Warhound")), + ItemNames.WARHOUND_REINFORCED_PLATING: + ItemData(283 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 14, SC2Race.TERRAN, + parent_item=ItemNames.WARHOUND, origin={"ext"}, + description="Increases Warhound armor by 2."), + ItemNames.HERC_RESOURCE_EFFICIENCY: + ItemData(284 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 15, SC2Race.TERRAN, + parent_item=ItemNames.HERC, origin={"ext"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("HERC")), + ItemNames.HERC_JUGGERNAUT_PLATING: + ItemData(285 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 16, SC2Race.TERRAN, + parent_item=ItemNames.WARHOUND, origin={"ext"}, + description="Increases HERC armor by 2."), + ItemNames.HERC_KINETIC_FOAM: + ItemData(286 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 17, SC2Race.TERRAN, + parent_item=ItemNames.WARHOUND, origin={"ext"}, + description="Increases HERC life by 50."), + + ItemNames.HELLION_TWIN_LINKED_FLAMETHROWER: + ItemData(300 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 16, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.HELLION, + description="Doubles the width of the Hellion's flame attack."), + ItemNames.HELLION_THERMITE_FILAMENTS: + ItemData(301 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 17, SC2Race.TERRAN, + parent_item=ItemNames.HELLION, + description="Hellions do an additional 10 damage to Light Armor."), + ItemNames.SPIDER_MINE_CERBERUS_MINE: + ItemData(302 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 18, SC2Race.TERRAN, + classification=ItemClassification.filler, + description="Increases trigger and blast radius of Spider Mines."), + ItemNames.VULTURE_PROGRESSIVE_REPLENISHABLE_MAGAZINE: + ItemData(303 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 16, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.VULTURE, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Allows Vultures to replace used Spider Mines. Costs 15 minerals. + Level 2: Replacing used Spider Mines no longer costs minerals. + """ + )), + ItemNames.GOLIATH_MULTI_LOCK_WEAPONS_SYSTEM: + ItemData(304 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 19, SC2Race.TERRAN, + parent_item=ItemNames.GOLIATH, + description="Goliaths can attack both ground and air targets simultaneously."), + ItemNames.GOLIATH_ARES_CLASS_TARGETING_SYSTEM: + ItemData(305 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 20, SC2Race.TERRAN, + parent_item=ItemNames.GOLIATH, + description="Increases Goliath ground attack range by 1 and air by 3."), + ItemNames.DIAMONDBACK_PROGRESSIVE_TRI_LITHIUM_POWER_CELL: + ItemData(306 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade 2", 4, SC2Race.TERRAN, + parent_item=ItemNames.DIAMONDBACK, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Tri-Lithium Power Cell: Increases Diamondback attack range by 1. + Level 2: Tungsten Spikes: Increases Diamondback attack range by 3. + """ + )), + ItemNames.DIAMONDBACK_SHAPED_HULL: + ItemData(307 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 22, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.DIAMONDBACK, + description="Increases Diamondback life by 50."), + ItemNames.SIEGE_TANK_MAELSTROM_ROUNDS: + ItemData(308 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 23, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.SIEGE_TANK, + description="Siege Tanks do an additional 40 damage to the primary target in Siege Mode."), + ItemNames.SIEGE_TANK_SHAPED_BLAST: + ItemData(309 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 24, SC2Race.TERRAN, + parent_item=ItemNames.SIEGE_TANK, + description="Reduces splash damage to friendly targets while in Siege Mode by 75%."), + ItemNames.MEDIVAC_RAPID_DEPLOYMENT_TUBE: + ItemData(310 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 25, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIVAC, + description="Medivacs deploy loaded troops almost instantly."), + ItemNames.MEDIVAC_ADVANCED_HEALING_AI: + ItemData(311 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 26, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.MEDIVAC, + description="Medivacs can heal two targets at once."), + ItemNames.WRAITH_PROGRESSIVE_TOMAHAWK_POWER_CELLS: + ItemData(312 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 18, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.WRAITH, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Tomahawk Power Cells: Increases Wraith starting energy by 100. + Level 2: Unregistered Cloaking Module: Wraiths do not require energy to cloak and remain cloaked. + """ + )), + ItemNames.WRAITH_DISPLACEMENT_FIELD: + ItemData(313 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 27, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.WRAITH, + description="Wraiths evade 20% of incoming attacks while cloaked."), + ItemNames.VIKING_RIPWAVE_MISSILES: + ItemData(314 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 28, SC2Race.TERRAN, + parent_item=ItemNames.VIKING, + description="Vikings do area damage while in Fighter Mode"), + ItemNames.VIKING_PHOBOS_CLASS_WEAPONS_SYSTEM: + ItemData(315 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 29, SC2Race.TERRAN, + parent_item=ItemNames.VIKING, + description="Increases Viking attack range by 1 in Assault mode and 2 in Fighter mode."), + ItemNames.BANSHEE_PROGRESSIVE_CROSS_SPECTRUM_DAMPENERS: + ItemData(316 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 2, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BANSHEE, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Banshees can remain cloaked twice as long. + Level 2: Banshees do not require energy to cloak and remain cloaked. + """ + )), + ItemNames.BANSHEE_SHOCKWAVE_MISSILE_BATTERY: + ItemData(317 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.BANSHEE, + description="Banshees do area damage in a straight line."), + ItemNames.BATTLECRUISER_PROGRESSIVE_MISSILE_PODS: + ItemData(318 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade 2", 2, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, quantity=2, + description="Spell. Missile Pods do damage to air targets in a target area."), + ItemNames.BATTLECRUISER_PROGRESSIVE_DEFENSIVE_MATRIX: + ItemData(319 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 20, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Spell. For 20 seconds the Battlecruiser gains a shield that can absorb up to 200 damage. + Level 2: Passive. Battlecruiser gets 200 shields. + """ + )), + ItemNames.GHOST_OCULAR_IMPLANTS: + ItemData(320 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 2, SC2Race.TERRAN, + parent_item=ItemNames.GHOST, + description="Increases Ghost sight range by 3 and attack range by 2."), + ItemNames.GHOST_CRIUS_SUIT: + ItemData(321 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 3, SC2Race.TERRAN, + parent_item=ItemNames.GHOST, + description="Cloak no longer requires energy to activate or maintain."), + ItemNames.SPECTRE_PSIONIC_LASH: + ItemData(322 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 4, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.SPECTRE, + description="Spell. Deals 200 damage to a single target."), + ItemNames.SPECTRE_NYX_CLASS_CLOAKING_MODULE: + ItemData(323 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 5, SC2Race.TERRAN, + parent_item=ItemNames.SPECTRE, + description="Cloak no longer requires energy to activate or maintain."), + ItemNames.THOR_330MM_BARRAGE_CANNON: + ItemData(324 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 6, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.THOR, + description=inspect.cleandoc( + """ + Improves 250mm Strike Cannons ability to deal area damage and stun units in a small area. + Can be also freely aimed on ground. + """ + )), + ItemNames.THOR_PROGRESSIVE_IMMORTALITY_PROTOCOL: + ItemData(325 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 22, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.THOR, quantity=2, + description=inspect.cleandoc(""" + Level 1: Allows destroyed Thors to be reconstructed on the field. Costs Vespene Gas. + Level 2: Thors are automatically reconstructed after falling for free. + """ + )), + ItemNames.LIBERATOR_ADVANCED_BALLISTICS: + ItemData(326 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 7, SC2Race.TERRAN, + parent_item=ItemNames.LIBERATOR, origin={"ext"}, + description="Increases Liberator range by 3 in Defender Mode."), + ItemNames.LIBERATOR_RAID_ARTILLERY: + ItemData(327 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 8, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.LIBERATOR, origin={"nco"}, + description="Allows Liberators to attack structures while in Defender Mode."), + ItemNames.WIDOW_MINE_DRILLING_CLAWS: + ItemData(328 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 9, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.WIDOW_MINE, origin={"ext"}, + description="Allows Widow Mines to burrow and unburrow faster."), + ItemNames.WIDOW_MINE_CONCEALMENT: + ItemData(329 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 10, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.WIDOW_MINE, origin={"ext"}, + description="Burrowed Widow Mines are no longer revealed when the Sentinel Missile is on cooldown."), + ItemNames.MEDIVAC_ADVANCED_CLOAKING_FIELD: + ItemData(330 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 11, SC2Race.TERRAN, + parent_item=ItemNames.MEDIVAC, origin={"ext"}, + description="Medivacs are permanently cloaked."), + ItemNames.WRAITH_TRIGGER_OVERRIDE: + ItemData(331 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 12, SC2Race.TERRAN, + parent_item=ItemNames.WRAITH, origin={"ext"}, + description="Wraith attack speed increases by 10% with each attack, up to a maximum of 100%."), + ItemNames.WRAITH_INTERNAL_TECH_MODULE: + ItemData(332 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 13, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.WRAITH, origin={"bw"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Wraiths", "Starport")), + ItemNames.WRAITH_RESOURCE_EFFICIENCY: + ItemData(333 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 14, SC2Race.TERRAN, + parent_item=ItemNames.WRAITH, origin={"bw"}, + description=RESOURCE_EFFICIENCY_NO_SUPPLY_DESCRIPTION_TEMPLATE.format("Wraith")), + ItemNames.VIKING_SHREDDER_ROUNDS: + ItemData(334 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 15, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.VIKING, origin={"ext"}, + description="Attacks in Assault mode do line splash damage."), + ItemNames.VIKING_WILD_MISSILES: + ItemData(335 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 16, SC2Race.TERRAN, + parent_item=ItemNames.VIKING, origin={"ext"}, + description="Launches 5 rockets at the target unit. Each rocket does 25 (40 vs armored) damage."), + ItemNames.BANSHEE_SHAPED_HULL: + ItemData(336 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 17, SC2Race.TERRAN, + parent_item=ItemNames.BANSHEE, origin={"ext"}, + description="Increases Banshee life by 100."), + ItemNames.BANSHEE_ADVANCED_TARGETING_OPTICS: + ItemData(337 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 18, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.BANSHEE, origin={"ext"}, + description="Increases Banshee attack range by 2 while cloaked."), + ItemNames.BANSHEE_DISTORTION_BLASTERS: + ItemData(338 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 19, SC2Race.TERRAN, + parent_item=ItemNames.BANSHEE, origin={"ext"}, + description="Increases Banshee attack damage by 25% while cloaked."), + ItemNames.BANSHEE_ROCKET_BARRAGE: + ItemData(339 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 20, SC2Race.TERRAN, + parent_item=ItemNames.BANSHEE, origin={"ext"}, + description="Deals 75 damage to enemy ground units in the target area."), + ItemNames.GHOST_RESOURCE_EFFICIENCY: + ItemData(340 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 21, SC2Race.TERRAN, + parent_item=ItemNames.GHOST, origin={"bw"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Ghost")), + ItemNames.SPECTRE_RESOURCE_EFFICIENCY: + ItemData(341 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 22, SC2Race.TERRAN, + parent_item=ItemNames.SPECTRE, origin={"ext"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Spectre")), + ItemNames.THOR_BUTTON_WITH_A_SKULL_ON_IT: + ItemData(342 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 23, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.THOR, origin={"ext"}, + description="Allows Thors to launch nukes."), + ItemNames.THOR_LASER_TARGETING_SYSTEM: + ItemData(343 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 24, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.THOR, origin={"ext"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.THOR_LARGE_SCALE_FIELD_CONSTRUCTION: + ItemData(344 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 25, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.THOR, origin={"ext"}, + description="Allows Thors to be built by SCVs like a structure."), + ItemNames.RAVEN_RESOURCE_EFFICIENCY: + ItemData(345 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 26, SC2Race.TERRAN, + parent_item=ItemNames.RAVEN, origin={"ext"}, + description=RESOURCE_EFFICIENCY_NO_SUPPLY_DESCRIPTION_TEMPLATE.format("Raven")), + ItemNames.RAVEN_DURABLE_MATERIALS: + ItemData(346 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 27, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.RAVEN, origin={"ext"}, + description="Extends timed life duration of Raven's summoned objects."), + ItemNames.SCIENCE_VESSEL_IMPROVED_NANO_REPAIR: + ItemData(347 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 28, SC2Race.TERRAN, + parent_item=ItemNames.SCIENCE_VESSEL, origin={"ext"}, + description="Nano-Repair no longer requires energy to use."), + ItemNames.SCIENCE_VESSEL_ADVANCED_AI_SYSTEMS: + ItemData(348 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 29, SC2Race.TERRAN, + parent_item=ItemNames.SCIENCE_VESSEL, origin={"ext"}, + description="Science Vessel can use Nano-Repair at two targets at once."), + ItemNames.CYCLONE_RESOURCE_EFFICIENCY: + ItemData(349 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 0, SC2Race.TERRAN, + parent_item=ItemNames.CYCLONE, origin={"ext"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Cyclone")), + ItemNames.BANSHEE_HYPERFLIGHT_ROTORS: + ItemData(350 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 1, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BANSHEE, origin={"ext"}, + description="Increases Banshee movement speed."), + ItemNames.BANSHEE_LASER_TARGETING_SYSTEM: + ItemData(351 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 2, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BANSHEE, origin={"nco"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.BANSHEE_INTERNAL_TECH_MODULE: + ItemData(352 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 3, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BANSHEE, origin={"nco"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Banshees", "Starport")), + ItemNames.BATTLECRUISER_TACTICAL_JUMP: + ItemData(353 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 4, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, origin={"nco", "ext"}, + description=inspect.cleandoc( + """ + Allows Battlecruisers to warp to a target location anywhere on the map. + """ + )), + ItemNames.BATTLECRUISER_CLOAK: + ItemData(354 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 5, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, origin={"nco"}, + description=CLOAK_DESCRIPTION_TEMPLATE.format("Battlecruisers")), + ItemNames.BATTLECRUISER_ATX_LASER_BATTERY: + ItemData(355 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 6, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.BATTLECRUISER, origin={"nco"}, + description=inspect.cleandoc( + """ + Battlecruisers can attack while moving, + do the same damage to both ground and air targets, and fire faster. + """ + )), + ItemNames.BATTLECRUISER_OPTIMIZED_LOGISTICS: + ItemData(356 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 7, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BATTLECRUISER, origin={"ext"}, + description="Increases Battlecruiser training speed."), + ItemNames.BATTLECRUISER_INTERNAL_TECH_MODULE: + ItemData(357 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 8, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.BATTLECRUISER, origin={"nco"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Battlecruisers", "Starport")), + ItemNames.GHOST_EMP_ROUNDS: + ItemData(358 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 9, SC2Race.TERRAN, + parent_item=ItemNames.GHOST, origin={"ext"}, + description=inspect.cleandoc( + """ + Spell. Does 100 damage to shields and drains all energy from units in the targeted area. + Cloaked units hit by EMP are revealed for a short time. + """ + )), + ItemNames.GHOST_LOCKDOWN: + ItemData(359 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 10, SC2Race.TERRAN, + parent_item=ItemNames.GHOST, origin={"bw"}, + description="Spell. Stuns a target mechanical unit for a long time."), + ItemNames.SPECTRE_IMPALER_ROUNDS: + ItemData(360 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 11, SC2Race.TERRAN, + parent_item=ItemNames.SPECTRE, origin={"ext"}, + description="Spectres do additional damage to armored targets."), + ItemNames.THOR_PROGRESSIVE_HIGH_IMPACT_PAYLOAD: + ItemData(361 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 14, SC2Race.TERRAN, + parent_item=ItemNames.THOR, quantity=2, origin={"ext"}, + description=inspect.cleandoc( + f""" + Level 1: Allows Thors to transform in order to use an alternative air attack. + Level 2: {SMART_SERVOS_DESCRIPTION} + """ + )), + ItemNames.RAVEN_BIO_MECHANICAL_REPAIR_DRONE: + ItemData(363 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 12, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.RAVEN, origin={"nco"}, + description="Spell. Deploys a drone that can heal biological or mechanical units."), + ItemNames.RAVEN_SPIDER_MINES: + ItemData(364 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 13, SC2Race.TERRAN, + parent_item=ItemNames.RAVEN, origin={"nco"}, important_for_filtering=True, + description="Spell. Deploys 3 Spider Mines to a target location."), + ItemNames.RAVEN_RAILGUN_TURRET: + ItemData(365 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 14, SC2Race.TERRAN, + parent_item=ItemNames.RAVEN, origin={"nco"}, + description=inspect.cleandoc( + """ + Spell. Allows Ravens to deploy an advanced Auto-Turret, + that can attack enemy ground units in a straight line. + """ + )), + ItemNames.RAVEN_HUNTER_SEEKER_WEAPON: + ItemData(366 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 15, SC2Race.TERRAN, + classification=ItemClassification.progression, parent_item=ItemNames.RAVEN, origin={"nco"}, + description="Allows Ravens to attack with a Hunter-Seeker weapon."), + ItemNames.RAVEN_INTERFERENCE_MATRIX: + ItemData(367 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 16, SC2Race.TERRAN, + parent_item=ItemNames.RAVEN, origin={"ext"}, + description=inspect.cleandoc( + """ + Spell. Target enemy Mechanical or Psionic unit can't attack or use abilities for a short duration. + """ + )), + ItemNames.RAVEN_ANTI_ARMOR_MISSILE: + ItemData(368 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 17, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.RAVEN, origin={"ext"}, + description="Spell. Decreases target and nearby enemy units armor by 2."), + ItemNames.RAVEN_INTERNAL_TECH_MODULE: + ItemData(369 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 18, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.RAVEN, origin={"nco"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Ravens", "Starport")), + ItemNames.SCIENCE_VESSEL_EMP_SHOCKWAVE: + ItemData(370 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 19, SC2Race.TERRAN, + parent_item=ItemNames.SCIENCE_VESSEL, origin={"bw"}, + description="Spell. Depletes all energy and shields of all units in a target area."), + ItemNames.SCIENCE_VESSEL_DEFENSIVE_MATRIX: + ItemData(371 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 20, SC2Race.TERRAN, + parent_item=ItemNames.SCIENCE_VESSEL, origin={"bw"}, + description=inspect.cleandoc( + """ + Spell. Provides a target unit with a defensive barrier that can absorb up to 250 damage + """ + )), + ItemNames.CYCLONE_TARGETING_OPTICS: + ItemData(372 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 21, SC2Race.TERRAN, + parent_item=ItemNames.CYCLONE, origin={"ext"}, + description="Increases Cyclone Lock On casting range and the range while Locked On."), + ItemNames.CYCLONE_RAPID_FIRE_LAUNCHERS: + ItemData(373 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 22, SC2Race.TERRAN, + parent_item=ItemNames.CYCLONE, origin={"ext"}, + description="The first 12 shots of Lock On are fired more quickly."), + ItemNames.LIBERATOR_CLOAK: + ItemData(374 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 23, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.LIBERATOR, origin={"nco"}, + description=CLOAK_DESCRIPTION_TEMPLATE.format("Liberators")), + ItemNames.LIBERATOR_LASER_TARGETING_SYSTEM: + ItemData(375 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 24, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.LIBERATOR, origin={"ext"}, + description=LASER_TARGETING_SYSTEMS_DESCRIPTION), + ItemNames.LIBERATOR_OPTIMIZED_LOGISTICS: + ItemData(376 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 25, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.LIBERATOR, origin={"nco"}, + description="Increases Liberator training speed."), + ItemNames.WIDOW_MINE_BLACK_MARKET_LAUNCHERS: + ItemData(377 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 26, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.WIDOW_MINE, origin={"ext"}, + description="Increases Widow Mine Sentinel Missile range."), + ItemNames.WIDOW_MINE_EXECUTIONER_MISSILES: + ItemData(378 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 27, SC2Race.TERRAN, + parent_item=ItemNames.WIDOW_MINE, origin={"ext"}, + description=inspect.cleandoc( + """ + Reduces Sentinel Missile cooldown. + When killed, Widow Mines will launch several missiles at random enemy targets. + """ + )), + ItemNames.VALKYRIE_ENHANCED_CLUSTER_LAUNCHERS: + ItemData(379 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 28, + SC2Race.TERRAN, parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description="Valkyries fire 2 additional rockets each volley."), + ItemNames.VALKYRIE_SHAPED_HULL: + ItemData(380 + SC2WOL_ITEM_ID_OFFSET, "Armory 5", 29, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description="Increases Valkyrie life by 50."), + ItemNames.VALKYRIE_FLECHETTE_MISSILES: + ItemData(381 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 0, SC2Race.TERRAN, + parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description="Equips Valkyries with Air-to-Surface missiles to attack ground units."), + ItemNames.VALKYRIE_AFTERBURNERS: + ItemData(382 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 1, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description="Ability. Temporarily increases the Valkyries's movement speed by 70%."), + ItemNames.CYCLONE_INTERNAL_TECH_MODULE: + ItemData(383 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 2, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.CYCLONE, origin={"ext"}, + description=INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Cyclones", "Factory")), + ItemNames.LIBERATOR_SMART_SERVOS: + ItemData(384 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 3, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.LIBERATOR, origin={"nco"}, + description=SMART_SERVOS_DESCRIPTION), + ItemNames.LIBERATOR_RESOURCE_EFFICIENCY: + ItemData(385 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 4, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.LIBERATOR, origin={"ext"}, + description=RESOURCE_EFFICIENCY_NO_SUPPLY_DESCRIPTION_TEMPLATE.format("Liberator")), + ItemNames.HERCULES_INTERNAL_FUSION_MODULE: + ItemData(386 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 5, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.HERCULES, origin={"ext"}, + description="Hercules can be trained from a Starport without having a Fusion Core."), + ItemNames.HERCULES_TACTICAL_JUMP: + ItemData(387 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 6, SC2Race.TERRAN, + parent_item=ItemNames.HERCULES, origin={"ext"}, + description=inspect.cleandoc( + """ + Allows Hercules to warp to a target location anywhere on the map. + """ + )), + ItemNames.PLANETARY_FORTRESS_PROGRESSIVE_AUGMENTED_THRUSTERS: + ItemData(388 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 28, SC2Race.TERRAN, + parent_item=ItemNames.PLANETARY_FORTRESS, origin={"ext"}, quantity=2, + description=inspect.cleandoc( + """ + Level 1: Lift Off - Planetary Fortress can lift off. + Level 2: Armament Stabilizers - Planetary Fortress can attack while lifted off. + """ + )), + ItemNames.PLANETARY_FORTRESS_ADVANCED_TARGETING: + ItemData(389 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 7, SC2Race.TERRAN, + parent_item=ItemNames.PLANETARY_FORTRESS, origin={"ext"}, + description="Planetary Fortress can attack air units."), + ItemNames.VALKYRIE_LAUNCHING_VECTOR_COMPENSATOR: + ItemData(390 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 8, SC2Race.TERRAN, + classification=ItemClassification.filler, parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description="Allows Valkyries to shoot air while moving."), + ItemNames.VALKYRIE_RESOURCE_EFFICIENCY: + ItemData(391 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 9, SC2Race.TERRAN, + parent_item=ItemNames.VALKYRIE, origin={"ext"}, + description=RESOURCE_EFFICIENCY_DESCRIPTION_TEMPLATE.format("Valkyrie")), + ItemNames.PREDATOR_PREDATOR_S_FURY: + ItemData(392 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 10, SC2Race.TERRAN, + parent_item=ItemNames.PREDATOR, origin={"ext"}, + description="Predators can use an attack that jumps between targets."), + ItemNames.BATTLECRUISER_BEHEMOTH_PLATING: + ItemData(393 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 11, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, origin={"ext"}, + description="Increases Battlecruiser armor by 2."), + ItemNames.BATTLECRUISER_COVERT_OPS_ENGINES: + ItemData(394 + SC2WOL_ITEM_ID_OFFSET, "Armory 6", 12, SC2Race.TERRAN, + parent_item=ItemNames.BATTLECRUISER, origin={"nco"}, + description="Increases Battlecruiser movement speed."), + + #Buildings + ItemNames.BUNKER: + ItemData(400 + SC2WOL_ITEM_ID_OFFSET, "Building", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Defensive structure. Able to load infantry units, giving them +1 range to their attacks."), + ItemNames.MISSILE_TURRET: + ItemData(401 + SC2WOL_ITEM_ID_OFFSET, "Building", 1, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Anti-air defensive structure."), + ItemNames.SENSOR_TOWER: + ItemData(402 + SC2WOL_ITEM_ID_OFFSET, "Building", 2, SC2Race.TERRAN, + description="Reveals locations of enemy units at long range."), + + ItemNames.WAR_PIGS: + ItemData(500 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 0, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Mercenary Marines"), + ItemNames.DEVIL_DOGS: + ItemData(501 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 1, SC2Race.TERRAN, + classification=ItemClassification.filler, + description="Mercenary Firebats"), + ItemNames.HAMMER_SECURITIES: + ItemData(502 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 2, SC2Race.TERRAN, + description="Mercenary Marauders"), + ItemNames.SPARTAN_COMPANY: + ItemData(503 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 3, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Mercenary Goliaths"), + ItemNames.SIEGE_BREAKERS: + ItemData(504 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 4, SC2Race.TERRAN, + description="Mercenary Siege Tanks"), + ItemNames.HELS_ANGELS: + ItemData(505 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 5, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Mercenary Vikings"), + ItemNames.DUSK_WINGS: + ItemData(506 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 6, SC2Race.TERRAN, + description="Mercenary Banshees"), + ItemNames.JACKSONS_REVENGE: + ItemData(507 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 7, SC2Race.TERRAN, + description="Mercenary Battlecruiser"), + ItemNames.SKIBIS_ANGELS: + ItemData(508 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 8, SC2Race.TERRAN, + origin={"ext"}, + description="Mercenary Medics"), + ItemNames.DEATH_HEADS: + ItemData(509 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 9, SC2Race.TERRAN, + origin={"ext"}, + description="Mercenary Reapers"), + ItemNames.WINGED_NIGHTMARES: + ItemData(510 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 10, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description="Mercenary Wraiths"), + ItemNames.MIDNIGHT_RIDERS: + ItemData(511 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 11, SC2Race.TERRAN, + origin={"ext"}, + description="Mercenary Liberators"), + ItemNames.BRYNHILDS: + ItemData(512 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 12, SC2Race.TERRAN, + classification=ItemClassification.progression, origin={"ext"}, + description="Mercenary Valkyries"), + ItemNames.JOTUN: + ItemData(513 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 13, SC2Race.TERRAN, + origin={"ext"}, + description="Mercenary Thor"), + + ItemNames.ULTRA_CAPACITORS: + ItemData(600 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 0, SC2Race.TERRAN, + description="Increases attack speed of units by 5% per weapon upgrade."), + ItemNames.VANADIUM_PLATING: + ItemData(601 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 1, SC2Race.TERRAN, + description="Increases the life of units by 5% per armor upgrade."), + ItemNames.ORBITAL_DEPOTS: + ItemData(602 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 2, SC2Race.TERRAN, + description="Supply depots are built instantly."), + ItemNames.MICRO_FILTERING: + ItemData(603 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 3, SC2Race.TERRAN, + description="Refineries produce Vespene gas 25% faster."), + ItemNames.AUTOMATED_REFINERY: + ItemData(604 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 4, SC2Race.TERRAN, + description="Eliminates the need for SCVs in vespene gas production."), + ItemNames.COMMAND_CENTER_REACTOR: + ItemData(605 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 5, SC2Race.TERRAN, + description="Command Centers can train two SCVs at once."), + ItemNames.RAVEN: + ItemData(606 + SC2WOL_ITEM_ID_OFFSET, "Unit", 22, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Aerial Caster unit."), + ItemNames.SCIENCE_VESSEL: + ItemData(607 + SC2WOL_ITEM_ID_OFFSET, "Unit", 23, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Aerial Caster unit. Can repair mechanical units."), + ItemNames.TECH_REACTOR: + ItemData(608 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 6, SC2Race.TERRAN, + description="Merges Tech Labs and Reactors into one add on structure to provide both functions."), + ItemNames.ORBITAL_STRIKE: + ItemData(609 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 7, SC2Race.TERRAN, + description="Trained units from Barracks are instantly deployed on rally point."), + ItemNames.BUNKER_SHRIKE_TURRET: + ItemData(610 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 6, SC2Race.TERRAN, + parent_item=ItemNames.BUNKER, + description="Adds an automated turret to Bunkers."), + ItemNames.BUNKER_FORTIFIED_BUNKER: + ItemData(611 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 7, SC2Race.TERRAN, + parent_item=ItemNames.BUNKER, + description="Bunkers have more life."), + ItemNames.PLANETARY_FORTRESS: + ItemData(612 + SC2WOL_ITEM_ID_OFFSET, "Building", 3, SC2Race.TERRAN, + classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Allows Command Centers to upgrade into a defensive structure with a turret and additional armor. + Planetary Fortresses cannot Lift Off, or cast Orbital Command spells. + """ + )), + ItemNames.PERDITION_TURRET: + ItemData(613 + SC2WOL_ITEM_ID_OFFSET, "Building", 4, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Automated defensive turret. Burrows down while no enemies are nearby."), + ItemNames.PREDATOR: + ItemData(614 + SC2WOL_ITEM_ID_OFFSET, "Unit", 24, SC2Race.TERRAN, + classification=ItemClassification.filler, + description="Anti-infantry specialist that deals area damage with each attack."), + ItemNames.HERCULES: + ItemData(615 + SC2WOL_ITEM_ID_OFFSET, "Unit", 25, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Massive transport ship."), + ItemNames.CELLULAR_REACTOR: + ItemData(616 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 8, SC2Race.TERRAN, + description="All Terran spellcasters get +100 starting and maximum energy."), + ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL: + ItemData(617 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 4, SC2Race.TERRAN, quantity=3, + classification= ItemClassification.progression, + description=inspect.cleandoc( + """ + Allows Terran mechanical units to regenerate health while not in combat. + Each level increases life regeneration speed. + """ + )), + ItemNames.HIVE_MIND_EMULATOR: + ItemData(618 + SC2WOL_ITEM_ID_OFFSET, "Building", 5, SC2Race.TERRAN, + ItemClassification.progression, + description="Defensive structure. Can permanently Mind Control Zerg units."), + ItemNames.PSI_DISRUPTER: + ItemData(619 + SC2WOL_ITEM_ID_OFFSET, "Building", 6, SC2Race.TERRAN, + classification=ItemClassification.progression, + description="Defensive structure. Slows the attack and movement speeds of all nearby Zerg units."), + ItemNames.STRUCTURE_ARMOR: + ItemData(620 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 9, SC2Race.TERRAN, + description="Increases armor of all Terran structures by 2."), + ItemNames.HI_SEC_AUTO_TRACKING: + ItemData(621 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 10, SC2Race.TERRAN, + description="Increases attack range of all Terran structures by 1."), + ItemNames.ADVANCED_OPTICS: + ItemData(622 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 11, SC2Race.TERRAN, + description="Increases attack range of all Terran mechanical units by 1."), + ItemNames.ROGUE_FORCES: + ItemData(623 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 12, SC2Race.TERRAN, + description="Mercenary calldowns are no longer limited by charges."), + + ItemNames.ZEALOT: + ItemData(700 + SC2WOL_ITEM_ID_OFFSET, "Unit", 0, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Powerful melee warrior. Can use the charge ability."), + ItemNames.STALKER: + ItemData(701 + SC2WOL_ITEM_ID_OFFSET, "Unit", 1, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Ranged attack strider. Can use the Blink ability."), + ItemNames.HIGH_TEMPLAR: + ItemData(702 + SC2WOL_ITEM_ID_OFFSET, "Unit", 2, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Potent psionic master. Can use the Feedback and Psionic Storm abilities. Can merge into an Archon."), + ItemNames.DARK_TEMPLAR: + ItemData(703 + SC2WOL_ITEM_ID_OFFSET, "Unit", 3, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Deadly warrior-assassin. Permanently cloaked. Can use the Shadow Fury ability."), + ItemNames.IMMORTAL: + ItemData(704 + SC2WOL_ITEM_ID_OFFSET, "Unit", 4, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Assault strider. Can use Barrier to absorb damage."), + ItemNames.COLOSSUS: + ItemData(705 + SC2WOL_ITEM_ID_OFFSET, "Unit", 5, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Battle strider with a powerful area attack. Can walk up and down cliffs. Attacks set fire to the ground, dealing extra damage to enemies over time."), + ItemNames.PHOENIX: + ItemData(706 + SC2WOL_ITEM_ID_OFFSET, "Unit", 6, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities."), + ItemNames.VOID_RAY: + ItemData(707 + SC2WOL_ITEM_ID_OFFSET, "Unit", 7, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Surgical strike craft. Has the Prismatic Alignment and Prismatic Range abilities."), + ItemNames.CARRIER: + ItemData(708 + SC2WOL_ITEM_ID_OFFSET, "Unit", 8, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"wol", "lotv"}, + description="Capital ship. Builds and launches Interceptors that attack enemy targets. Repair Drones heal nearby mechanical units."), + + # Filler items to fill remaining spots + ItemNames.STARTING_MINERALS: + ItemData(800 + SC2WOL_ITEM_ID_OFFSET, "Minerals", 15, SC2Race.ANY, quantity=0, + classification=ItemClassification.filler, + description="Increases the starting minerals for all missions."), + ItemNames.STARTING_VESPENE: + ItemData(801 + SC2WOL_ITEM_ID_OFFSET, "Vespene", 15, SC2Race.ANY, quantity=0, + classification=ItemClassification.filler, + description="Increases the starting vespene for all missions."), + ItemNames.STARTING_SUPPLY: + ItemData(802 + SC2WOL_ITEM_ID_OFFSET, "Supply", 2, SC2Race.ANY, quantity=0, + classification=ItemClassification.filler, + description="Increases the starting supply for all missions."), + # This item is used to "remove" location from the game. Never placed unless plando'd + ItemNames.NOTHING: + ItemData(803 + SC2WOL_ITEM_ID_OFFSET, "Nothing Group", 2, SC2Race.ANY, quantity=0, + classification=ItemClassification.trap, + description="Does nothing. Used to remove a location from the game."), + + # Nova gear + ItemNames.NOVA_GHOST_VISOR: + ItemData(900 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 0, SC2Race.TERRAN, origin={"nco"}, + description="Reveals the locations of enemy units in the fog of war around Nova. Can detect cloaked units."), + ItemNames.NOVA_RANGEFINDER_OCULUS: + ItemData(901 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 1, SC2Race.TERRAN, origin={"nco"}, + description="Increaases Nova's vision range and non-melee weapon attack range by 2. Also increases range of melee weapons by 1."), + ItemNames.NOVA_DOMINATION: + ItemData(902 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 2, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to mind-control a target enemy unit."), + ItemNames.NOVA_BLINK: + ItemData(903 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 3, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to teleport a short distance and cloak for 10s."), + ItemNames.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE: + ItemData(904 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade 2", 0, SC2Race.TERRAN, quantity=2, origin={"nco"}, + classification=ItemClassification.progression, + description=inspect.cleandoc( + """ + Level 1: Gives Nova the ability to cloak. + Level 2: Nova is permanently cloaked. + """ + )), + ItemNames.NOVA_ENERGY_SUIT_MODULE: + ItemData(905 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 4, SC2Race.TERRAN, origin={"nco"}, + description="Increases Nova's maximum energy and energy regeneration rate."), + ItemNames.NOVA_ARMORED_SUIT_MODULE: + ItemData(906 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 5, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Increases Nova's health by 100 and armour by 1. Nova also regenerates life quickly out of combat."), + ItemNames.NOVA_JUMP_SUIT_MODULE: + ItemData(907 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 6, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Increases Nova's movement speed and allows her to jump up and down cliffs."), + ItemNames.NOVA_C20A_CANISTER_RIFLE: + ItemData(908 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 7, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Allows Nova to equip the C20A Canister Rifle, which has a ranged attack and allows Nova to cast Snipe."), + ItemNames.NOVA_HELLFIRE_SHOTGUN: + ItemData(909 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 8, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Allows Nova to equip the Hellfire Shotgun, which has a short-range area attack in a cone and allows Nova to cast Penetrating Blast."), + ItemNames.NOVA_PLASMA_RIFLE: + ItemData(910 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 9, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Allows Nova to equip the Plasma Rifle, which has a rapidfire ranged attack and allows Nova to cast Plasma Shot."), + ItemNames.NOVA_MONOMOLECULAR_BLADE: + ItemData(911 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 10, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Allows Nova to equip the Monomolecular Blade, which has a melee attack and allows Nova to cast Dash Attack."), + ItemNames.NOVA_BLAZEFIRE_GUNBLADE: + ItemData(912 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 11, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Allows Nova to equip the Blazefire Gunblade, which has a melee attack and allows Nova to cast Fury of One."), + ItemNames.NOVA_STIM_INFUSION: + ItemData(913 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 12, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to heal herself and temporarily increase her movement and attack speeds."), + ItemNames.NOVA_PULSE_GRENADES: + ItemData(914 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 13, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to throw a grenade dealing large damage in an area."), + ItemNames.NOVA_FLASHBANG_GRENADES: + ItemData(915 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 14, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to throw a grenade to stun enemies and disable detection in a large area."), + ItemNames.NOVA_IONIC_FORCE_FIELD: + ItemData(916 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 15, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to shield herself temporarily."), + ItemNames.NOVA_HOLO_DECOY: + ItemData(917 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 16, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to summon a decoy unit which enemies will prefer to target and takes reduced damage."), + ItemNames.NOVA_NUKE: + ItemData(918 + SC2WOL_ITEM_ID_OFFSET, "Nova Gear", 17, SC2Race.TERRAN, origin={"nco"}, + classification=ItemClassification.progression, + description="Gives Nova the ability to launch tactical nukes built from the Shadow Ops."), + + # HotS + ItemNames.ZERGLING: + ItemData(0 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 0, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Fast inexpensive melee attacker. Hatches in pairs from a single larva. Can morph into a Baneling."), + ItemNames.SWARM_QUEEN: + ItemData(1 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 1, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Ranged support caster. Can use the Spawn Creep Tumor and Rapid Transfusion abilities."), + ItemNames.ROACH: + ItemData(2 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 2, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Durable short ranged attacker. Regenerates life quickly when burrowed."), + ItemNames.HYDRALISK: + ItemData(3 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 3, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="High-damage generalist ranged attacker."), + ItemNames.ZERGLING_BANELING_ASPECT: + ItemData(4 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 5, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Anti-ground suicide unit. Does damage over a small area on death."), + ItemNames.ABERRATION: + ItemData(5 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 5, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Durable melee attacker that deals heavy damage and can walk over other units."), + ItemNames.MUTALISK: + ItemData(6 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 6, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Fragile flying attacker. Attacks bounce between targets."), + ItemNames.SWARM_HOST: + ItemData(7 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 7, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Siege unit that attacks by rooting in place and continually spawning Locusts."), + ItemNames.INFESTOR: + ItemData(8 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 8, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Support caster that can move while burrowed. Can use the Fungal Growth, Parasitic Domination, and Consumption abilities."), + ItemNames.ULTRALISK: + ItemData(9 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 9, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Massive melee attacker. Has an area-damage cleave attack."), + ItemNames.SPORE_CRAWLER: + ItemData(10 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 10, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Anti-air defensive structure that can detect cloaked units."), + ItemNames.SPINE_CRAWLER: + ItemData(11 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 11, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"hots"}, + description="Anti-ground defensive structure."), + ItemNames.CORRUPTOR: + ItemData(12 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 12, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"ext"}, + description="Anti-air flying attacker specializing in taking down enemy capital ships."), + ItemNames.SCOURGE: + ItemData(13 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 13, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"bw", "ext"}, + description="Flying anti-air suicide unit. Hatches in pairs from a single larva."), + ItemNames.BROOD_QUEEN: + ItemData(14 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 4, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"bw", "ext"}, + description="Flying support caster. Can cast the Ocular Symbiote and Spawn Broodlings abilities."), + ItemNames.DEFILER: + ItemData(15 + SC2HOTS_ITEM_ID_OFFSET, "Unit", 14, SC2Race.ZERG, + classification=ItemClassification.progression, origin={"bw"}, + description="Support caster. Can use the Dark Swarm, Consume, and Plague abilities."), + + ItemNames.PROGRESSIVE_ZERG_MELEE_ATTACK: ItemData(100 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 0, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_MISSILE_ATTACK: ItemData(101 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 2, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_GROUND_CARAPACE: ItemData(102 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 4, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_FLYER_ATTACK: ItemData(103 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 6, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_FLYER_CARAPACE: ItemData(104 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 8, SC2Race.ZERG, quantity=3, origin={"hots"}), + # Upgrade bundle 'number' values are used as indices to get affected 'number's + ItemNames.PROGRESSIVE_ZERG_WEAPON_UPGRADE: ItemData(105 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 6, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_ARMOR_UPGRADE: ItemData(106 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 7, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_GROUND_UPGRADE: ItemData(107 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 8, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_FLYER_UPGRADE: ItemData(108 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 9, SC2Race.ZERG, quantity=3, origin={"hots"}), + ItemNames.PROGRESSIVE_ZERG_WEAPON_ARMOR_UPGRADE: ItemData(109 + SC2HOTS_ITEM_ID_OFFSET, "Upgrade", 10, SC2Race.ZERG, quantity=3, origin={"hots"}), + + ItemNames.ZERGLING_HARDENED_CARAPACE: + ItemData(200 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 0, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"hots"}, description="Increases Zergling health by +10."), + ItemNames.ZERGLING_ADRENAL_OVERLOAD: + ItemData(201 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 1, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"hots"}, description="Increases Zergling attack speed."), + ItemNames.ZERGLING_METABOLIC_BOOST: + ItemData(202 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 2, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"hots"}, classification=ItemClassification.filler, + description="Increases Zergling movement speed."), + ItemNames.ROACH_HYDRIODIC_BILE: + ItemData(203 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 3, SC2Race.ZERG, parent_item=ItemNames.ROACH, + origin={"hots"}, description="Roaches deal +8 damage to light targets."), + ItemNames.ROACH_ADAPTIVE_PLATING: + ItemData(204 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 4, SC2Race.ZERG, parent_item=ItemNames.ROACH, + origin={"hots"}, description="Roaches gain +3 armour when their life is below 50%."), + ItemNames.ROACH_TUNNELING_CLAWS: + ItemData(205 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 5, SC2Race.ZERG, parent_item=ItemNames.ROACH, + origin={"hots"}, classification=ItemClassification.filler, + description="Allows Roaches to move while burrowed."), + ItemNames.HYDRALISK_FRENZY: + ItemData(206 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 6, SC2Race.ZERG, parent_item=ItemNames.HYDRALISK, + origin={"hots"}, + description="Allows Hydralisks to use the Frenzy ability, which increases their attack speed by 50%."), + ItemNames.HYDRALISK_ANCILLARY_CARAPACE: + ItemData(207 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 7, SC2Race.ZERG, parent_item=ItemNames.HYDRALISK, + origin={"hots"}, classification=ItemClassification.filler, description="Hydralisks gain +20 health."), + ItemNames.HYDRALISK_GROOVED_SPINES: + ItemData(208 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 8, SC2Race.ZERG, parent_item=ItemNames.HYDRALISK, + origin={"hots"}, description="Hydralisks gain +1 range."), + ItemNames.BANELING_CORROSIVE_ACID: + ItemData(209 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 9, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"hots"}, + description="Increases the damage banelings deal to their primary target. Splash damage remains the same."), + ItemNames.BANELING_RUPTURE: + ItemData(210 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 10, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"hots"}, + classification=ItemClassification.filler, + description="Increases the splash radius of baneling attacks."), + ItemNames.BANELING_REGENERATIVE_ACID: + ItemData(211 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 11, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"hots"}, + classification=ItemClassification.filler, + description="Banelings will heal nearby friendly units when they explode."), + ItemNames.MUTALISK_VICIOUS_GLAIVE: + ItemData(212 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 12, SC2Race.ZERG, parent_item=ItemNames.MUTALISK, + origin={"hots"}, description="Mutalisks attacks will bounce an additional 3 times."), + ItemNames.MUTALISK_RAPID_REGENERATION: + ItemData(213 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 13, SC2Race.ZERG, parent_item=ItemNames.MUTALISK, + origin={"hots"}, description="Mutalisks will regenerate quickly when out of combat."), + ItemNames.MUTALISK_SUNDERING_GLAIVE: + ItemData(214 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 14, SC2Race.ZERG, parent_item=ItemNames.MUTALISK, + origin={"hots"}, description="Mutalisks deal increased damage to their primary target."), + ItemNames.SWARM_HOST_BURROW: + ItemData(215 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 15, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"hots"}, classification=ItemClassification.filler, + description="Allows Swarm Hosts to burrow instead of root to spawn locusts."), + ItemNames.SWARM_HOST_RAPID_INCUBATION: + ItemData(216 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 16, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"hots"}, description="Swarm Hosts will spawn locusts 20% faster."), + ItemNames.SWARM_HOST_PRESSURIZED_GLANDS: + ItemData(217 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 17, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"hots"}, classification=ItemClassification.progression, + description="Allows Swarm Host Locusts to attack air targets."), + ItemNames.ULTRALISK_BURROW_CHARGE: + ItemData(218 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 18, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"hots"}, + description="Allows Ultralisks to burrow and charge at enemy units, knocking back and stunning units when it emerges."), + ItemNames.ULTRALISK_TISSUE_ASSIMILATION: + ItemData(219 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 19, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"hots"}, description="Ultralisks recover health when they deal damage."), + ItemNames.ULTRALISK_MONARCH_BLADES: + ItemData(220 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 20, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"hots"}, description="Ultralisks gain increased splash damage."), + ItemNames.CORRUPTOR_CAUSTIC_SPRAY: + ItemData(221 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 21, SC2Race.ZERG, parent_item=ItemNames.CORRUPTOR, + origin={"ext"}, + description="Allows Corruptors to use the Caustic Spray ability, which deals ramping damage to buildings over time."), + ItemNames.CORRUPTOR_CORRUPTION: + ItemData(222 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 22, SC2Race.ZERG, parent_item=ItemNames.CORRUPTOR, + origin={"ext"}, + description="Allows Corruptors to use the Corruption ability, which causes a target enemy unit to take increased damage."), + ItemNames.SCOURGE_VIRULENT_SPORES: + ItemData(223 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 23, SC2Race.ZERG, parent_item=ItemNames.SCOURGE, + origin={"ext"}, description="Scourge will deal splash damage."), + ItemNames.SCOURGE_RESOURCE_EFFICIENCY: + ItemData(224 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 24, SC2Race.ZERG, parent_item=ItemNames.SCOURGE, + origin={"ext"}, classification=ItemClassification.progression, + description="Reduces the cost of Scourge by 50 gas per egg."), + ItemNames.SCOURGE_SWARM_SCOURGE: + ItemData(225 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 25, SC2Race.ZERG, parent_item=ItemNames.SCOURGE, + origin={"ext"}, description="An extra Scourge will be built from each egg at no additional cost."), + ItemNames.ZERGLING_SHREDDING_CLAWS: + ItemData(226 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 26, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"ext"}, description="Zergling attacks will temporarily reduce their target's armour to 0."), + ItemNames.ROACH_GLIAL_RECONSTITUTION: + ItemData(227 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 27, SC2Race.ZERG, parent_item=ItemNames.ROACH, + origin={"ext"}, description="Increases Roach movement speed."), + ItemNames.ROACH_ORGANIC_CARAPACE: + ItemData(228 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 28, SC2Race.ZERG, parent_item=ItemNames.ROACH, + origin={"ext"}, description="Increases Roach health by +25."), + ItemNames.HYDRALISK_MUSCULAR_AUGMENTS: + ItemData(229 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 1", 29, SC2Race.ZERG, parent_item=ItemNames.HYDRALISK, + origin={"bw"}, description="Increases Hydralisk movement speed."), + ItemNames.HYDRALISK_RESOURCE_EFFICIENCY: + ItemData(230 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 0, SC2Race.ZERG, parent_item=ItemNames.HYDRALISK, + origin={"bw"}, description="Reduces Hydralisk resource cost by 25/25 and supply cost by 1."), + ItemNames.BANELING_CENTRIFUGAL_HOOKS: + ItemData(231 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 1, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"ext"}, + description="Increases the movement speed of Banelings."), + ItemNames.BANELING_TUNNELING_JAWS: + ItemData(232 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 2, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"ext"}, + description="Allows Banelings to move while burrowed."), + ItemNames.BANELING_RAPID_METAMORPH: + ItemData(233 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 3, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"ext"}, description="Banelings morph faster."), + ItemNames.MUTALISK_SEVERING_GLAIVE: + ItemData(234 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 4, SC2Race.ZERG, parent_item=ItemNames.MUTALISK, + origin={"ext"}, description="Mutalisk bounce attacks will deal full damage."), + ItemNames.MUTALISK_AERODYNAMIC_GLAIVE_SHAPE: + ItemData(235 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 5, SC2Race.ZERG, parent_item=ItemNames.MUTALISK, + origin={"ext"}, description="Increases the attack range of Mutalisks by 2."), + ItemNames.SWARM_HOST_LOCUST_METABOLIC_BOOST: + ItemData(236 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 6, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"ext"}, classification=ItemClassification.filler, + description="Increases Locust movement speed."), + ItemNames.SWARM_HOST_ENDURING_LOCUSTS: + ItemData(237 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 7, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"ext"}, description="Increases the duration of Swarm Hosts' Locusts by 10s."), + ItemNames.SWARM_HOST_ORGANIC_CARAPACE: + ItemData(238 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 8, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"ext"}, description="Increases Swarm Host health by +40."), + ItemNames.SWARM_HOST_RESOURCE_EFFICIENCY: + ItemData(239 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 9, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"ext"}, description="Reduces Swarm Host resource cost by 100/25."), + ItemNames.ULTRALISK_ANABOLIC_SYNTHESIS: + ItemData(240 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 10, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"bw"}, classification=ItemClassification.filler), + ItemNames.ULTRALISK_CHITINOUS_PLATING: + ItemData(241 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 11, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"bw"}), + ItemNames.ULTRALISK_ORGANIC_CARAPACE: + ItemData(242 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 12, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"ext"}), + ItemNames.ULTRALISK_RESOURCE_EFFICIENCY: + ItemData(243 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 13, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"bw"}), + ItemNames.DEVOURER_CORROSIVE_SPRAY: + ItemData(244 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 14, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT, origin={"ext"}), + ItemNames.DEVOURER_GAPING_MAW: + ItemData(245 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 15, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT, origin={"ext"}), + ItemNames.DEVOURER_IMPROVED_OSMOSIS: + ItemData(246 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 16, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT, origin={"ext"}, + classification=ItemClassification.filler), + ItemNames.DEVOURER_PRESCIENT_SPORES: + ItemData(247 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 17, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT, origin={"ext"}), + ItemNames.GUARDIAN_PROLONGED_DISPERSION: + ItemData(248 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 18, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT, origin={"ext"}), + ItemNames.GUARDIAN_PRIMAL_ADAPTATION: + ItemData(249 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 19, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT, origin={"ext"}), + ItemNames.GUARDIAN_SORONAN_ACID: + ItemData(250 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 20, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT, origin={"ext"}), + ItemNames.IMPALER_ADAPTIVE_TALONS: + ItemData(251 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 21, SC2Race.ZERG, + parent_item=ItemNames.HYDRALISK_IMPALER_ASPECT, origin={"ext"}, + classification=ItemClassification.filler), + ItemNames.IMPALER_SECRETION_GLANDS: + ItemData(252 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 22, SC2Race.ZERG, + parent_item=ItemNames.HYDRALISK_IMPALER_ASPECT, origin={"ext"}), + ItemNames.IMPALER_HARDENED_TENTACLE_SPINES: + ItemData(253 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 23, SC2Race.ZERG, + parent_item=ItemNames.HYDRALISK_IMPALER_ASPECT, origin={"ext"}), + ItemNames.LURKER_SEISMIC_SPINES: + ItemData(254 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 24, SC2Race.ZERG, + parent_item=ItemNames.HYDRALISK_LURKER_ASPECT, origin={"ext"}), + ItemNames.LURKER_ADAPTED_SPINES: + ItemData(255 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 25, SC2Race.ZERG, + parent_item=ItemNames.HYDRALISK_LURKER_ASPECT, origin={"ext"}), + ItemNames.RAVAGER_POTENT_BILE: + ItemData(256 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 26, SC2Race.ZERG, + parent_item=ItemNames.ROACH_RAVAGER_ASPECT, origin={"ext"}), + ItemNames.RAVAGER_BLOATED_BILE_DUCTS: + ItemData(257 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 27, SC2Race.ZERG, + parent_item=ItemNames.ROACH_RAVAGER_ASPECT, origin={"ext"}), + ItemNames.RAVAGER_DEEP_TUNNEL: + ItemData(258 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 28, SC2Race.ZERG, + parent_item=ItemNames.ROACH_RAVAGER_ASPECT, origin={"ext"}), + ItemNames.VIPER_PARASITIC_BOMB: + ItemData(259 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 2", 29, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT, origin={"ext"}), + ItemNames.VIPER_PARALYTIC_BARBS: + ItemData(260 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 0, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT, origin={"ext"}), + ItemNames.VIPER_VIRULENT_MICROBES: + ItemData(261 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 1, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT, origin={"ext"}), + ItemNames.BROOD_LORD_POROUS_CARTILAGE: + ItemData(262 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 2, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT, origin={"ext"}), + ItemNames.BROOD_LORD_EVOLVED_CARAPACE: + ItemData(263 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 3, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT, origin={"ext"}), + ItemNames.BROOD_LORD_SPLITTER_MITOSIS: + ItemData(264 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 4, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT, origin={"ext"}), + ItemNames.BROOD_LORD_RESOURCE_EFFICIENCY: + ItemData(265 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 5, SC2Race.ZERG, + parent_item=ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT, origin={"ext"}), + ItemNames.INFESTOR_INFESTED_TERRAN: + ItemData(266 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 6, SC2Race.ZERG, parent_item=ItemNames.INFESTOR, + origin={"ext"}), + ItemNames.INFESTOR_MICROBIAL_SHROUD: + ItemData(267 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 7, SC2Race.ZERG, parent_item=ItemNames.INFESTOR, + origin={"ext"}), + ItemNames.SWARM_QUEEN_SPAWN_LARVAE: + ItemData(268 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 8, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}), + ItemNames.SWARM_QUEEN_DEEP_TUNNEL: + ItemData(269 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 9, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}), + ItemNames.SWARM_QUEEN_ORGANIC_CARAPACE: + ItemData(270 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 10, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}, classification=ItemClassification.filler), + ItemNames.SWARM_QUEEN_BIO_MECHANICAL_TRANSFUSION: + ItemData(271 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 11, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}), + ItemNames.SWARM_QUEEN_RESOURCE_EFFICIENCY: + ItemData(272 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 12, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}), + ItemNames.SWARM_QUEEN_INCUBATOR_CHAMBER: + ItemData(273 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 13, SC2Race.ZERG, parent_item=ItemNames.SWARM_QUEEN, + origin={"ext"}), + ItemNames.BROOD_QUEEN_FUNGAL_GROWTH: + ItemData(274 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 14, SC2Race.ZERG, parent_item=ItemNames.BROOD_QUEEN, + origin={"ext"}), + ItemNames.BROOD_QUEEN_ENSNARE: + ItemData(275 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 15, SC2Race.ZERG, parent_item=ItemNames.BROOD_QUEEN, + origin={"ext"}), + ItemNames.BROOD_QUEEN_ENHANCED_MITOCHONDRIA: + ItemData(276 + SC2HOTS_ITEM_ID_OFFSET, "Mutation 3", 16, SC2Race.ZERG, parent_item=ItemNames.BROOD_QUEEN, + origin={"ext"}), + + ItemNames.ZERGLING_RAPTOR_STRAIN: + ItemData(300 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 0, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"hots"}, + description="Allows Zerglings to jump up and down cliffs and leap onto enemies. Also increases Zergling attack damage by 2."), + ItemNames.ZERGLING_SWARMLING_STRAIN: + ItemData(301 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 1, SC2Race.ZERG, parent_item=ItemNames.ZERGLING, + origin={"hots"}, + description="Zerglings will spawn instantly and with an extra Zergling per egg at no additional cost."), + ItemNames.ROACH_VILE_STRAIN: + ItemData(302 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 2, SC2Race.ZERG, parent_item=ItemNames.ROACH, origin={"hots"}, + description="Roach attacks will slow the movement and attack speed of enemies."), + ItemNames.ROACH_CORPSER_STRAIN: + ItemData(303 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 3, SC2Race.ZERG, parent_item=ItemNames.ROACH, origin={"hots"}, + description="Units killed after being attacked by Roaches will spawn 2 Roachlings."), + ItemNames.HYDRALISK_IMPALER_ASPECT: + ItemData(304 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 0, SC2Race.ZERG, origin={"hots"}, + classification=ItemClassification.progression, + description="Allows Hydralisks to morph into Impalers."), + ItemNames.HYDRALISK_LURKER_ASPECT: + ItemData(305 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 1, SC2Race.ZERG, origin={"hots"}, + classification=ItemClassification.progression, description="Allows Hydralisks to morph into Lurkers."), + ItemNames.BANELING_SPLITTER_STRAIN: + ItemData(306 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 6, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"hots"}, + description="Banelings will split into two smaller Splitterlings on exploding."), + ItemNames.BANELING_HUNTER_STRAIN: + ItemData(307 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 7, SC2Race.ZERG, + parent_item=ItemNames.ZERGLING_BANELING_ASPECT, origin={"hots"}, + description="Allows Banelings to jump up and down cliffs and leap onto enemies."), + ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT: + ItemData(308 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 2, SC2Race.ZERG, origin={"hots"}, + classification=ItemClassification.progression, + description="Allows Mutalisks and Corruptors to morph into Brood Lords."), + ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT: + ItemData(309 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 3, SC2Race.ZERG, origin={"hots"}, + classification=ItemClassification.progression, + description="Allows Mutalisks and Corruptors to morph into Vipers."), + ItemNames.SWARM_HOST_CARRION_STRAIN: + ItemData(310 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 10, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"hots"}, description="Swarm Hosts will spawn Flying Locusts."), + ItemNames.SWARM_HOST_CREEPER_STRAIN: + ItemData(311 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 11, SC2Race.ZERG, parent_item=ItemNames.SWARM_HOST, + origin={"hots"}, classification=ItemClassification.filler, + description="Allows Swarm Hosts to teleport to any creep on the map in vision. Swarm Hosts will spread creep around them when rooted or burrowed."), + ItemNames.ULTRALISK_NOXIOUS_STRAIN: + ItemData(312 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 12, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"hots"}, classification=ItemClassification.filler, + description="Ultralisks will periodically spread poison, damaging nearby biological enemies."), + ItemNames.ULTRALISK_TORRASQUE_STRAIN: + ItemData(313 + SC2HOTS_ITEM_ID_OFFSET, "Strain", 13, SC2Race.ZERG, parent_item=ItemNames.ULTRALISK, + origin={"hots"}, description="Ultralisks will revive after being killed."), + + ItemNames.KERRIGAN_KINETIC_BLAST: ItemData(400 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 0, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_HEROIC_FORTITUDE: ItemData(401 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 1, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEAPING_STRIKE: ItemData(402 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 2, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_CRUSHING_GRIP: ItemData(403 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 3, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_CHAIN_REACTION: ItemData(404 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 4, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_PSIONIC_SHIFT: ItemData(405 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 5, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_ZERGLING_RECONSTITUTION: ItemData(406 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 0, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.filler), + ItemNames.KERRIGAN_IMPROVED_OVERLORDS: ItemData(407 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 1, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_AUTOMATED_EXTRACTORS: ItemData(408 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 2, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_WILD_MUTATION: ItemData(409 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 6, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_SPAWN_BANELINGS: ItemData(410 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 7, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_MEND: ItemData(411 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 8, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_TWIN_DRONES: ItemData(412 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 3, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_MALIGNANT_CREEP: ItemData(413 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 4, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_VESPENE_EFFICIENCY: ItemData(414 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 5, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_INFEST_BROODLINGS: ItemData(415 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 9, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_FURY: ItemData(416 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 10, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_ABILITY_EFFICIENCY: ItemData(417 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 11, SC2Race.ZERG, origin={"hots"}), + ItemNames.KERRIGAN_APOCALYPSE: ItemData(418 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 12, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_SPAWN_LEVIATHAN: ItemData(419 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 13, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + ItemNames.KERRIGAN_DROP_PODS: ItemData(420 + SC2HOTS_ITEM_ID_OFFSET, "Ability", 14, SC2Race.ZERG, origin={"hots"}, classification=ItemClassification.progression), + # Handled separately from other abilities + ItemNames.KERRIGAN_PRIMAL_FORM: ItemData(421 + SC2HOTS_ITEM_ID_OFFSET, "Primal Form", 0, SC2Race.ZERG, origin={"hots"}), + + ItemNames.KERRIGAN_LEVELS_10: ItemData(500 + SC2HOTS_ITEM_ID_OFFSET, "Level", 10, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_9: ItemData(501 + SC2HOTS_ITEM_ID_OFFSET, "Level", 9, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_8: ItemData(502 + SC2HOTS_ITEM_ID_OFFSET, "Level", 8, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_7: ItemData(503 + SC2HOTS_ITEM_ID_OFFSET, "Level", 7, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_6: ItemData(504 + SC2HOTS_ITEM_ID_OFFSET, "Level", 6, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_5: ItemData(505 + SC2HOTS_ITEM_ID_OFFSET, "Level", 5, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_4: ItemData(506 + SC2HOTS_ITEM_ID_OFFSET, "Level", 4, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression_skip_balancing), + ItemNames.KERRIGAN_LEVELS_3: ItemData(507 + SC2HOTS_ITEM_ID_OFFSET, "Level", 3, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression_skip_balancing), + ItemNames.KERRIGAN_LEVELS_2: ItemData(508 + SC2HOTS_ITEM_ID_OFFSET, "Level", 2, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression_skip_balancing), + ItemNames.KERRIGAN_LEVELS_1: ItemData(509 + SC2HOTS_ITEM_ID_OFFSET, "Level", 1, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression_skip_balancing), + ItemNames.KERRIGAN_LEVELS_14: ItemData(510 + SC2HOTS_ITEM_ID_OFFSET, "Level", 14, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_35: ItemData(511 + SC2HOTS_ITEM_ID_OFFSET, "Level", 35, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + ItemNames.KERRIGAN_LEVELS_70: ItemData(512 + SC2HOTS_ITEM_ID_OFFSET, "Level", 70, SC2Race.ZERG, origin={"hots"}, quantity=0, classification=ItemClassification.progression), + + # Zerg Mercs + ItemNames.INFESTED_MEDICS: ItemData(600 + SC2HOTS_ITEM_ID_OFFSET, "Mercenary", 0, SC2Race.ZERG, origin={"ext"}), + ItemNames.INFESTED_SIEGE_TANKS: ItemData(601 + SC2HOTS_ITEM_ID_OFFSET, "Mercenary", 1, SC2Race.ZERG, origin={"ext"}), + ItemNames.INFESTED_BANSHEES: ItemData(602 + SC2HOTS_ITEM_ID_OFFSET, "Mercenary", 2, SC2Race.ZERG, origin={"ext"}), + + # Misc Upgrades + ItemNames.OVERLORD_VENTRAL_SACS: ItemData(700 + SC2HOTS_ITEM_ID_OFFSET, "Evolution Pit", 6, SC2Race.ZERG, origin={"bw"}), + + # Morphs + ItemNames.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT: ItemData(800 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 6, SC2Race.ZERG, origin={"bw"}), + ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT: ItemData(801 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 7, SC2Race.ZERG, origin={"bw"}), + ItemNames.ROACH_RAVAGER_ASPECT: ItemData(802 + SC2HOTS_ITEM_ID_OFFSET, "Morph", 8, SC2Race.ZERG, origin={"ext"}), + + + # Protoss Units (those that aren't as items in WoL (Prophecy)) + ItemNames.OBSERVER: ItemData(0 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 9, SC2Race.PROTOSS, + classification=ItemClassification.filler, origin={"wol"}, + description="Flying spy. Cloak renders the unit invisible to enemies without detection."), + ItemNames.CENTURION: ItemData(1 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 10, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Powerful melee warrior. Has the Shadow Charge and Darkcoil abilities."), + ItemNames.SENTINEL: ItemData(2 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 11, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Powerful melee warrior. Has the Charge and Reconstruction abilities."), + ItemNames.SUPPLICANT: ItemData(3 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 12, SC2Race.PROTOSS, + classification=ItemClassification.filler, important_for_filtering=True, origin={"ext"}, + description="Powerful melee warrior. Has powerful damage resistant shields."), + ItemNames.INSTIGATOR: ItemData(4 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 13, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Ranged support strider. Can store multiple Blink charges."), + ItemNames.SLAYER: ItemData(5 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 14, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Ranged attack strider. Can use the Phase Blink and Phasing Armor abilities."), + ItemNames.SENTRY: ItemData(6 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 15, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Robotic support unit can use the Guardian Shield ability and restore the shields of nearby Protoss units."), + ItemNames.ENERGIZER: ItemData(7 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 16, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Robotic support unit. Can use the Chrono Beam ability and become stationary to power nearby structures."), + ItemNames.HAVOC: ItemData(8 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 17, SC2Race.PROTOSS, + origin={"lotv"}, important_for_filtering=True, + description="Robotic support unit. Can use the Target Lock and Force Field abilities and increase the range of nearby Protoss units."), + ItemNames.SIGNIFIER: ItemData(9 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 18, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Potent permanently cloaked psionic master. Can use the Feedback and Crippling Psionic Storm abilities. Can merge into an Archon."), + ItemNames.ASCENDANT: ItemData(10 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 19, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Potent psionic master. Can use the Psionic Orb, Mind Blast, and Sacrifice abilities."), + ItemNames.AVENGER: ItemData(11 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 20, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Deadly warrior-assassin. Permanently cloaked. Recalls to the nearest Dark Shrine upon death."), + ItemNames.BLOOD_HUNTER: ItemData(12 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 21, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Deadly warrior-assassin. Permanently cloaked. Can use the Void Stasis ability."), + ItemNames.DRAGOON: ItemData(13 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 22, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Ranged assault strider. Has enhanced health and damage."), + ItemNames.DARK_ARCHON: ItemData(14 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 23, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Potent psionic master. Can use the Confuse and Mind Control abilities."), + ItemNames.ADEPT: ItemData(15 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 24, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Ranged specialist. Can use the Psionic Transfer ability."), + ItemNames.WARP_PRISM: ItemData(16 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 25, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Flying transport. Can carry units and become stationary to deploy a power field."), + ItemNames.ANNIHILATOR: ItemData(17 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 26, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Assault Strider. Can use the Shadow Cannon ability to damage air and ground units."), + ItemNames.VANGUARD: ItemData(18 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 27, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Assault Strider. Deals splash damage around the primary target."), + ItemNames.WRATHWALKER: ItemData(19 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 28, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Battle strider with a powerful single target attack. Can walk up and down cliffs."), + ItemNames.REAVER: ItemData(20 + SC2LOTV_ITEM_ID_OFFSET, "Unit", 29, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Area damage siege unit. Builds and launches explosive Scarabs for high burst damage."), + ItemNames.DISRUPTOR: ItemData(21 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 0, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Robotic disruption unit. Can use the Purification Nova ability to deal heavy area damage."), + ItemNames.MIRAGE: ItemData(22 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 1, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities."), + ItemNames.CORSAIR: ItemData(23 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 2, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Air superiority starfighter. Can use the Disruption Web ability."), + ItemNames.DESTROYER: ItemData(24 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 3, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Area assault craft. Can use the Destruction Beam ability to attack multiple units at once."), + ItemNames.SCOUT: ItemData(25 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 4, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Versatile high-speed fighter."), + ItemNames.TEMPEST: ItemData(26 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 5, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Siege artillery craft. Attacks from long range. Can use the Disintegration ability."), + ItemNames.MOTHERSHIP: ItemData(27 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 6, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Ultimate Protoss vessel, Can use the Vortex and Mass Recall abilities. Cloaks nearby units and structures."), + ItemNames.ARBITER: ItemData(28 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 7, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="Army support craft. Has the Stasis Field and Recall abilities. Cloaks nearby units."), + ItemNames.ORACLE: ItemData(29 + SC2LOTV_ITEM_ID_OFFSET, "Unit 2", 8, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, + description="Flying caster. Can use the Revelation and Stasis Ward abilities."), + + # Protoss Upgrades + ItemNames.PROGRESSIVE_PROTOSS_GROUND_WEAPON: ItemData(100 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 0, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_GROUND_ARMOR: ItemData(101 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 2, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_SHIELDS: ItemData(102 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 4, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_AIR_WEAPON: ItemData(103 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 6, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_AIR_ARMOR: ItemData(104 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 8, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + # Upgrade bundle 'number' values are used as indices to get affected 'number's + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_UPGRADE: ItemData(105 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 11, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_ARMOR_UPGRADE: ItemData(106 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 12, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_GROUND_UPGRADE: ItemData(107 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 13, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_AIR_UPGRADE: ItemData(108 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 14, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_ARMOR_UPGRADE: ItemData(109 + SC2LOTV_ITEM_ID_OFFSET, "Upgrade", 15, SC2Race.PROTOSS, quantity=3, origin={"wol", "lotv"}), + + # Protoss Buildings + ItemNames.PHOTON_CANNON: ItemData(200 + SC2LOTV_ITEM_ID_OFFSET, "Building", 0, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"wol", "lotv"}), + ItemNames.KHAYDARIN_MONOLITH: ItemData(201 + SC2LOTV_ITEM_ID_OFFSET, "Building", 1, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"lotv"}), + ItemNames.SHIELD_BATTERY: ItemData(202 + SC2LOTV_ITEM_ID_OFFSET, "Building", 2, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"lotv"}), + + # Protoss Unit Upgrades + ItemNames.SUPPLICANT_BLOOD_SHIELD: ItemData(300 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 0, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.SUPPLICANT), + ItemNames.SUPPLICANT_SOUL_AUGMENTATION: ItemData(301 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 1, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.SUPPLICANT), + ItemNames.SUPPLICANT_SHIELD_REGENERATION: ItemData(302 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 2, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.SUPPLICANT), + ItemNames.ADEPT_SHOCKWAVE: ItemData(303 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 3, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ADEPT), + ItemNames.ADEPT_RESONATING_GLAIVES: ItemData(304 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 4, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ADEPT), + ItemNames.ADEPT_PHASE_BULWARK: ItemData(305 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 5, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ADEPT), + ItemNames.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES: ItemData(306 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 6, SC2Race.PROTOSS, origin={"ext"}, classification=ItemClassification.progression), + ItemNames.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION: ItemData(307 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 7, SC2Race.PROTOSS, origin={"ext"}, classification=ItemClassification.progression), + ItemNames.DRAGOON_HIGH_IMPACT_PHASE_DISRUPTORS: ItemData(308 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 8, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.DRAGOON), + ItemNames.DRAGOON_TRILLIC_COMPRESSION_SYSTEM: ItemData(309 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 9, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.DRAGOON), + ItemNames.DRAGOON_SINGULARITY_CHARGE: ItemData(310 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 10, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.DRAGOON), + ItemNames.DRAGOON_ENHANCED_STRIDER_SERVOS: ItemData(311 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 11, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.DRAGOON), + ItemNames.SCOUT_COMBAT_SENSOR_ARRAY: ItemData(312 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 12, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.SCOUT), + ItemNames.SCOUT_APIAL_SENSORS: ItemData(313 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 13, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.SCOUT), + ItemNames.SCOUT_GRAVITIC_THRUSTERS: ItemData(314 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 14, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.SCOUT), + ItemNames.SCOUT_ADVANCED_PHOTON_BLASTERS: ItemData(315 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 15, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.SCOUT), + ItemNames.TEMPEST_TECTONIC_DESTABILIZERS: ItemData(316 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 16, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.TEMPEST), + ItemNames.TEMPEST_QUANTIC_REACTOR: ItemData(317 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 17, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.TEMPEST), + ItemNames.TEMPEST_GRAVITY_SLING: ItemData(318 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 18, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.TEMPEST), + ItemNames.PHOENIX_MIRAGE_IONIC_WAVELENGTH_FLUX: ItemData(319 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 19, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.PHOENIX_MIRAGE_ANION_PULSE_CRYSTALS: ItemData(320 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 20, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.CORSAIR_STEALTH_DRIVE: ItemData(321 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 21, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.CORSAIR), + ItemNames.CORSAIR_ARGUS_JEWEL: ItemData(322 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 22, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.CORSAIR), + ItemNames.CORSAIR_SUSTAINING_DISRUPTION: ItemData(323 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 23, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.CORSAIR), + ItemNames.CORSAIR_NEUTRON_SHIELDS: ItemData(324 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 24, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.CORSAIR), + ItemNames.ORACLE_STEALTH_DRIVE: ItemData(325 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 25, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ORACLE), + ItemNames.ORACLE_STASIS_CALIBRATION: ItemData(326 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 26, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ORACLE), + ItemNames.ORACLE_TEMPORAL_ACCELERATION_BEAM: ItemData(327 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 27, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ORACLE), + ItemNames.ARBITER_CHRONOSTATIC_REINFORCEMENT: ItemData(328 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 28, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.ARBITER), + ItemNames.ARBITER_KHAYDARIN_CORE: ItemData(329 + SC2LOTV_ITEM_ID_OFFSET, "Forge 1", 29, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.ARBITER), + ItemNames.ARBITER_SPACETIME_ANCHOR: ItemData(330 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 0, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.ARBITER), + ItemNames.ARBITER_RESOURCE_EFFICIENCY: ItemData(331 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 1, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.ARBITER), + ItemNames.ARBITER_ENHANCED_CLOAK_FIELD: ItemData(332 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 2, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.ARBITER), + ItemNames.CARRIER_GRAVITON_CATAPULT: + ItemData(333 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 3, SC2Race.PROTOSS, origin={"wol"}, + parent_item=ItemNames.CARRIER, + description="Carriers can launch Interceptors more quickly."), + ItemNames.CARRIER_HULL_OF_PAST_GLORIES: + ItemData(334 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 4, SC2Race.PROTOSS, origin={"bw"}, + parent_item=ItemNames.CARRIER, + description="Carriers gain +2 armour."), + ItemNames.VOID_RAY_DESTROYER_FLUX_VANES: + ItemData(335 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 5, SC2Race.PROTOSS, classification=ItemClassification.filler, + origin={"ext"}, + description="Increases Void Ray and Destroyer movement speed."), + ItemNames.DESTROYER_REFORGED_BLOODSHARD_CORE: + ItemData(336 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 6, SC2Race.PROTOSS, origin={"ext"}, + parent_item=ItemNames.DESTROYER, + description="When fully charged, the Destroyer's Destruction Beam weapon does full damage to secondary targets."), + ItemNames.WARP_PRISM_GRAVITIC_DRIVE: + ItemData(337 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 7, SC2Race.PROTOSS, classification=ItemClassification.filler, + origin={"ext"}, parent_item=ItemNames.WARP_PRISM, + description="Increases the movement speed of Warp Prisms."), + ItemNames.WARP_PRISM_PHASE_BLASTER: + ItemData(338 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 8, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"ext"}, parent_item=ItemNames.WARP_PRISM, + description="Equips Warp Prisms with an auto-attack that can hit ground and air targets."), + ItemNames.WARP_PRISM_WAR_CONFIGURATION: ItemData(339 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 9, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.WARP_PRISM), + ItemNames.OBSERVER_GRAVITIC_BOOSTERS: ItemData(340 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 10, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.OBSERVER), + ItemNames.OBSERVER_SENSOR_ARRAY: ItemData(341 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 11, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.OBSERVER), + ItemNames.REAVER_SCARAB_DAMAGE: ItemData(342 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 12, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.REAVER), + ItemNames.REAVER_SOLARITE_PAYLOAD: ItemData(343 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 13, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.REAVER), + ItemNames.REAVER_REAVER_CAPACITY: ItemData(344 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 14, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}, parent_item=ItemNames.REAVER), + ItemNames.REAVER_RESOURCE_EFFICIENCY: ItemData(345 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 15, SC2Race.PROTOSS, origin={"bw"}, parent_item=ItemNames.REAVER), + ItemNames.VANGUARD_AGONY_LAUNCHERS: ItemData(346 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 16, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.VANGUARD), + ItemNames.VANGUARD_MATTER_DISPERSION: ItemData(347 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 17, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.VANGUARD), + ItemNames.IMMORTAL_ANNIHILATOR_SINGULARITY_CHARGE: ItemData(348 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 18, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.IMMORTAL_ANNIHILATOR_ADVANCED_TARGETING_MECHANICS: ItemData(349 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 19, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"ext"}), + ItemNames.COLOSSUS_PACIFICATION_PROTOCOL: ItemData(350 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 20, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.COLOSSUS), + ItemNames.WRATHWALKER_RAPID_POWER_CYCLING: ItemData(351 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 21, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.WRATHWALKER), + ItemNames.WRATHWALKER_EYE_OF_WRATH: ItemData(352 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 22, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.WRATHWALKER), + ItemNames.DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_SHROUD_OF_ADUN: ItemData(353 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 23, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_SHADOW_GUARD_TRAINING: ItemData(354 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 24, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_BLINK: ItemData(355 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 25, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"ext"}), + ItemNames.DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_RESOURCE_EFFICIENCY: ItemData(356 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 26, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.DARK_TEMPLAR_DARK_ARCHON_MELD: ItemData(357 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 27, SC2Race.PROTOSS, origin={"bw"}, important_for_filtering=True ,parent_item=ItemNames.DARK_TEMPLAR), + ItemNames.HIGH_TEMPLAR_SIGNIFIER_UNSHACKLED_PSIONIC_STORM: ItemData(358 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 28, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.HIGH_TEMPLAR_SIGNIFIER_HALLUCINATION: ItemData(359 + SC2LOTV_ITEM_ID_OFFSET, "Forge 2", 29, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"bw"}), + ItemNames.HIGH_TEMPLAR_SIGNIFIER_KHAYDARIN_AMULET: ItemData(360 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 0, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.ARCHON_HIGH_ARCHON: ItemData(361 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 1, SC2Race.PROTOSS, origin={"ext"}, important_for_filtering=True), + ItemNames.DARK_ARCHON_FEEDBACK: ItemData(362 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 2, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.DARK_ARCHON_MAELSTROM: ItemData(363 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 3, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.DARK_ARCHON_ARGUS_TALISMAN: ItemData(364 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 4, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.ASCENDANT_POWER_OVERWHELMING: ItemData(365 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 5, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ASCENDANT), + ItemNames.ASCENDANT_CHAOTIC_ATTUNEMENT: ItemData(366 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 6, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ASCENDANT), + ItemNames.ASCENDANT_BLOOD_AMULET: ItemData(367 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 7, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ASCENDANT), + ItemNames.SENTRY_ENERGIZER_HAVOC_CLOAKING_MODULE: ItemData(368 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 8, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.SENTRY_ENERGIZER_HAVOC_SHIELD_BATTERY_RAPID_RECHARGING: ItemData(369 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 9, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.SENTRY_FORCE_FIELD: ItemData(370 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 10, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.SENTRY), + ItemNames.SENTRY_HALLUCINATION: ItemData(371 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 11, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}, parent_item=ItemNames.SENTRY), + ItemNames.ENERGIZER_RECLAMATION: ItemData(372 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 12, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ENERGIZER), + ItemNames.ENERGIZER_FORGED_CHASSIS: ItemData(373 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 13, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.ENERGIZER), + ItemNames.HAVOC_DETECT_WEAKNESS: ItemData(374 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 14, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.HAVOC), + ItemNames.HAVOC_BLOODSHARD_RESONANCE: ItemData(375 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 15, SC2Race.PROTOSS, origin={"ext"}, parent_item=ItemNames.HAVOC), + ItemNames.ZEALOT_SENTINEL_CENTURION_LEG_ENHANCEMENTS: ItemData(376 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 16, SC2Race.PROTOSS, origin={"bw"}), + ItemNames.ZEALOT_SENTINEL_CENTURION_SHIELD_CAPACITY: ItemData(377 + SC2LOTV_ITEM_ID_OFFSET, "Forge 3", 17, SC2Race.PROTOSS, origin={"bw"}), + + # SoA Calldown powers + ItemNames.SOA_CHRONO_SURGE: ItemData(700 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 0, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_PROGRESSIVE_PROXY_PYLON: ItemData(701 + SC2LOTV_ITEM_ID_OFFSET, "Progressive Upgrade", 0, SC2Race.PROTOSS, origin={"lotv"}, quantity=2), + ItemNames.SOA_PYLON_OVERCHARGE: ItemData(702 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 1, SC2Race.PROTOSS, origin={"ext"}), + ItemNames.SOA_ORBITAL_STRIKE: ItemData(703 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 2, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_TEMPORAL_FIELD: ItemData(704 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 3, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_SOLAR_LANCE: ItemData(705 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 4, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"lotv"}), + ItemNames.SOA_MASS_RECALL: ItemData(706 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 5, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_SHIELD_OVERCHARGE: ItemData(707 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 6, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_DEPLOY_FENIX: ItemData(708 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 7, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"lotv"}), + ItemNames.SOA_PURIFIER_BEAM: ItemData(709 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 8, SC2Race.PROTOSS, origin={"lotv"}), + ItemNames.SOA_TIME_STOP: ItemData(710 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 9, SC2Race.PROTOSS, classification=ItemClassification.progression, origin={"lotv"}), + ItemNames.SOA_SOLAR_BOMBARDMENT: ItemData(711 + SC2LOTV_ITEM_ID_OFFSET, "Spear of Adun", 10, SC2Race.PROTOSS, origin={"lotv"}), + + # Generic Protoss Upgrades + ItemNames.MATRIX_OVERLOAD: + ItemData(800 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 0, SC2Race.PROTOSS, origin={"lotv"}, + description=r"All friendly units gain 25% movement speed and 15% attack speed within a Pylon's power field and for 15 seconds after leaving it."), + ItemNames.QUATRO: + ItemData(801 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 1, SC2Race.PROTOSS, origin={"ext"}, + description="All friendly Protoss units gain the equivalent of their +1 armour, attack, and shield upgrades."), + ItemNames.NEXUS_OVERCHARGE: + ItemData(802 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 2, SC2Race.PROTOSS, origin={"lotv"}, + important_for_filtering=True, description="The Protoss Nexus gains a long-range auto-attack."), + ItemNames.ORBITAL_ASSIMILATORS: + ItemData(803 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 3, SC2Race.PROTOSS, origin={"lotv"}, + description="Assimilators automatically harvest Vespene Gas without the need for Probes."), + ItemNames.WARP_HARMONIZATION: + ItemData(804 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 4, SC2Race.PROTOSS, origin={"lotv"}, + description=r"Stargates and Robotics Facilities can transform to utilize Warp In technology. Warp In cooldowns are 20% faster than original build times."), + ItemNames.GUARDIAN_SHELL: + ItemData(805 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 5, SC2Race.PROTOSS, origin={"lotv"}, + description="The Spear of Adun passively shields friendly Protoss units before death, making them invulnerable for 5 seconds. Each unit can only be shielded once every 60 seconds."), + ItemNames.RECONSTRUCTION_BEAM: + ItemData(806 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 6, SC2Race.PROTOSS, + classification=ItemClassification.progression, origin={"lotv"}, + description="The Spear of Adun will passively heal mechanical units for 5 and non-biological structures for 10 life per second. Up to 3 targets can be repaired at once."), + ItemNames.OVERWATCH: + ItemData(807 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 7, SC2Race.PROTOSS, origin={"ext"}, + description="Once per second, the Spear of Adun will last-hit a damaged enemy unit that is below 50 health."), + ItemNames.SUPERIOR_WARP_GATES: + ItemData(808 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 8, SC2Race.PROTOSS, origin={"ext"}, + description="Protoss Warp Gates can hold up to 3 charges of unit warp-ins."), + ItemNames.ENHANCED_TARGETING: + ItemData(809 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 9, SC2Race.PROTOSS, origin={"ext"}, + description="Protoss defensive structures gain +2 range."), + ItemNames.OPTIMIZED_ORDNANCE: + ItemData(810 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 10, SC2Race.PROTOSS, origin={"ext"}, + description="Increases the attack speed of Protoss defensive structures by 25%."), + ItemNames.KHALAI_INGENUITY: + ItemData(811 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 11, SC2Race.PROTOSS, origin={"ext"}, + description="Pylons, Photon Cannons, Monoliths, and Shield Batteries warp in near-instantly."), + ItemNames.AMPLIFIED_ASSIMILATORS: + ItemData(812 + SC2LOTV_ITEM_ID_OFFSET, "Solarite Core", 12, SC2Race.PROTOSS, origin={"ext"}, + description=r"Assimilators produce Vespene gas 25% faster."), +} + + +def get_item_table(): + return item_table + + +basic_units = { + SC2Race.TERRAN: { + ItemNames.MARINE, + ItemNames.MARAUDER, + ItemNames.GOLIATH, + ItemNames.HELLION, + ItemNames.VULTURE, + ItemNames.WARHOUND, + }, + SC2Race.ZERG: { + ItemNames.ZERGLING, + ItemNames.SWARM_QUEEN, + ItemNames.ROACH, + ItemNames.HYDRALISK, + }, + SC2Race.PROTOSS: { + ItemNames.ZEALOT, + ItemNames.CENTURION, + ItemNames.SENTINEL, + ItemNames.STALKER, + ItemNames.INSTIGATOR, + ItemNames.SLAYER, + ItemNames.DRAGOON, + ItemNames.ADEPT, + } +} + +advanced_basic_units = { + SC2Race.TERRAN: basic_units[SC2Race.TERRAN].union({ + ItemNames.REAPER, + ItemNames.DIAMONDBACK, + ItemNames.VIKING, + ItemNames.SIEGE_TANK, + ItemNames.BANSHEE, + ItemNames.THOR, + ItemNames.BATTLECRUISER, + ItemNames.CYCLONE + }), + SC2Race.ZERG: basic_units[SC2Race.ZERG].union({ + ItemNames.INFESTOR, + ItemNames.ABERRATION, + }), + SC2Race.PROTOSS: basic_units[SC2Race.PROTOSS].union({ + ItemNames.DARK_TEMPLAR, + ItemNames.BLOOD_HUNTER, + ItemNames.AVENGER, + ItemNames.IMMORTAL, + ItemNames.ANNIHILATOR, + ItemNames.VANGUARD, + }) +} + +no_logic_starting_units = { + SC2Race.TERRAN: advanced_basic_units[SC2Race.TERRAN].union({ + ItemNames.FIREBAT, + ItemNames.GHOST, + ItemNames.SPECTRE, + ItemNames.WRAITH, + ItemNames.RAVEN, + ItemNames.PREDATOR, + ItemNames.LIBERATOR, + ItemNames.HERC, + }), + SC2Race.ZERG: advanced_basic_units[SC2Race.ZERG].union({ + ItemNames.ULTRALISK, + ItemNames.SWARM_HOST + }), + SC2Race.PROTOSS: advanced_basic_units[SC2Race.PROTOSS].union({ + ItemNames.CARRIER, + ItemNames.TEMPEST, + ItemNames.VOID_RAY, + ItemNames.DESTROYER, + ItemNames.COLOSSUS, + ItemNames.WRATHWALKER, + ItemNames.SCOUT, + ItemNames.HIGH_TEMPLAR, + ItemNames.SIGNIFIER, + ItemNames.ASCENDANT, + ItemNames.DARK_ARCHON, + ItemNames.SUPPLICANT, + }) +} + +not_balanced_starting_units = { + ItemNames.SIEGE_TANK, + ItemNames.THOR, + ItemNames.BANSHEE, + ItemNames.BATTLECRUISER, + ItemNames.ULTRALISK, + ItemNames.CARRIER, + ItemNames.TEMPEST, +} + + +def get_basic_units(world: World, race: SC2Race) -> typing.Set[str]: + logic_level = get_option_value(world, 'required_tactics') + if logic_level == RequiredTactics.option_no_logic: + return no_logic_starting_units[race] + elif logic_level == RequiredTactics.option_advanced: + return advanced_basic_units[race] + else: + return basic_units[race] + + +# Items that can be placed before resources if not already in +# General upgrades and Mercs +second_pass_placeable_items: typing.Tuple[str, ...] = ( + # Global weapon/armor upgrades + ItemNames.PROGRESSIVE_TERRAN_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_TERRAN_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_TERRAN_WEAPON_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_WEAPON_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_SHIELDS, + # Terran Buildings without upgrades + ItemNames.SENSOR_TOWER, + ItemNames.HIVE_MIND_EMULATOR, + ItemNames.PSI_DISRUPTER, + ItemNames.PERDITION_TURRET, + # Terran units without upgrades + ItemNames.HERC, + ItemNames.WARHOUND, + # General Terran upgrades without any dependencies + ItemNames.SCV_ADVANCED_CONSTRUCTION, + ItemNames.SCV_DUAL_FUSION_WELDERS, + ItemNames.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM, + ItemNames.PROGRESSIVE_ORBITAL_COMMAND, + ItemNames.ULTRA_CAPACITORS, + ItemNames.VANADIUM_PLATING, + ItemNames.ORBITAL_DEPOTS, + ItemNames.MICRO_FILTERING, + ItemNames.AUTOMATED_REFINERY, + ItemNames.COMMAND_CENTER_REACTOR, + ItemNames.TECH_REACTOR, + ItemNames.CELLULAR_REACTOR, + ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL, # Place only L1 + ItemNames.STRUCTURE_ARMOR, + ItemNames.HI_SEC_AUTO_TRACKING, + ItemNames.ADVANCED_OPTICS, + ItemNames.ROGUE_FORCES, + # Mercenaries (All races) + *[item_name for item_name, item_data in get_full_item_list().items() + if item_data.type == "Mercenary"], + # Kerrigan and Nova levels, abilities and generally useful stuff + *[item_name for item_name, item_data in get_full_item_list().items() + if item_data.type in ("Level", "Ability", "Evolution Pit", "Nova Gear")], + ItemNames.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE, + # Zerg static defenses + ItemNames.SPORE_CRAWLER, + ItemNames.SPINE_CRAWLER, + # Defiler, Aberration (no upgrades) + ItemNames.DEFILER, + ItemNames.ABERRATION, + # Spear of Adun Abilities + ItemNames.SOA_CHRONO_SURGE, + ItemNames.SOA_PROGRESSIVE_PROXY_PYLON, + ItemNames.SOA_PYLON_OVERCHARGE, + ItemNames.SOA_ORBITAL_STRIKE, + ItemNames.SOA_TEMPORAL_FIELD, + ItemNames.SOA_SOLAR_LANCE, + ItemNames.SOA_MASS_RECALL, + ItemNames.SOA_SHIELD_OVERCHARGE, + ItemNames.SOA_DEPLOY_FENIX, + ItemNames.SOA_PURIFIER_BEAM, + ItemNames.SOA_TIME_STOP, + ItemNames.SOA_SOLAR_BOMBARDMENT, + # Protoss generic upgrades + ItemNames.MATRIX_OVERLOAD, + ItemNames.QUATRO, + ItemNames.NEXUS_OVERCHARGE, + ItemNames.ORBITAL_ASSIMILATORS, + ItemNames.WARP_HARMONIZATION, + ItemNames.GUARDIAN_SHELL, + ItemNames.RECONSTRUCTION_BEAM, + ItemNames.OVERWATCH, + ItemNames.SUPERIOR_WARP_GATES, + ItemNames.KHALAI_INGENUITY, + ItemNames.AMPLIFIED_ASSIMILATORS, + # Protoss static defenses + ItemNames.PHOTON_CANNON, + ItemNames.KHAYDARIN_MONOLITH, + ItemNames.SHIELD_BATTERY +) + + +filler_items: typing.Tuple[str, ...] = ( + ItemNames.STARTING_MINERALS, + ItemNames.STARTING_VESPENE, + ItemNames.STARTING_SUPPLY, +) + +# Defense rating table +# Commented defense ratings are handled in LogicMixin +defense_ratings = { + ItemNames.SIEGE_TANK: 5, + # "Maelstrom Rounds": 2, + ItemNames.PLANETARY_FORTRESS: 3, + # Bunker w/ Marine/Marauder: 3, + ItemNames.PERDITION_TURRET: 2, + ItemNames.VULTURE: 1, + ItemNames.BANSHEE: 1, + ItemNames.BATTLECRUISER: 1, + ItemNames.LIBERATOR: 4, + ItemNames.WIDOW_MINE: 1, + # "Concealment (Widow Mine)": 1 +} +zerg_defense_ratings = { + ItemNames.PERDITION_TURRET: 2, + # Bunker w/ Firebat: 2, + ItemNames.LIBERATOR: -2, + ItemNames.HIVE_MIND_EMULATOR: 3, + ItemNames.PSI_DISRUPTER: 3, +} +air_defense_ratings = { + ItemNames.MISSILE_TURRET: 2, +} + +kerrigan_levels = [item_name for item_name, item_data in get_full_item_list().items() + if item_data.type == "Level" and item_data.race == SC2Race.ZERG] + +spider_mine_sources = { + ItemNames.VULTURE, + ItemNames.REAPER_SPIDER_MINES, + ItemNames.SIEGE_TANK_SPIDER_MINES, + ItemNames.RAVEN_SPIDER_MINES, +} + +progressive_if_nco = { + ItemNames.MARINE_PROGRESSIVE_STIMPACK, + ItemNames.FIREBAT_PROGRESSIVE_STIMPACK, + ItemNames.BANSHEE_PROGRESSIVE_CROSS_SPECTRUM_DAMPENERS, + ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL, +} + +progressive_if_ext = { + ItemNames.VULTURE_PROGRESSIVE_REPLENISHABLE_MAGAZINE, + ItemNames.WRAITH_PROGRESSIVE_TOMAHAWK_POWER_CELLS, + ItemNames.BATTLECRUISER_PROGRESSIVE_DEFENSIVE_MATRIX, + ItemNames.BATTLECRUISER_PROGRESSIVE_MISSILE_PODS, + ItemNames.THOR_PROGRESSIVE_IMMORTALITY_PROTOCOL, + ItemNames.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM, + ItemNames.DIAMONDBACK_PROGRESSIVE_TRI_LITHIUM_POWER_CELL +} + +kerrigan_actives: typing.List[typing.Set[str]] = [ + {ItemNames.KERRIGAN_KINETIC_BLAST, ItemNames.KERRIGAN_LEAPING_STRIKE}, + {ItemNames.KERRIGAN_CRUSHING_GRIP, ItemNames.KERRIGAN_PSIONIC_SHIFT}, + set(), + {ItemNames.KERRIGAN_WILD_MUTATION, ItemNames.KERRIGAN_SPAWN_BANELINGS, ItemNames.KERRIGAN_MEND}, + set(), + set(), + {ItemNames.KERRIGAN_APOCALYPSE, ItemNames.KERRIGAN_SPAWN_LEVIATHAN, ItemNames.KERRIGAN_DROP_PODS}, +] + +kerrigan_passives: typing.List[typing.Set[str]] = [ + {ItemNames.KERRIGAN_HEROIC_FORTITUDE}, + {ItemNames.KERRIGAN_CHAIN_REACTION}, + {ItemNames.KERRIGAN_ZERGLING_RECONSTITUTION, ItemNames.KERRIGAN_IMPROVED_OVERLORDS, ItemNames.KERRIGAN_AUTOMATED_EXTRACTORS}, + set(), + {ItemNames.KERRIGAN_TWIN_DRONES, ItemNames.KERRIGAN_MALIGNANT_CREEP, ItemNames.KERRIGAN_VESPENE_EFFICIENCY}, + {ItemNames.KERRIGAN_INFEST_BROODLINGS, ItemNames.KERRIGAN_FURY, ItemNames.KERRIGAN_ABILITY_EFFICIENCY}, + set(), +] + +kerrigan_only_passives = { + ItemNames.KERRIGAN_HEROIC_FORTITUDE, ItemNames.KERRIGAN_CHAIN_REACTION, + ItemNames.KERRIGAN_INFEST_BROODLINGS, ItemNames.KERRIGAN_FURY, ItemNames.KERRIGAN_ABILITY_EFFICIENCY, +} + +spear_of_adun_calldowns = { + ItemNames.SOA_CHRONO_SURGE, + ItemNames.SOA_PROGRESSIVE_PROXY_PYLON, + ItemNames.SOA_PYLON_OVERCHARGE, + ItemNames.SOA_ORBITAL_STRIKE, + ItemNames.SOA_TEMPORAL_FIELD, + ItemNames.SOA_SOLAR_LANCE, + ItemNames.SOA_MASS_RECALL, + ItemNames.SOA_SHIELD_OVERCHARGE, + ItemNames.SOA_DEPLOY_FENIX, + ItemNames.SOA_PURIFIER_BEAM, + ItemNames.SOA_TIME_STOP, + ItemNames.SOA_SOLAR_BOMBARDMENT +} + +spear_of_adun_castable_passives = { + ItemNames.RECONSTRUCTION_BEAM, + ItemNames.OVERWATCH, +} + +nova_equipment = { + *[item_name for item_name, item_data in get_full_item_list().items() + if item_data.type == "Nova Gear"], + ItemNames.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE +} + +# 'number' values of upgrades for upgrade bundle items +upgrade_numbers = [ + # Terran + {0, 4, 8}, # Weapon + {2, 6, 10}, # Armor + {0, 2}, # Infantry + {4, 6}, # Vehicle + {8, 10}, # Starship + {0, 2, 4, 6, 8, 10}, # All + # Zerg + {0, 2, 6}, # Weapon + {4, 8}, # Armor + {0, 2, 4}, # Ground + {6, 8}, # Flyer + {0, 2, 4, 6, 8}, # All + # Protoss + {0, 6}, # Weapon + {2, 4, 8}, # Armor + {0, 2}, # Ground, Shields are handled specially + {6, 8}, # Air, Shields are handled specially + {0, 2, 4, 6, 8}, # All +] +# 'upgrade_numbers' indices for all upgrades +upgrade_numbers_all = { + SC2Race.TERRAN: 5, + SC2Race.ZERG: 10, + SC2Race.PROTOSS: 15, +} + +# Names of upgrades to be included for different options +upgrade_included_names = [ + { # Individual Items + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_WEAPON, + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_ARMOR, + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_WEAPON, + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_ARMOR, + ItemNames.PROGRESSIVE_TERRAN_SHIP_WEAPON, + ItemNames.PROGRESSIVE_TERRAN_SHIP_ARMOR, + ItemNames.PROGRESSIVE_ZERG_MELEE_ATTACK, + ItemNames.PROGRESSIVE_ZERG_MISSILE_ATTACK, + ItemNames.PROGRESSIVE_ZERG_GROUND_CARAPACE, + ItemNames.PROGRESSIVE_ZERG_FLYER_ATTACK, + ItemNames.PROGRESSIVE_ZERG_FLYER_CARAPACE, + ItemNames.PROGRESSIVE_PROTOSS_GROUND_WEAPON, + ItemNames.PROGRESSIVE_PROTOSS_GROUND_ARMOR, + ItemNames.PROGRESSIVE_PROTOSS_SHIELDS, + ItemNames.PROGRESSIVE_PROTOSS_AIR_WEAPON, + ItemNames.PROGRESSIVE_PROTOSS_AIR_ARMOR, + }, + { # Bundle Weapon And Armor + ItemNames.PROGRESSIVE_TERRAN_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_TERRAN_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_ARMOR_UPGRADE, + }, + { # Bundle Unit Class + ItemNames.PROGRESSIVE_TERRAN_INFANTRY_UPGRADE, + ItemNames.PROGRESSIVE_TERRAN_VEHICLE_UPGRADE, + ItemNames.PROGRESSIVE_TERRAN_SHIP_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_GROUND_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_FLYER_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_GROUND_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_AIR_UPGRADE, + }, + { # Bundle All + ItemNames.PROGRESSIVE_TERRAN_WEAPON_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_ZERG_WEAPON_ARMOR_UPGRADE, + ItemNames.PROGRESSIVE_PROTOSS_WEAPON_ARMOR_UPGRADE, + } +] + +lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in get_full_item_list().items() if + data.code} + +# Map type to expected int +type_flaggroups: typing.Dict[SC2Race, typing.Dict[str, int]] = { + SC2Race.ANY: { + "Minerals": 0, + "Vespene": 1, + "Supply": 2, + "Goal": 3, + "Nothing Group": 4, + }, + SC2Race.TERRAN: { + "Armory 1": 0, + "Armory 2": 1, + "Armory 3": 2, + "Armory 4": 3, + "Armory 5": 4, + "Armory 6": 5, + "Progressive Upgrade": 6, # Unit upgrades that exist multiple times (Stimpack / Super Stimpack) + "Laboratory": 7, + "Upgrade": 8, # Weapon / Armor upgrades + "Unit": 9, + "Building": 10, + "Mercenary": 11, + "Nova Gear": 12, + "Progressive Upgrade 2": 13, + }, + SC2Race.ZERG: { + "Ability": 0, + "Mutation 1": 1, + "Strain": 2, + "Morph": 3, + "Upgrade": 4, + "Mercenary": 5, + "Unit": 6, + "Level": 7, + "Primal Form": 8, + "Evolution Pit": 9, + "Mutation 2": 10, + "Mutation 3": 11 + }, + SC2Race.PROTOSS: { + "Unit": 0, + "Unit 2": 1, + "Upgrade": 2, # Weapon / Armor upgrades + "Building": 3, + "Progressive Upgrade": 4, + "Spear of Adun": 5, + "Solarite Core": 6, + "Forge 1": 7, + "Forge 2": 8, + "Forge 3": 9, + } +} diff --git a/worlds/sc2/Locations.py b/worlds/sc2/Locations.py new file mode 100644 index 000000000000..5a03f2232348 --- /dev/null +++ b/worlds/sc2/Locations.py @@ -0,0 +1,1638 @@ +from enum import IntEnum +from typing import List, Tuple, Optional, Callable, NamedTuple, Set, Any +from BaseClasses import MultiWorld +from . import ItemNames +from .Options import get_option_value, kerrigan_unit_available, RequiredTactics, GrantStoryTech, LocationInclusion, \ + EnableHotsMissions +from .Rules import SC2Logic + +from BaseClasses import Location +from worlds.AutoWorld import World + +SC2WOL_LOC_ID_OFFSET = 1000 +SC2HOTS_LOC_ID_OFFSET = 20000000 # Avoid clashes with The Legend of Zelda +SC2LOTV_LOC_ID_OFFSET = SC2HOTS_LOC_ID_OFFSET + 2000 +SC2NCO_LOC_ID_OFFSET = SC2LOTV_LOC_ID_OFFSET + 2500 + + +class SC2Location(Location): + game: str = "Starcraft2" + + +class LocationType(IntEnum): + VICTORY = 0 # Winning a mission + VANILLA = 1 # Objectives that provided metaprogression in the original campaign, along with a few other locations for a balanced experience + EXTRA = 2 # Additional locations based on mission progression, collecting in-mission rewards, etc. that do not significantly increase the challenge. + CHALLENGE = 3 # Challenging objectives, often harder than just completing a mission, and often associated with Achievements + MASTERY = 4 # Extremely challenging objectives often associated with Masteries and Feats of Strength in the original campaign + + +class LocationData(NamedTuple): + region: str + name: str + code: Optional[int] + type: LocationType + rule: Optional[Callable[[Any], bool]] = Location.access_rule + + +def get_location_types(world: World, inclusion_type: LocationInclusion) -> Set[LocationType]: + """ + + :param multiworld: + :param player: + :param inclusion_type: Level of inclusion to check for + :return: A list of location types that match the inclusion type + """ + exclusion_options = [ + ("vanilla_locations", LocationType.VANILLA), + ("extra_locations", LocationType.EXTRA), + ("challenge_locations", LocationType.CHALLENGE), + ("mastery_locations", LocationType.MASTERY) + ] + excluded_location_types = set() + for option_name, location_type in exclusion_options: + if get_option_value(world, option_name) is inclusion_type: + excluded_location_types.add(location_type) + return excluded_location_types + + +def get_plando_locations(world: World) -> List[str]: + """ + + :param multiworld: + :param player: + :return: A list of locations affected by a plando in a world + """ + if world is None: + return [] + plando_locations = [] + for plando_setting in world.multiworld.plando_items[world.player]: + plando_locations += plando_setting.get("locations", []) + plando_setting_location = plando_setting.get("location", None) + if plando_setting_location is not None: + plando_locations.append(plando_setting_location) + + return plando_locations + + +def get_locations(world: Optional[World]) -> Tuple[LocationData, ...]: + # Note: rules which are ended with or True are rules identified as needed later when restricted units is an option + logic_level = get_option_value(world, 'required_tactics') + adv_tactics = logic_level != RequiredTactics.option_standard + kerriganless = get_option_value(world, 'kerrigan_presence') not in kerrigan_unit_available \ + or get_option_value(world, "enable_hots_missions") == EnableHotsMissions.option_false + story_tech_granted = get_option_value(world, "grant_story_tech") == GrantStoryTech.option_true + logic = SC2Logic(world) + player = None if world is None else world.player + location_table: List[LocationData] = [ + # WoL + LocationData("Liberation Day", "Liberation Day: Victory", SC2WOL_LOC_ID_OFFSET + 100, LocationType.VICTORY), + LocationData("Liberation Day", "Liberation Day: First Statue", SC2WOL_LOC_ID_OFFSET + 101, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Second Statue", SC2WOL_LOC_ID_OFFSET + 102, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Third Statue", SC2WOL_LOC_ID_OFFSET + 103, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Fourth Statue", SC2WOL_LOC_ID_OFFSET + 104, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Fifth Statue", SC2WOL_LOC_ID_OFFSET + 105, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Sixth Statue", SC2WOL_LOC_ID_OFFSET + 106, LocationType.VANILLA), + LocationData("Liberation Day", "Liberation Day: Special Delivery", SC2WOL_LOC_ID_OFFSET + 107, LocationType.EXTRA), + LocationData("Liberation Day", "Liberation Day: Transport", SC2WOL_LOC_ID_OFFSET + 108, LocationType.EXTRA), + LocationData("The Outlaws", "The Outlaws: Victory", SC2WOL_LOC_ID_OFFSET + 200, LocationType.VICTORY, + lambda state: logic.terran_early_tech(state)), + LocationData("The Outlaws", "The Outlaws: Rebel Base", SC2WOL_LOC_ID_OFFSET + 201, LocationType.VANILLA, + lambda state: logic.terran_early_tech(state)), + LocationData("The Outlaws", "The Outlaws: North Resource Pickups", SC2WOL_LOC_ID_OFFSET + 202, LocationType.EXTRA, + lambda state: logic.terran_early_tech(state)), + LocationData("The Outlaws", "The Outlaws: Bunker", SC2WOL_LOC_ID_OFFSET + 203, LocationType.VANILLA, + lambda state: logic.terran_early_tech(state)), + LocationData("The Outlaws", "The Outlaws: Close Resource Pickups", SC2WOL_LOC_ID_OFFSET + 204, LocationType.EXTRA), + LocationData("Zero Hour", "Zero Hour: Victory", SC2WOL_LOC_ID_OFFSET + 300, LocationType.VICTORY, + lambda state: logic.terran_common_unit(state) and + logic.terran_defense_rating(state, True) >= 2 and + (adv_tactics or logic.terran_basic_anti_air(state))), + LocationData("Zero Hour", "Zero Hour: First Group Rescued", SC2WOL_LOC_ID_OFFSET + 301, LocationType.VANILLA), + LocationData("Zero Hour", "Zero Hour: Second Group Rescued", SC2WOL_LOC_ID_OFFSET + 302, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state)), + LocationData("Zero Hour", "Zero Hour: Third Group Rescued", SC2WOL_LOC_ID_OFFSET + 303, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_defense_rating(state, True) >= 2), + LocationData("Zero Hour", "Zero Hour: First Hatchery", SC2WOL_LOC_ID_OFFSET + 304, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state)), + LocationData("Zero Hour", "Zero Hour: Second Hatchery", SC2WOL_LOC_ID_OFFSET + 305, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state)), + LocationData("Zero Hour", "Zero Hour: Third Hatchery", SC2WOL_LOC_ID_OFFSET + 306, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state)), + LocationData("Zero Hour", "Zero Hour: Fourth Hatchery", SC2WOL_LOC_ID_OFFSET + 307, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state)), + LocationData("Zero Hour", "Zero Hour: Ride's on its Way", SC2WOL_LOC_ID_OFFSET + 308, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state)), + LocationData("Zero Hour", "Zero Hour: Hold Just a Little Longer", SC2WOL_LOC_ID_OFFSET + 309, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_defense_rating(state, True) >= 2), + LocationData("Zero Hour", "Zero Hour: Cavalry's on the Way", SC2WOL_LOC_ID_OFFSET + 310, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_defense_rating(state, True) >= 2), + LocationData("Evacuation", "Evacuation: Victory", SC2WOL_LOC_ID_OFFSET + 400, LocationType.VICTORY, + lambda state: logic.terran_early_tech(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Evacuation", "Evacuation: North Chrysalis", SC2WOL_LOC_ID_OFFSET + 401, LocationType.VANILLA), + LocationData("Evacuation", "Evacuation: West Chrysalis", SC2WOL_LOC_ID_OFFSET + 402, LocationType.VANILLA, + lambda state: logic.terran_early_tech(state)), + LocationData("Evacuation", "Evacuation: East Chrysalis", SC2WOL_LOC_ID_OFFSET + 403, LocationType.VANILLA, + lambda state: logic.terran_early_tech(state)), + LocationData("Evacuation", "Evacuation: Reach Hanson", SC2WOL_LOC_ID_OFFSET + 404, LocationType.EXTRA), + LocationData("Evacuation", "Evacuation: Secret Resource Stash", SC2WOL_LOC_ID_OFFSET + 405, LocationType.EXTRA), + LocationData("Evacuation", "Evacuation: Flawless", SC2WOL_LOC_ID_OFFSET + 406, LocationType.CHALLENGE, + lambda state: logic.terran_early_tech(state) and + logic.terran_defense_rating(state, True, False) >= 2 and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Outbreak", "Outbreak: Victory", SC2WOL_LOC_ID_OFFSET + 500, LocationType.VICTORY, + lambda state: logic.terran_defense_rating(state, True, False) >= 4 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: Left Infestor", SC2WOL_LOC_ID_OFFSET + 501, LocationType.VANILLA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: Right Infestor", SC2WOL_LOC_ID_OFFSET + 502, LocationType.VANILLA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: North Infested Command Center", SC2WOL_LOC_ID_OFFSET + 503, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: South Infested Command Center", SC2WOL_LOC_ID_OFFSET + 504, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: Northwest Bar", SC2WOL_LOC_ID_OFFSET + 505, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: North Bar", SC2WOL_LOC_ID_OFFSET + 506, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Outbreak", "Outbreak: South Bar", SC2WOL_LOC_ID_OFFSET + 507, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, True, False) >= 2 and + (logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Safe Haven", "Safe Haven: Victory", SC2WOL_LOC_ID_OFFSET + 600, LocationType.VICTORY, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: North Nexus", SC2WOL_LOC_ID_OFFSET + 601, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: East Nexus", SC2WOL_LOC_ID_OFFSET + 602, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: South Nexus", SC2WOL_LOC_ID_OFFSET + 603, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: First Terror Fleet", SC2WOL_LOC_ID_OFFSET + 604, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: Second Terror Fleet", SC2WOL_LOC_ID_OFFSET + 605, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Safe Haven", "Safe Haven: Third Terror Fleet", SC2WOL_LOC_ID_OFFSET + 606, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state)), + LocationData("Haven's Fall", "Haven's Fall: Victory", SC2WOL_LOC_ID_OFFSET + 700, LocationType.VICTORY, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: North Hive", SC2WOL_LOC_ID_OFFSET + 701, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: East Hive", SC2WOL_LOC_ID_OFFSET + 702, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: South Hive", SC2WOL_LOC_ID_OFFSET + 703, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: Northeast Colony Base", SC2WOL_LOC_ID_OFFSET + 704, LocationType.CHALLENGE, + lambda state: logic.terran_respond_to_colony_infestations(state)), + LocationData("Haven's Fall", "Haven's Fall: East Colony Base", SC2WOL_LOC_ID_OFFSET + 705, LocationType.CHALLENGE, + lambda state: logic.terran_respond_to_colony_infestations(state)), + LocationData("Haven's Fall", "Haven's Fall: Middle Colony Base", SC2WOL_LOC_ID_OFFSET + 706, LocationType.CHALLENGE, + lambda state: logic.terran_respond_to_colony_infestations(state)), + LocationData("Haven's Fall", "Haven's Fall: Southeast Colony Base", SC2WOL_LOC_ID_OFFSET + 707, LocationType.CHALLENGE, + lambda state: logic.terran_respond_to_colony_infestations(state)), + LocationData("Haven's Fall", "Haven's Fall: Southwest Colony Base", SC2WOL_LOC_ID_OFFSET + 708, LocationType.CHALLENGE, + lambda state: logic.terran_respond_to_colony_infestations(state)), + LocationData("Haven's Fall", "Haven's Fall: Southwest Gas Pickups", SC2WOL_LOC_ID_OFFSET + 709, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: East Gas Pickups", SC2WOL_LOC_ID_OFFSET + 710, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Haven's Fall", "Haven's Fall: Southeast Gas Pickups", SC2WOL_LOC_ID_OFFSET + 711, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + logic.terran_competent_anti_air(state) and + logic.terran_defense_rating(state, True) >= 3), + LocationData("Smash and Grab", "Smash and Grab: Victory", SC2WOL_LOC_ID_OFFSET + 800, LocationType.VICTORY, + lambda state: logic.terran_common_unit(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Smash and Grab", "Smash and Grab: First Relic", SC2WOL_LOC_ID_OFFSET + 801, LocationType.VANILLA), + LocationData("Smash and Grab", "Smash and Grab: Second Relic", SC2WOL_LOC_ID_OFFSET + 802, LocationType.VANILLA), + LocationData("Smash and Grab", "Smash and Grab: Third Relic", SC2WOL_LOC_ID_OFFSET + 803, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Smash and Grab", "Smash and Grab: Fourth Relic", SC2WOL_LOC_ID_OFFSET + 804, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Smash and Grab", "Smash and Grab: First Forcefield Area Busted", SC2WOL_LOC_ID_OFFSET + 805, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("Smash and Grab", "Smash and Grab: Second Forcefield Area Busted", SC2WOL_LOC_ID_OFFSET + 806, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state) and + (adv_tactics and logic.terran_basic_anti_air(state) + or logic.terran_competent_anti_air(state))), + LocationData("The Dig", "The Dig: Victory", SC2WOL_LOC_ID_OFFSET + 900, LocationType.VICTORY, + lambda state: logic.terran_basic_anti_air(state) + and logic.terran_defense_rating(state, False, True) >= 8 + and logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Left Relic", SC2WOL_LOC_ID_OFFSET + 901, LocationType.VANILLA, + lambda state: logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Right Ground Relic", SC2WOL_LOC_ID_OFFSET + 902, LocationType.VANILLA, + lambda state: logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Right Cliff Relic", SC2WOL_LOC_ID_OFFSET + 903, LocationType.VANILLA, + lambda state: logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Moebius Base", SC2WOL_LOC_ID_OFFSET + 904, LocationType.EXTRA, + lambda state: logic.marine_medic_upgrade(state) or adv_tactics), + LocationData("The Dig", "The Dig: Door Outer Layer", SC2WOL_LOC_ID_OFFSET + 905, LocationType.EXTRA, + lambda state: logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Door Thermal Barrier", SC2WOL_LOC_ID_OFFSET + 906, LocationType.EXTRA, + lambda state: logic.terran_basic_anti_air(state) + and logic.terran_defense_rating(state, False, True) >= 8 + and logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Cutting Through the Core", SC2WOL_LOC_ID_OFFSET + 907, LocationType.EXTRA, + lambda state: logic.terran_basic_anti_air(state) + and logic.terran_defense_rating(state, False, True) >= 8 + and logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Dig", "The Dig: Structure Access Imminent", SC2WOL_LOC_ID_OFFSET + 908, LocationType.EXTRA, + lambda state: logic.terran_basic_anti_air(state) + and logic.terran_defense_rating(state, False, True) >= 8 + and logic.terran_defense_rating(state, False, False) >= 6 + and logic.terran_common_unit(state) + and (logic.marine_medic_upgrade(state) or adv_tactics)), + LocationData("The Moebius Factor", "The Moebius Factor: Victory", SC2WOL_LOC_ID_OFFSET + 1000, LocationType.VICTORY, + lambda state: logic.terran_basic_anti_air(state) and + (logic.terran_air(state) + or state.has_any({ItemNames.MEDIVAC, ItemNames.HERCULES}, player) + and logic.terran_common_unit(state))), + LocationData("The Moebius Factor", "The Moebius Factor: 1st Data Core", SC2WOL_LOC_ID_OFFSET + 1001, LocationType.VANILLA), + LocationData("The Moebius Factor", "The Moebius Factor: 2nd Data Core", SC2WOL_LOC_ID_OFFSET + 1002, LocationType.VANILLA, + lambda state: (logic.terran_air(state) + or state.has_any({ItemNames.MEDIVAC, ItemNames.HERCULES}, player) + and logic.terran_common_unit(state))), + LocationData("The Moebius Factor", "The Moebius Factor: South Rescue", SC2WOL_LOC_ID_OFFSET + 1003, LocationType.EXTRA, + lambda state: logic.terran_can_rescue(state)), + LocationData("The Moebius Factor", "The Moebius Factor: Wall Rescue", SC2WOL_LOC_ID_OFFSET + 1004, LocationType.EXTRA, + lambda state: logic.terran_can_rescue(state)), + LocationData("The Moebius Factor", "The Moebius Factor: Mid Rescue", SC2WOL_LOC_ID_OFFSET + 1005, LocationType.EXTRA, + lambda state: logic.terran_can_rescue(state)), + LocationData("The Moebius Factor", "The Moebius Factor: Nydus Roof Rescue", SC2WOL_LOC_ID_OFFSET + 1006, LocationType.EXTRA, + lambda state: logic.terran_can_rescue(state)), + LocationData("The Moebius Factor", "The Moebius Factor: Alive Inside Rescue", SC2WOL_LOC_ID_OFFSET + 1007, LocationType.EXTRA, + lambda state: logic.terran_can_rescue(state)), + LocationData("The Moebius Factor", "The Moebius Factor: Brutalisk", SC2WOL_LOC_ID_OFFSET + 1008, LocationType.VANILLA, + lambda state: logic.terran_basic_anti_air(state) and + (logic.terran_air(state) + or state.has_any({ItemNames.MEDIVAC, ItemNames.HERCULES}, player) + and logic.terran_common_unit(state))), + LocationData("The Moebius Factor", "The Moebius Factor: 3rd Data Core", SC2WOL_LOC_ID_OFFSET + 1009, LocationType.VANILLA, + lambda state: logic.terran_basic_anti_air(state) and + (logic.terran_air(state) + or state.has_any({ItemNames.MEDIVAC, ItemNames.HERCULES}, player) + and logic.terran_common_unit(state))), + LocationData("Supernova", "Supernova: Victory", SC2WOL_LOC_ID_OFFSET + 1100, LocationType.VICTORY, + lambda state: logic.terran_beats_protoss_deathball(state)), + LocationData("Supernova", "Supernova: West Relic", SC2WOL_LOC_ID_OFFSET + 1101, LocationType.VANILLA), + LocationData("Supernova", "Supernova: North Relic", SC2WOL_LOC_ID_OFFSET + 1102, LocationType.VANILLA), + LocationData("Supernova", "Supernova: South Relic", SC2WOL_LOC_ID_OFFSET + 1103, LocationType.VANILLA, + lambda state: logic.terran_beats_protoss_deathball(state)), + LocationData("Supernova", "Supernova: East Relic", SC2WOL_LOC_ID_OFFSET + 1104, LocationType.VANILLA, + lambda state: logic.terran_beats_protoss_deathball(state)), + LocationData("Supernova", "Supernova: Landing Zone Cleared", SC2WOL_LOC_ID_OFFSET + 1105, LocationType.EXTRA), + LocationData("Supernova", "Supernova: Middle Base", SC2WOL_LOC_ID_OFFSET + 1106, LocationType.EXTRA, + lambda state: logic.terran_beats_protoss_deathball(state)), + LocationData("Supernova", "Supernova: Southeast Base", SC2WOL_LOC_ID_OFFSET + 1107, LocationType.EXTRA, + lambda state: logic.terran_beats_protoss_deathball(state)), + LocationData("Maw of the Void", "Maw of the Void: Victory", SC2WOL_LOC_ID_OFFSET + 1200, LocationType.VICTORY, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Landing Zone Cleared", SC2WOL_LOC_ID_OFFSET + 1201, LocationType.EXTRA), + LocationData("Maw of the Void", "Maw of the Void: Expansion Prisoners", SC2WOL_LOC_ID_OFFSET + 1202, LocationType.VANILLA, + lambda state: adv_tactics or logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: South Close Prisoners", SC2WOL_LOC_ID_OFFSET + 1203, LocationType.VANILLA, + lambda state: adv_tactics or logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: South Far Prisoners", SC2WOL_LOC_ID_OFFSET + 1204, LocationType.VANILLA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: North Prisoners", SC2WOL_LOC_ID_OFFSET + 1205, LocationType.VANILLA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Mothership", SC2WOL_LOC_ID_OFFSET + 1206, LocationType.EXTRA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Expansion Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1207, LocationType.EXTRA, + lambda state: adv_tactics or logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Middle Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1208, LocationType.EXTRA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Southeast Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1209, LocationType.EXTRA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Stargate Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1210, LocationType.EXTRA, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Northwest Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1211, LocationType.CHALLENGE, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: West Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1212, LocationType.CHALLENGE, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Maw of the Void", "Maw of the Void: Southwest Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1213, LocationType.CHALLENGE, + lambda state: logic.terran_survives_rip_field(state)), + LocationData("Devil's Playground", "Devil's Playground: Victory", SC2WOL_LOC_ID_OFFSET + 1300, LocationType.VICTORY, + lambda state: adv_tactics or + logic.terran_basic_anti_air(state) and ( + logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Devil's Playground", "Devil's Playground: Tosh's Miners", SC2WOL_LOC_ID_OFFSET + 1301, LocationType.VANILLA), + LocationData("Devil's Playground", "Devil's Playground: Brutalisk", SC2WOL_LOC_ID_OFFSET + 1302, LocationType.VANILLA, + lambda state: adv_tactics or logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player)), + LocationData("Devil's Playground", "Devil's Playground: North Reapers", SC2WOL_LOC_ID_OFFSET + 1303, LocationType.EXTRA), + LocationData("Devil's Playground", "Devil's Playground: Middle Reapers", SC2WOL_LOC_ID_OFFSET + 1304, LocationType.EXTRA, + lambda state: adv_tactics or logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player)), + LocationData("Devil's Playground", "Devil's Playground: Southwest Reapers", SC2WOL_LOC_ID_OFFSET + 1305, LocationType.EXTRA, + lambda state: adv_tactics or logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player)), + LocationData("Devil's Playground", "Devil's Playground: Southeast Reapers", SC2WOL_LOC_ID_OFFSET + 1306, LocationType.EXTRA, + lambda state: adv_tactics or + logic.terran_basic_anti_air(state) and ( + logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Devil's Playground", "Devil's Playground: East Reapers", SC2WOL_LOC_ID_OFFSET + 1307, LocationType.CHALLENGE, + lambda state: logic.terran_basic_anti_air(state) and + (adv_tactics or + logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Devil's Playground", "Devil's Playground: Zerg Cleared", SC2WOL_LOC_ID_OFFSET + 1308, LocationType.CHALLENGE, + lambda state: logic.terran_competent_anti_air(state) and ( + logic.terran_common_unit(state) or state.has(ItemNames.REAPER, player))), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Victory", SC2WOL_LOC_ID_OFFSET + 1400, LocationType.VICTORY, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Close Relic", SC2WOL_LOC_ID_OFFSET + 1401, LocationType.VANILLA), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: West Relic", SC2WOL_LOC_ID_OFFSET + 1402, LocationType.VANILLA, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: North-East Relic", SC2WOL_LOC_ID_OFFSET + 1403, LocationType.VANILLA, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Middle Base", SC2WOL_LOC_ID_OFFSET + 1404, LocationType.EXTRA, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Main Base", SC2WOL_LOC_ID_OFFSET + 1405, + LocationType.MASTERY, + lambda state: logic.welcome_to_the_jungle_requirement(state) + and logic.terran_beats_protoss_deathball(state) + and logic.terran_base_trasher(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: No Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1406, LocationType.CHALLENGE, + lambda state: logic.welcome_to_the_jungle_requirement(state) + and logic.terran_competent_ground_to_air(state) + and logic.terran_beats_protoss_deathball(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 1 Terrazine Node Sealed", SC2WOL_LOC_ID_OFFSET + 1407, LocationType.CHALLENGE, + lambda state: logic.welcome_to_the_jungle_requirement(state) + and logic.terran_competent_ground_to_air(state) + and logic.terran_beats_protoss_deathball(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 2 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1408, LocationType.CHALLENGE, + lambda state: logic.welcome_to_the_jungle_requirement(state) + and logic.terran_beats_protoss_deathball(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 3 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1409, LocationType.CHALLENGE, + lambda state: logic.welcome_to_the_jungle_requirement(state) + and logic.terran_competent_comp(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 4 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1410, LocationType.EXTRA, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 5 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1411, LocationType.EXTRA, + lambda state: logic.welcome_to_the_jungle_requirement(state)), + LocationData("Breakout", "Breakout: Victory", SC2WOL_LOC_ID_OFFSET + 1500, LocationType.VICTORY), + LocationData("Breakout", "Breakout: Diamondback Prison", SC2WOL_LOC_ID_OFFSET + 1501, LocationType.VANILLA), + LocationData("Breakout", "Breakout: Siege Tank Prison", SC2WOL_LOC_ID_OFFSET + 1502, LocationType.VANILLA), + LocationData("Breakout", "Breakout: First Checkpoint", SC2WOL_LOC_ID_OFFSET + 1503, LocationType.EXTRA), + LocationData("Breakout", "Breakout: Second Checkpoint", SC2WOL_LOC_ID_OFFSET + 1504, LocationType.EXTRA), + LocationData("Ghost of a Chance", "Ghost of a Chance: Victory", SC2WOL_LOC_ID_OFFSET + 1600, LocationType.VICTORY), + LocationData("Ghost of a Chance", "Ghost of a Chance: Terrazine Tank", SC2WOL_LOC_ID_OFFSET + 1601, LocationType.EXTRA), + LocationData("Ghost of a Chance", "Ghost of a Chance: Jorium Stockpile", SC2WOL_LOC_ID_OFFSET + 1602, LocationType.EXTRA), + LocationData("Ghost of a Chance", "Ghost of a Chance: First Island Spectres", SC2WOL_LOC_ID_OFFSET + 1603, LocationType.VANILLA), + LocationData("Ghost of a Chance", "Ghost of a Chance: Second Island Spectres", SC2WOL_LOC_ID_OFFSET + 1604, LocationType.VANILLA), + LocationData("Ghost of a Chance", "Ghost of a Chance: Third Island Spectres", SC2WOL_LOC_ID_OFFSET + 1605, LocationType.VANILLA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Victory", SC2WOL_LOC_ID_OFFSET + 1700, LocationType.VICTORY, + lambda state: logic.great_train_robbery_train_stopper(state) and + logic.terran_basic_anti_air(state)), + LocationData("The Great Train Robbery", "The Great Train Robbery: North Defiler", SC2WOL_LOC_ID_OFFSET + 1701, LocationType.VANILLA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Mid Defiler", SC2WOL_LOC_ID_OFFSET + 1702, LocationType.VANILLA), + LocationData("The Great Train Robbery", "The Great Train Robbery: South Defiler", SC2WOL_LOC_ID_OFFSET + 1703, LocationType.VANILLA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Close Diamondback", SC2WOL_LOC_ID_OFFSET + 1704, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Northwest Diamondback", SC2WOL_LOC_ID_OFFSET + 1705, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: North Diamondback", SC2WOL_LOC_ID_OFFSET + 1706, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Northeast Diamondback", SC2WOL_LOC_ID_OFFSET + 1707, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Southwest Diamondback", SC2WOL_LOC_ID_OFFSET + 1708, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Southeast Diamondback", SC2WOL_LOC_ID_OFFSET + 1709, LocationType.EXTRA), + LocationData("The Great Train Robbery", "The Great Train Robbery: Kill Team", SC2WOL_LOC_ID_OFFSET + 1710, LocationType.CHALLENGE, + lambda state: (adv_tactics or logic.terran_common_unit(state)) and + logic.great_train_robbery_train_stopper(state) and + logic.terran_basic_anti_air(state)), + LocationData("The Great Train Robbery", "The Great Train Robbery: Flawless", SC2WOL_LOC_ID_OFFSET + 1711, LocationType.CHALLENGE, + lambda state: logic.great_train_robbery_train_stopper(state) and + logic.terran_basic_anti_air(state)), + LocationData("The Great Train Robbery", "The Great Train Robbery: 2 Trains Destroyed", SC2WOL_LOC_ID_OFFSET + 1712, LocationType.EXTRA, + lambda state: logic.great_train_robbery_train_stopper(state)), + LocationData("The Great Train Robbery", "The Great Train Robbery: 4 Trains Destroyed", SC2WOL_LOC_ID_OFFSET + 1713, LocationType.EXTRA, + lambda state: logic.great_train_robbery_train_stopper(state) and + logic.terran_basic_anti_air(state)), + LocationData("The Great Train Robbery", "The Great Train Robbery: 6 Trains Destroyed", SC2WOL_LOC_ID_OFFSET + 1714, LocationType.EXTRA, + lambda state: logic.great_train_robbery_train_stopper(state) and + logic.terran_basic_anti_air(state)), + LocationData("Cutthroat", "Cutthroat: Victory", SC2WOL_LOC_ID_OFFSET + 1800, LocationType.VICTORY, + lambda state: logic.terran_common_unit(state) and + (adv_tactics or logic.terran_basic_anti_air)), + LocationData("Cutthroat", "Cutthroat: Mira Han", SC2WOL_LOC_ID_OFFSET + 1801, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state)), + LocationData("Cutthroat", "Cutthroat: North Relic", SC2WOL_LOC_ID_OFFSET + 1802, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state)), + LocationData("Cutthroat", "Cutthroat: Mid Relic", SC2WOL_LOC_ID_OFFSET + 1803, LocationType.VANILLA), + LocationData("Cutthroat", "Cutthroat: Southwest Relic", SC2WOL_LOC_ID_OFFSET + 1804, LocationType.VANILLA, + lambda state: logic.terran_common_unit(state)), + LocationData("Cutthroat", "Cutthroat: North Command Center", SC2WOL_LOC_ID_OFFSET + 1805, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state)), + LocationData("Cutthroat", "Cutthroat: South Command Center", SC2WOL_LOC_ID_OFFSET + 1806, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state)), + LocationData("Cutthroat", "Cutthroat: West Command Center", SC2WOL_LOC_ID_OFFSET + 1807, LocationType.EXTRA, + lambda state: logic.terran_common_unit(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Victory", SC2WOL_LOC_ID_OFFSET + 1900, LocationType.VICTORY, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Odin", SC2WOL_LOC_ID_OFFSET + 1901, LocationType.EXTRA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Loki", SC2WOL_LOC_ID_OFFSET + 1902, + LocationType.CHALLENGE, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Lab Devourer", SC2WOL_LOC_ID_OFFSET + 1903, LocationType.VANILLA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Engine of Destruction", "Engine of Destruction: North Devourer", SC2WOL_LOC_ID_OFFSET + 1904, LocationType.VANILLA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Southeast Devourer", SC2WOL_LOC_ID_OFFSET + 1905, LocationType.VANILLA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: West Base", SC2WOL_LOC_ID_OFFSET + 1906, LocationType.EXTRA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Northwest Base", SC2WOL_LOC_ID_OFFSET + 1907, LocationType.EXTRA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Northeast Base", SC2WOL_LOC_ID_OFFSET + 1908, LocationType.EXTRA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Engine of Destruction", "Engine of Destruction: Southeast Base", SC2WOL_LOC_ID_OFFSET + 1909, LocationType.EXTRA, + lambda state: logic.engine_of_destruction_requirement(state)), + LocationData("Media Blitz", "Media Blitz: Victory", SC2WOL_LOC_ID_OFFSET + 2000, LocationType.VICTORY, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Tower 1", SC2WOL_LOC_ID_OFFSET + 2001, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Tower 2", SC2WOL_LOC_ID_OFFSET + 2002, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Tower 3", SC2WOL_LOC_ID_OFFSET + 2003, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Science Facility", SC2WOL_LOC_ID_OFFSET + 2004, LocationType.VANILLA), + LocationData("Media Blitz", "Media Blitz: All Barracks", SC2WOL_LOC_ID_OFFSET + 2005, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: All Factories", SC2WOL_LOC_ID_OFFSET + 2006, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: All Starports", SC2WOL_LOC_ID_OFFSET + 2007, LocationType.EXTRA, + lambda state: adv_tactics or logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Odin Not Trashed", SC2WOL_LOC_ID_OFFSET + 2008, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state)), + LocationData("Media Blitz", "Media Blitz: Surprise Attack Ends", SC2WOL_LOC_ID_OFFSET + 2009, LocationType.EXTRA), + LocationData("Piercing the Shroud", "Piercing the Shroud: Victory", SC2WOL_LOC_ID_OFFSET + 2100, LocationType.VICTORY, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: Holding Cell Relic", SC2WOL_LOC_ID_OFFSET + 2101, LocationType.VANILLA), + LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk Relic", SC2WOL_LOC_ID_OFFSET + 2102, LocationType.VANILLA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: First Escape Relic", SC2WOL_LOC_ID_OFFSET + 2103, LocationType.VANILLA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: Second Escape Relic", SC2WOL_LOC_ID_OFFSET + 2104, LocationType.VANILLA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk", SC2WOL_LOC_ID_OFFSET + 2105, LocationType.VANILLA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: Fusion Reactor", SC2WOL_LOC_ID_OFFSET + 2106, LocationType.EXTRA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Piercing the Shroud", "Piercing the Shroud: Entrance Holding Pen", SC2WOL_LOC_ID_OFFSET + 2107, LocationType.EXTRA), + LocationData("Piercing the Shroud", "Piercing the Shroud: Cargo Bay Warbot", SC2WOL_LOC_ID_OFFSET + 2108, LocationType.EXTRA), + LocationData("Piercing the Shroud", "Piercing the Shroud: Escape Warbot", SC2WOL_LOC_ID_OFFSET + 2109, LocationType.EXTRA, + lambda state: logic.marine_medic_upgrade(state)), + LocationData("Whispers of Doom", "Whispers of Doom: Victory", SC2WOL_LOC_ID_OFFSET + 2200, LocationType.VICTORY), + LocationData("Whispers of Doom", "Whispers of Doom: First Hatchery", SC2WOL_LOC_ID_OFFSET + 2201, LocationType.VANILLA), + LocationData("Whispers of Doom", "Whispers of Doom: Second Hatchery", SC2WOL_LOC_ID_OFFSET + 2202, LocationType.VANILLA), + LocationData("Whispers of Doom", "Whispers of Doom: Third Hatchery", SC2WOL_LOC_ID_OFFSET + 2203, LocationType.VANILLA), + LocationData("Whispers of Doom", "Whispers of Doom: First Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2204, LocationType.EXTRA), + LocationData("Whispers of Doom", "Whispers of Doom: Second Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2205, LocationType.EXTRA), + LocationData("Whispers of Doom", "Whispers of Doom: Third Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2206, LocationType.EXTRA), + LocationData("A Sinister Turn", "A Sinister Turn: Victory", SC2WOL_LOC_ID_OFFSET + 2300, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Robotics Facility", SC2WOL_LOC_ID_OFFSET + 2301, LocationType.VANILLA, + lambda state: adv_tactics or logic.protoss_common_unit(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Dark Shrine", SC2WOL_LOC_ID_OFFSET + 2302, LocationType.VANILLA, + lambda state: adv_tactics or logic.protoss_common_unit(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Templar Archives", SC2WOL_LOC_ID_OFFSET + 2303, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Northeast Base", SC2WOL_LOC_ID_OFFSET + 2304, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Southwest Base", SC2WOL_LOC_ID_OFFSET + 2305, LocationType.CHALLENGE, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Maar", SC2WOL_LOC_ID_OFFSET + 2306, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Northwest Preserver", SC2WOL_LOC_ID_OFFSET + 2307, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: Southwest Preserver", SC2WOL_LOC_ID_OFFSET + 2308, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("A Sinister Turn", "A Sinister Turn: East Preserver", SC2WOL_LOC_ID_OFFSET + 2309, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("Echoes of the Future", "Echoes of the Future: Victory", SC2WOL_LOC_ID_OFFSET + 2400, LocationType.VICTORY, + lambda state: adv_tactics and logic.protoss_static_defense(state) or logic.protoss_common_unit(state) and logic.protoss_competent_anti_air(state)), + LocationData("Echoes of the Future", "Echoes of the Future: Close Obelisk", SC2WOL_LOC_ID_OFFSET + 2401, LocationType.VANILLA), + LocationData("Echoes of the Future", "Echoes of the Future: West Obelisk", SC2WOL_LOC_ID_OFFSET + 2402, LocationType.VANILLA, + lambda state: adv_tactics and logic.protoss_static_defense(state) or logic.protoss_common_unit(state)), + LocationData("Echoes of the Future", "Echoes of the Future: Base", SC2WOL_LOC_ID_OFFSET + 2403, LocationType.EXTRA), + LocationData("Echoes of the Future", "Echoes of the Future: Southwest Tendril", SC2WOL_LOC_ID_OFFSET + 2404, LocationType.EXTRA), + LocationData("Echoes of the Future", "Echoes of the Future: Southeast Tendril", SC2WOL_LOC_ID_OFFSET + 2405, LocationType.EXTRA, + lambda state: adv_tactics and logic.protoss_static_defense(state) or logic.protoss_common_unit(state)), + LocationData("Echoes of the Future", "Echoes of the Future: Northeast Tendril", SC2WOL_LOC_ID_OFFSET + 2406, LocationType.EXTRA, + lambda state: adv_tactics and logic.protoss_static_defense(state) or logic.protoss_common_unit(state)), + LocationData("Echoes of the Future", "Echoes of the Future: Northwest Tendril", SC2WOL_LOC_ID_OFFSET + 2407, LocationType.EXTRA, + lambda state: adv_tactics and logic.protoss_static_defense(state) or logic.protoss_common_unit(state)), + LocationData("In Utter Darkness", "In Utter Darkness: Defeat", SC2WOL_LOC_ID_OFFSET + 2500, LocationType.VICTORY), + LocationData("In Utter Darkness", "In Utter Darkness: Protoss Archive", SC2WOL_LOC_ID_OFFSET + 2501, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state)), + LocationData("In Utter Darkness", "In Utter Darkness: Kills", SC2WOL_LOC_ID_OFFSET + 2502, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state)), + LocationData("In Utter Darkness", "In Utter Darkness: Urun", SC2WOL_LOC_ID_OFFSET + 2503, LocationType.EXTRA), + LocationData("In Utter Darkness", "In Utter Darkness: Mohandar", SC2WOL_LOC_ID_OFFSET + 2504, LocationType.EXTRA, + lambda state: logic.last_stand_requirement(state)), + LocationData("In Utter Darkness", "In Utter Darkness: Selendis", SC2WOL_LOC_ID_OFFSET + 2505, LocationType.EXTRA, + lambda state: logic.last_stand_requirement(state)), + LocationData("In Utter Darkness", "In Utter Darkness: Artanis", SC2WOL_LOC_ID_OFFSET + 2506, LocationType.EXTRA, + lambda state: logic.last_stand_requirement(state)), + LocationData("Gates of Hell", "Gates of Hell: Victory", SC2WOL_LOC_ID_OFFSET + 2600, LocationType.VICTORY, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Large Army", SC2WOL_LOC_ID_OFFSET + 2601, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: 2 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2602, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: 4 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2603, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: 6 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2604, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: 8 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2605, LocationType.CHALLENGE, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Southwest Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2606, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Northwest Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2607, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Northeast Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2608, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: East Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2609, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Southeast Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2610, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Gates of Hell", "Gates of Hell: Expansion Spore Cannon", SC2WOL_LOC_ID_OFFSET + 2611, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state) and + logic.terran_defense_rating(state, True) > 6), + LocationData("Belly of the Beast", "Belly of the Beast: Victory", SC2WOL_LOC_ID_OFFSET + 2700, LocationType.VICTORY), + LocationData("Belly of the Beast", "Belly of the Beast: First Charge", SC2WOL_LOC_ID_OFFSET + 2701, LocationType.EXTRA), + LocationData("Belly of the Beast", "Belly of the Beast: Second Charge", SC2WOL_LOC_ID_OFFSET + 2702, LocationType.EXTRA), + LocationData("Belly of the Beast", "Belly of the Beast: Third Charge", SC2WOL_LOC_ID_OFFSET + 2703, LocationType.EXTRA), + LocationData("Belly of the Beast", "Belly of the Beast: First Group Rescued", SC2WOL_LOC_ID_OFFSET + 2704, LocationType.VANILLA), + LocationData("Belly of the Beast", "Belly of the Beast: Second Group Rescued", SC2WOL_LOC_ID_OFFSET + 2705, LocationType.VANILLA), + LocationData("Belly of the Beast", "Belly of the Beast: Third Group Rescued", SC2WOL_LOC_ID_OFFSET + 2706, LocationType.VANILLA), + LocationData("Shatter the Sky", "Shatter the Sky: Victory", SC2WOL_LOC_ID_OFFSET + 2800, LocationType.VICTORY, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Close Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2801, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Northwest Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2802, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Southeast Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2803, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Southwest Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2804, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Leviathan", SC2WOL_LOC_ID_OFFSET + 2805, LocationType.VANILLA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: East Hatchery", SC2WOL_LOC_ID_OFFSET + 2806, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: North Hatchery", SC2WOL_LOC_ID_OFFSET + 2807, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state)), + LocationData("Shatter the Sky", "Shatter the Sky: Mid Hatchery", SC2WOL_LOC_ID_OFFSET + 2808, LocationType.EXTRA, + lambda state: logic.terran_competent_comp(state)), + LocationData("All-In", "All-In: Victory", SC2WOL_LOC_ID_OFFSET + 2900, LocationType.VICTORY, + lambda state: logic.all_in_requirement(state)), + LocationData("All-In", "All-In: First Kerrigan Attack", SC2WOL_LOC_ID_OFFSET + 2901, LocationType.EXTRA, + lambda state: logic.all_in_requirement(state)), + LocationData("All-In", "All-In: Second Kerrigan Attack", SC2WOL_LOC_ID_OFFSET + 2902, LocationType.EXTRA, + lambda state: logic.all_in_requirement(state)), + LocationData("All-In", "All-In: Third Kerrigan Attack", SC2WOL_LOC_ID_OFFSET + 2903, LocationType.EXTRA, + lambda state: logic.all_in_requirement(state)), + LocationData("All-In", "All-In: Fourth Kerrigan Attack", SC2WOL_LOC_ID_OFFSET + 2904, LocationType.EXTRA, + lambda state: logic.all_in_requirement(state)), + LocationData("All-In", "All-In: Fifth Kerrigan Attack", SC2WOL_LOC_ID_OFFSET + 2905, LocationType.EXTRA, + lambda state: logic.all_in_requirement(state)), + + # HotS + LocationData("Lab Rat", "Lab Rat: Victory", SC2HOTS_LOC_ID_OFFSET + 100, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state)), + LocationData("Lab Rat", "Lab Rat: Gather Minerals", SC2HOTS_LOC_ID_OFFSET + 101, LocationType.VANILLA), + LocationData("Lab Rat", "Lab Rat: South Zergling Group", SC2HOTS_LOC_ID_OFFSET + 102, LocationType.VANILLA, + lambda state: adv_tactics or logic.zerg_common_unit(state)), + LocationData("Lab Rat", "Lab Rat: East Zergling Group", SC2HOTS_LOC_ID_OFFSET + 103, LocationType.VANILLA, + lambda state: adv_tactics or logic.zerg_common_unit(state)), + LocationData("Lab Rat", "Lab Rat: West Zergling Group", SC2HOTS_LOC_ID_OFFSET + 104, LocationType.VANILLA, + lambda state: adv_tactics or logic.zerg_common_unit(state)), + LocationData("Lab Rat", "Lab Rat: Hatchery", SC2HOTS_LOC_ID_OFFSET + 105, LocationType.EXTRA), + LocationData("Lab Rat", "Lab Rat: Overlord", SC2HOTS_LOC_ID_OFFSET + 106, LocationType.EXTRA), + LocationData("Lab Rat", "Lab Rat: Gas Turrets", SC2HOTS_LOC_ID_OFFSET + 107, LocationType.EXTRA, + lambda state: adv_tactics or logic.zerg_common_unit(state)), + LocationData("Back in the Saddle", "Back in the Saddle: Victory", SC2HOTS_LOC_ID_OFFSET + 200, LocationType.VICTORY, + lambda state: logic.basic_kerrigan(state) or kerriganless or logic.story_tech_granted), + LocationData("Back in the Saddle", "Back in the Saddle: Defend the Tram", SC2HOTS_LOC_ID_OFFSET + 201, LocationType.EXTRA, + lambda state: logic.basic_kerrigan(state) or kerriganless or logic.story_tech_granted), + LocationData("Back in the Saddle", "Back in the Saddle: Kinetic Blast", SC2HOTS_LOC_ID_OFFSET + 202, LocationType.VANILLA), + LocationData("Back in the Saddle", "Back in the Saddle: Crushing Grip", SC2HOTS_LOC_ID_OFFSET + 203, LocationType.VANILLA), + LocationData("Back in the Saddle", "Back in the Saddle: Reach the Sublevel", SC2HOTS_LOC_ID_OFFSET + 204, LocationType.EXTRA), + LocationData("Back in the Saddle", "Back in the Saddle: Door Section Cleared", SC2HOTS_LOC_ID_OFFSET + 205, LocationType.EXTRA, + lambda state: logic.basic_kerrigan(state) or kerriganless or logic.story_tech_granted), + LocationData("Rendezvous", "Rendezvous: Victory", SC2HOTS_LOC_ID_OFFSET + 300, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Rendezvous", "Rendezvous: Right Queen", SC2HOTS_LOC_ID_OFFSET + 301, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Rendezvous", "Rendezvous: Center Queen", SC2HOTS_LOC_ID_OFFSET + 302, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Rendezvous", "Rendezvous: Left Queen", SC2HOTS_LOC_ID_OFFSET + 303, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Rendezvous", "Rendezvous: Hold Out Finished", SC2HOTS_LOC_ID_OFFSET + 304, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Harvest of Screams", "Harvest of Screams: Victory", SC2HOTS_LOC_ID_OFFSET + 400, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state)), + LocationData("Harvest of Screams", "Harvest of Screams: First Ursadon Matriarch", SC2HOTS_LOC_ID_OFFSET + 401, LocationType.VANILLA), + LocationData("Harvest of Screams", "Harvest of Screams: North Ursadon Matriarch", SC2HOTS_LOC_ID_OFFSET + 402, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Harvest of Screams", "Harvest of Screams: West Ursadon Matriarch", SC2HOTS_LOC_ID_OFFSET + 403, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Harvest of Screams", "Harvest of Screams: Lost Brood", SC2HOTS_LOC_ID_OFFSET + 404, LocationType.EXTRA), + LocationData("Harvest of Screams", "Harvest of Screams: Northeast Psi-link Spire", SC2HOTS_LOC_ID_OFFSET + 405, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Harvest of Screams", "Harvest of Screams: Northwest Psi-link Spire", SC2HOTS_LOC_ID_OFFSET + 406, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state)), + LocationData("Harvest of Screams", "Harvest of Screams: Southwest Psi-link Spire", SC2HOTS_LOC_ID_OFFSET + 407, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state)), + LocationData("Harvest of Screams", "Harvest of Screams: Nafash", SC2HOTS_LOC_ID_OFFSET + 408, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: Victory", SC2HOTS_LOC_ID_OFFSET + 500, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: East Stasis Chamber", SC2HOTS_LOC_ID_OFFSET + 501, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: Center Stasis Chamber", SC2HOTS_LOC_ID_OFFSET + 502, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) or adv_tactics), + LocationData("Shoot the Messenger", "Shoot the Messenger: West Stasis Chamber", SC2HOTS_LOC_ID_OFFSET + 503, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: Destroy 4 Shuttles", SC2HOTS_LOC_ID_OFFSET + 504, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: Frozen Expansion", SC2HOTS_LOC_ID_OFFSET + 505, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: Southwest Frozen Zerg", SC2HOTS_LOC_ID_OFFSET + 506, LocationType.EXTRA), + LocationData("Shoot the Messenger", "Shoot the Messenger: Southeast Frozen Zerg", SC2HOTS_LOC_ID_OFFSET + 507, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) or adv_tactics), + LocationData("Shoot the Messenger", "Shoot the Messenger: West Frozen Zerg", SC2HOTS_LOC_ID_OFFSET + 508, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Shoot the Messenger", "Shoot the Messenger: East Frozen Zerg", SC2HOTS_LOC_ID_OFFSET + 509, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_competent_anti_air(state)), + LocationData("Enemy Within", "Enemy Within: Victory", SC2HOTS_LOC_ID_OFFSET + 600, LocationType.VICTORY, + lambda state: logic.zerg_pass_vents(state) + and (logic.story_tech_granted + or state.has_any({ItemNames.ZERGLING_RAPTOR_STRAIN, ItemNames.ROACH, + ItemNames.HYDRALISK, ItemNames.INFESTOR}, player)) + ), + LocationData("Enemy Within", "Enemy Within: Infest Giant Ursadon", SC2HOTS_LOC_ID_OFFSET + 601, LocationType.VANILLA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Enemy Within", "Enemy Within: First Niadra Evolution", SC2HOTS_LOC_ID_OFFSET + 602, LocationType.VANILLA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Enemy Within", "Enemy Within: Second Niadra Evolution", SC2HOTS_LOC_ID_OFFSET + 603, LocationType.VANILLA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Enemy Within", "Enemy Within: Third Niadra Evolution", SC2HOTS_LOC_ID_OFFSET + 604, LocationType.VANILLA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Enemy Within", "Enemy Within: Warp Drive", SC2HOTS_LOC_ID_OFFSET + 605, LocationType.EXTRA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Enemy Within", "Enemy Within: Stasis Quadrant", SC2HOTS_LOC_ID_OFFSET + 606, LocationType.EXTRA, + lambda state: logic.zerg_pass_vents(state)), + LocationData("Domination", "Domination: Victory", SC2HOTS_LOC_ID_OFFSET + 700, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Domination", "Domination: Center Infested Command Center", SC2HOTS_LOC_ID_OFFSET + 701, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Domination", "Domination: North Infested Command Center", SC2HOTS_LOC_ID_OFFSET + 702, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Domination", "Domination: Repel Zagara", SC2HOTS_LOC_ID_OFFSET + 703, LocationType.EXTRA), + LocationData("Domination", "Domination: Close Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 704, LocationType.EXTRA), + LocationData("Domination", "Domination: South Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 705, LocationType.EXTRA, + lambda state: adv_tactics or logic.zerg_common_unit(state)), + LocationData("Domination", "Domination: Southwest Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 706, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Domination", "Domination: Southeast Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 707, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and logic.zerg_basic_anti_air(state)), + LocationData("Domination", "Domination: North Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 708, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Domination", "Domination: Northeast Baneling Nest", SC2HOTS_LOC_ID_OFFSET + 709, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Fire in the Sky", "Fire in the Sky: Victory", SC2HOTS_LOC_ID_OFFSET + 800, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: West Biomass", SC2HOTS_LOC_ID_OFFSET + 801, LocationType.VANILLA), + LocationData("Fire in the Sky", "Fire in the Sky: North Biomass", SC2HOTS_LOC_ID_OFFSET + 802, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: South Biomass", SC2HOTS_LOC_ID_OFFSET + 803, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: Destroy 3 Gorgons", SC2HOTS_LOC_ID_OFFSET + 804, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: Close Zerg Rescue", SC2HOTS_LOC_ID_OFFSET + 805, LocationType.EXTRA), + LocationData("Fire in the Sky", "Fire in the Sky: South Zerg Rescue", SC2HOTS_LOC_ID_OFFSET + 806, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state)), + LocationData("Fire in the Sky", "Fire in the Sky: North Zerg Rescue", SC2HOTS_LOC_ID_OFFSET + 807, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: West Queen Rescue", SC2HOTS_LOC_ID_OFFSET + 808, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Fire in the Sky", "Fire in the Sky: East Queen Rescue", SC2HOTS_LOC_ID_OFFSET + 809, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Old Soldiers", "Old Soldiers: Victory", SC2HOTS_LOC_ID_OFFSET + 900, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Old Soldiers", "Old Soldiers: East Science Lab", SC2HOTS_LOC_ID_OFFSET + 901, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Old Soldiers", "Old Soldiers: North Science Lab", SC2HOTS_LOC_ID_OFFSET + 902, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Old Soldiers", "Old Soldiers: Get Nuked", SC2HOTS_LOC_ID_OFFSET + 903, LocationType.EXTRA), + LocationData("Old Soldiers", "Old Soldiers: Entrance Gate", SC2HOTS_LOC_ID_OFFSET + 904, LocationType.EXTRA), + LocationData("Old Soldiers", "Old Soldiers: Citadel Gate", SC2HOTS_LOC_ID_OFFSET + 905, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Old Soldiers", "Old Soldiers: South Expansion", SC2HOTS_LOC_ID_OFFSET + 906, LocationType.EXTRA), + LocationData("Old Soldiers", "Old Soldiers: Rich Mineral Expansion", SC2HOTS_LOC_ID_OFFSET + 907, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: Victory", SC2HOTS_LOC_ID_OFFSET + 1000, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: Center Essence Pool", SC2HOTS_LOC_ID_OFFSET + 1001, LocationType.VANILLA), + LocationData("Waking the Ancient", "Waking the Ancient: East Essence Pool", SC2HOTS_LOC_ID_OFFSET + 1002, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + (adv_tactics and logic.zerg_basic_anti_air(state) + or logic.zerg_competent_anti_air(state))), + LocationData("Waking the Ancient", "Waking the Ancient: South Essence Pool", SC2HOTS_LOC_ID_OFFSET + 1003, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + (adv_tactics and logic.zerg_basic_anti_air(state) + or logic.zerg_competent_anti_air(state))), + LocationData("Waking the Ancient", "Waking the Ancient: Finish Feeding", SC2HOTS_LOC_ID_OFFSET + 1004, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: South Proxy Primal Hive", SC2HOTS_LOC_ID_OFFSET + 1005, LocationType.CHALLENGE, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: East Proxy Primal Hive", SC2HOTS_LOC_ID_OFFSET + 1006, LocationType.CHALLENGE, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: South Main Primal Hive", SC2HOTS_LOC_ID_OFFSET + 1007, LocationType.CHALLENGE, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Waking the Ancient", "Waking the Ancient: East Main Primal Hive", SC2HOTS_LOC_ID_OFFSET + 1008, LocationType.CHALLENGE, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: Victory", SC2HOTS_LOC_ID_OFFSET + 1100, LocationType.VICTORY, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: Tyrannozor", SC2HOTS_LOC_ID_OFFSET + 1101, LocationType.VANILLA, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: Reach the Pool", SC2HOTS_LOC_ID_OFFSET + 1102, LocationType.VANILLA), + LocationData("The Crucible", "The Crucible: 15 Minutes Remaining", SC2HOTS_LOC_ID_OFFSET + 1103, LocationType.EXTRA, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: 5 Minutes Remaining", SC2HOTS_LOC_ID_OFFSET + 1104, LocationType.EXTRA, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: Pincer Attack", SC2HOTS_LOC_ID_OFFSET + 1105, LocationType.EXTRA, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Crucible", "The Crucible: Yagdra Claims Brakk's Pack", SC2HOTS_LOC_ID_OFFSET + 1106, LocationType.EXTRA, + lambda state: logic.zerg_competent_defense(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Supreme", "Supreme: Victory", SC2HOTS_LOC_ID_OFFSET + 1200, LocationType.VICTORY, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: First Relic", SC2HOTS_LOC_ID_OFFSET + 1201, LocationType.VANILLA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Second Relic", SC2HOTS_LOC_ID_OFFSET + 1202, LocationType.VANILLA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Third Relic", SC2HOTS_LOC_ID_OFFSET + 1203, LocationType.VANILLA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Fourth Relic", SC2HOTS_LOC_ID_OFFSET + 1204, LocationType.VANILLA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Yagdra", SC2HOTS_LOC_ID_OFFSET + 1205, LocationType.EXTRA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Kraith", SC2HOTS_LOC_ID_OFFSET + 1206, LocationType.EXTRA, + lambda state: logic.supreme_requirement(state)), + LocationData("Supreme", "Supreme: Slivan", SC2HOTS_LOC_ID_OFFSET + 1207, LocationType.EXTRA, + lambda state: logic.supreme_requirement(state)), + LocationData("Infested", "Infested: Victory", SC2HOTS_LOC_ID_OFFSET + 1300, LocationType.VICTORY, + lambda state: logic.zerg_common_unit(state) and + ((logic.zerg_competent_anti_air(state) and state.has(ItemNames.INFESTOR, player)) or + (adv_tactics and logic.zerg_basic_anti_air(state)))), + LocationData("Infested", "Infested: East Science Facility", SC2HOTS_LOC_ID_OFFSET + 1301, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Infested", "Infested: Center Science Facility", SC2HOTS_LOC_ID_OFFSET + 1302, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Infested", "Infested: West Science Facility", SC2HOTS_LOC_ID_OFFSET + 1303, LocationType.VANILLA, + lambda state: logic.zerg_common_unit(state) and + logic.zerg_basic_anti_air(state) and + logic.spread_creep(state)), + LocationData("Infested", "Infested: First Intro Garrison", SC2HOTS_LOC_ID_OFFSET + 1304, LocationType.EXTRA), + LocationData("Infested", "Infested: Second Intro Garrison", SC2HOTS_LOC_ID_OFFSET + 1305, LocationType.EXTRA), + LocationData("Infested", "Infested: Base Garrison", SC2HOTS_LOC_ID_OFFSET + 1306, LocationType.EXTRA), + LocationData("Infested", "Infested: East Garrison", SC2HOTS_LOC_ID_OFFSET + 1307, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state) + and (adv_tactics or state.has(ItemNames.INFESTOR, player))), + LocationData("Infested", "Infested: Mid Garrison", SC2HOTS_LOC_ID_OFFSET + 1308, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state) + and (adv_tactics or state.has(ItemNames.INFESTOR, player))), + LocationData("Infested", "Infested: North Garrison", SC2HOTS_LOC_ID_OFFSET + 1309, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state) + and (adv_tactics or state.has(ItemNames.INFESTOR, player))), + LocationData("Infested", "Infested: Close Southwest Garrison", SC2HOTS_LOC_ID_OFFSET + 1310, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state) + and (adv_tactics or state.has(ItemNames.INFESTOR, player))), + LocationData("Infested", "Infested: Far Southwest Garrison", SC2HOTS_LOC_ID_OFFSET + 1311, LocationType.EXTRA, + lambda state: logic.zerg_common_unit(state) + and logic.zerg_basic_anti_air(state) + and (adv_tactics or state.has(ItemNames.INFESTOR, player))), + LocationData("Hand of Darkness", "Hand of Darkness: Victory", SC2HOTS_LOC_ID_OFFSET + 1400, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: North Brutalisk", SC2HOTS_LOC_ID_OFFSET + 1401, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: South Brutalisk", SC2HOTS_LOC_ID_OFFSET + 1402, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 1 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1403, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 2 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1404, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 3 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1405, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 4 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1406, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 5 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1407, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 6 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1408, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Hand of Darkness", "Hand of Darkness: Kill 7 Hybrid", SC2HOTS_LOC_ID_OFFSET + 1409, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_basic_anti_air(state)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Victory", SC2HOTS_LOC_ID_OFFSET + 1500, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Northwest Crystal", SC2HOTS_LOC_ID_OFFSET + 1501, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Northeast Crystal", SC2HOTS_LOC_ID_OFFSET + 1502, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: South Crystal", SC2HOTS_LOC_ID_OFFSET + 1503, LocationType.VANILLA), + LocationData("Phantoms of the Void", "Phantoms of the Void: Base Established", SC2HOTS_LOC_ID_OFFSET + 1504, LocationType.EXTRA), + LocationData("Phantoms of the Void", "Phantoms of the Void: Close Temple", SC2HOTS_LOC_ID_OFFSET + 1505, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Mid Temple", SC2HOTS_LOC_ID_OFFSET + 1506, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Southeast Temple", SC2HOTS_LOC_ID_OFFSET + 1507, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Northeast Temple", SC2HOTS_LOC_ID_OFFSET + 1508, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("Phantoms of the Void", "Phantoms of the Void: Northwest Temple", SC2HOTS_LOC_ID_OFFSET + 1509, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + (logic.zerg_competent_anti_air(state) or adv_tactics)), + LocationData("With Friends Like These", "With Friends Like These: Victory", SC2HOTS_LOC_ID_OFFSET + 1600, LocationType.VICTORY), + LocationData("With Friends Like These", "With Friends Like These: Pirate Capital Ship", SC2HOTS_LOC_ID_OFFSET + 1601, LocationType.VANILLA), + LocationData("With Friends Like These", "With Friends Like These: First Mineral Patch", SC2HOTS_LOC_ID_OFFSET + 1602, LocationType.VANILLA), + LocationData("With Friends Like These", "With Friends Like These: Second Mineral Patch", SC2HOTS_LOC_ID_OFFSET + 1603, LocationType.VANILLA), + LocationData("With Friends Like These", "With Friends Like These: Third Mineral Patch", SC2HOTS_LOC_ID_OFFSET + 1604, LocationType.VANILLA), + LocationData("Conviction", "Conviction: Victory", SC2HOTS_LOC_ID_OFFSET + 1700, LocationType.VICTORY, + lambda state: logic.two_kerrigan_actives(state) and + (logic.basic_kerrigan(state) or logic.story_tech_granted) or kerriganless), + LocationData("Conviction", "Conviction: First Secret Documents", SC2HOTS_LOC_ID_OFFSET + 1701, LocationType.VANILLA, + lambda state: logic.two_kerrigan_actives(state) or kerriganless), + LocationData("Conviction", "Conviction: Second Secret Documents", SC2HOTS_LOC_ID_OFFSET + 1702, LocationType.VANILLA, + lambda state: logic.two_kerrigan_actives(state) and + (logic.basic_kerrigan(state) or logic.story_tech_granted) or kerriganless), + LocationData("Conviction", "Conviction: Power Coupling", SC2HOTS_LOC_ID_OFFSET + 1703, LocationType.EXTRA, + lambda state: logic.two_kerrigan_actives(state) or kerriganless), + LocationData("Conviction", "Conviction: Door Blasted", SC2HOTS_LOC_ID_OFFSET + 1704, LocationType.EXTRA, + lambda state: logic.two_kerrigan_actives(state) or kerriganless), + LocationData("Planetfall", "Planetfall: Victory", SC2HOTS_LOC_ID_OFFSET + 1800, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: East Gate", SC2HOTS_LOC_ID_OFFSET + 1801, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: Northwest Gate", SC2HOTS_LOC_ID_OFFSET + 1802, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: North Gate", SC2HOTS_LOC_ID_OFFSET + 1803, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: 1 Bile Launcher Deployed", SC2HOTS_LOC_ID_OFFSET + 1804, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: 2 Bile Launchers Deployed", SC2HOTS_LOC_ID_OFFSET + 1805, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: 3 Bile Launchers Deployed", SC2HOTS_LOC_ID_OFFSET + 1806, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: 4 Bile Launchers Deployed", SC2HOTS_LOC_ID_OFFSET + 1807, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: 5 Bile Launchers Deployed", SC2HOTS_LOC_ID_OFFSET + 1808, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: Sons of Korhal", SC2HOTS_LOC_ID_OFFSET + 1809, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: Night Wolves", SC2HOTS_LOC_ID_OFFSET + 1810, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: West Expansion", SC2HOTS_LOC_ID_OFFSET + 1811, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Planetfall", "Planetfall: Mid Expansion", SC2HOTS_LOC_ID_OFFSET + 1812, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Death From Above", "Death From Above: Victory", SC2HOTS_LOC_ID_OFFSET + 1900, LocationType.VICTORY, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Death From Above", "Death From Above: First Power Link", SC2HOTS_LOC_ID_OFFSET + 1901, LocationType.VANILLA), + LocationData("Death From Above", "Death From Above: Second Power Link", SC2HOTS_LOC_ID_OFFSET + 1902, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Death From Above", "Death From Above: Third Power Link", SC2HOTS_LOC_ID_OFFSET + 1903, LocationType.VANILLA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Death From Above", "Death From Above: Expansion Command Center", SC2HOTS_LOC_ID_OFFSET + 1904, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("Death From Above", "Death From Above: Main Path Command Center", SC2HOTS_LOC_ID_OFFSET + 1905, LocationType.EXTRA, + lambda state: logic.zerg_competent_comp(state) and + logic.zerg_competent_anti_air(state)), + LocationData("The Reckoning", "The Reckoning: Victory", SC2HOTS_LOC_ID_OFFSET + 2000, LocationType.VICTORY, + lambda state: logic.the_reckoning_requirement(state)), + LocationData("The Reckoning", "The Reckoning: South Lane", SC2HOTS_LOC_ID_OFFSET + 2001, LocationType.VANILLA, + lambda state: logic.the_reckoning_requirement(state)), + LocationData("The Reckoning", "The Reckoning: North Lane", SC2HOTS_LOC_ID_OFFSET + 2002, LocationType.VANILLA, + lambda state: logic.the_reckoning_requirement(state)), + LocationData("The Reckoning", "The Reckoning: East Lane", SC2HOTS_LOC_ID_OFFSET + 2003, LocationType.VANILLA, + lambda state: logic.the_reckoning_requirement(state)), + LocationData("The Reckoning", "The Reckoning: Odin", SC2HOTS_LOC_ID_OFFSET + 2004, LocationType.EXTRA, + lambda state: logic.the_reckoning_requirement(state)), + + # LotV Prologue + LocationData("Dark Whispers", "Dark Whispers: Victory", SC2LOTV_LOC_ID_OFFSET + 100, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_basic_anti_air(state)), + LocationData("Dark Whispers", "Dark Whispers: First Prisoner Group", SC2LOTV_LOC_ID_OFFSET + 101, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_basic_anti_air(state)), + LocationData("Dark Whispers", "Dark Whispers: Second Prisoner Group", SC2LOTV_LOC_ID_OFFSET + 102, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_basic_anti_air(state)), + LocationData("Dark Whispers", "Dark Whispers: First Pylon", SC2LOTV_LOC_ID_OFFSET + 103, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_basic_anti_air(state)), + LocationData("Dark Whispers", "Dark Whispers: Second Pylon", SC2LOTV_LOC_ID_OFFSET + 104, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_basic_anti_air(state)), + LocationData("Ghosts in the Fog", "Ghosts in the Fog: Victory", SC2LOTV_LOC_ID_OFFSET + 200, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Ghosts in the Fog", "Ghosts in the Fog: South Rock Formation", SC2LOTV_LOC_ID_OFFSET + 201, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Ghosts in the Fog", "Ghosts in the Fog: West Rock Formation", SC2LOTV_LOC_ID_OFFSET + 202, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Ghosts in the Fog", "Ghosts in the Fog: East Rock Formation", SC2LOTV_LOC_ID_OFFSET + 203, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) \ + and logic.protoss_anti_armor_anti_air(state) \ + and logic.protoss_can_attack_behind_chasm(state)), + LocationData("Evil Awoken", "Evil Awoken: Victory", SC2LOTV_LOC_ID_OFFSET + 300, LocationType.VICTORY, + lambda state: adv_tactics or logic.protoss_stalker_upgrade(state)), + LocationData("Evil Awoken", "Evil Awoken: Temple Investigated", SC2LOTV_LOC_ID_OFFSET + 301, LocationType.EXTRA), + LocationData("Evil Awoken", "Evil Awoken: Void Catalyst", SC2LOTV_LOC_ID_OFFSET + 302, LocationType.EXTRA), + LocationData("Evil Awoken", "Evil Awoken: First Particle Cannon", SC2LOTV_LOC_ID_OFFSET + 303, LocationType.VANILLA), + LocationData("Evil Awoken", "Evil Awoken: Second Particle Cannon", SC2LOTV_LOC_ID_OFFSET + 304, LocationType.VANILLA), + LocationData("Evil Awoken", "Evil Awoken: Third Particle Cannon", SC2LOTV_LOC_ID_OFFSET + 305, LocationType.VANILLA), + + + # LotV + LocationData("For Aiur!", "For Aiur!: Victory", SC2LOTV_LOC_ID_OFFSET + 400, LocationType.VICTORY), + LocationData("For Aiur!", "For Aiur!: Southwest Hive", SC2LOTV_LOC_ID_OFFSET + 401, LocationType.VANILLA), + LocationData("For Aiur!", "For Aiur!: Northwest Hive", SC2LOTV_LOC_ID_OFFSET + 402, LocationType.VANILLA), + LocationData("For Aiur!", "For Aiur!: Northeast Hive", SC2LOTV_LOC_ID_OFFSET + 403, LocationType.VANILLA), + LocationData("For Aiur!", "For Aiur!: East Hive", SC2LOTV_LOC_ID_OFFSET + 404, LocationType.VANILLA), + LocationData("For Aiur!", "For Aiur!: West Conduit", SC2LOTV_LOC_ID_OFFSET + 405, LocationType.EXTRA), + LocationData("For Aiur!", "For Aiur!: Middle Conduit", SC2LOTV_LOC_ID_OFFSET + 406, LocationType.EXTRA), + LocationData("For Aiur!", "For Aiur!: Northeast Conduit", SC2LOTV_LOC_ID_OFFSET + 407, LocationType.EXTRA), + LocationData("The Growing Shadow", "The Growing Shadow: Victory", SC2LOTV_LOC_ID_OFFSET + 500, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("The Growing Shadow", "The Growing Shadow: Close Pylon", SC2LOTV_LOC_ID_OFFSET + 501, LocationType.VANILLA), + LocationData("The Growing Shadow", "The Growing Shadow: East Pylon", SC2LOTV_LOC_ID_OFFSET + 502, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("The Growing Shadow", "The Growing Shadow: West Pylon", SC2LOTV_LOC_ID_OFFSET + 503, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("The Growing Shadow", "The Growing Shadow: Nexus", SC2LOTV_LOC_ID_OFFSET + 504, LocationType.EXTRA), + LocationData("The Growing Shadow", "The Growing Shadow: Templar Base", SC2LOTV_LOC_ID_OFFSET + 505, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: Victory", SC2LOTV_LOC_ID_OFFSET + 600, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: Close Warp Gate", SC2LOTV_LOC_ID_OFFSET + 601, LocationType.VANILLA), + LocationData("The Spear of Adun", "The Spear of Adun: West Warp Gate", SC2LOTV_LOC_ID_OFFSET + 602, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: North Warp Gate", SC2LOTV_LOC_ID_OFFSET + 603, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: North Power Cell", SC2LOTV_LOC_ID_OFFSET + 604, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: East Power Cell", SC2LOTV_LOC_ID_OFFSET + 605, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: South Power Cell", SC2LOTV_LOC_ID_OFFSET + 606, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("The Spear of Adun", "The Spear of Adun: Southeast Power Cell", SC2LOTV_LOC_ID_OFFSET + 607, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Victory", SC2LOTV_LOC_ID_OFFSET + 700, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Mid EMP Scrambler", SC2LOTV_LOC_ID_OFFSET + 701, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Southeast EMP Scrambler", SC2LOTV_LOC_ID_OFFSET + 702, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: North EMP Scrambler", SC2LOTV_LOC_ID_OFFSET + 703, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Mid Stabilizer", SC2LOTV_LOC_ID_OFFSET + 704, LocationType.EXTRA), + LocationData("Sky Shield", "Sky Shield: Southwest Stabilizer", SC2LOTV_LOC_ID_OFFSET + 705, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Northwest Stabilizer", SC2LOTV_LOC_ID_OFFSET + 706, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Northeast Stabilizer", SC2LOTV_LOC_ID_OFFSET + 707, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: Southeast Stabilizer", SC2LOTV_LOC_ID_OFFSET + 708, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: West Raynor Base", SC2LOTV_LOC_ID_OFFSET + 709, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Sky Shield", "Sky Shield: East Raynor Base", SC2LOTV_LOC_ID_OFFSET + 710, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_basic_anti_air(state)), + LocationData("Brothers in Arms", "Brothers in Arms: Victory", SC2LOTV_LOC_ID_OFFSET + 800, LocationType.VICTORY, + lambda state: logic.brothers_in_arms_requirement(state)), + LocationData("Brothers in Arms", "Brothers in Arms: Mid Science Facility", SC2LOTV_LOC_ID_OFFSET + 801, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) or logic.take_over_ai_allies), + LocationData("Brothers in Arms", "Brothers in Arms: North Science Facility", SC2LOTV_LOC_ID_OFFSET + 802, LocationType.VANILLA, + lambda state: logic.brothers_in_arms_requirement(state) + or logic.take_over_ai_allies + and logic.advanced_tactics + and ( + logic.terran_common_unit(state) + or logic.protoss_common_unit(state) + ) + ), + LocationData("Brothers in Arms", "Brothers in Arms: South Science Facility", SC2LOTV_LOC_ID_OFFSET + 803, LocationType.VANILLA, + lambda state: logic.brothers_in_arms_requirement(state)), + LocationData("Amon's Reach", "Amon's Reach: Victory", SC2LOTV_LOC_ID_OFFSET + 900, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: Close Solarite Reserve", SC2LOTV_LOC_ID_OFFSET + 901, LocationType.VANILLA), + LocationData("Amon's Reach", "Amon's Reach: North Solarite Reserve", SC2LOTV_LOC_ID_OFFSET + 902, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: East Solarite Reserve", SC2LOTV_LOC_ID_OFFSET + 903, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: West Launch Bay", SC2LOTV_LOC_ID_OFFSET + 904, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: South Launch Bay", SC2LOTV_LOC_ID_OFFSET + 905, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: Northwest Launch Bay", SC2LOTV_LOC_ID_OFFSET + 906, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Amon's Reach", "Amon's Reach: East Launch Bay", SC2LOTV_LOC_ID_OFFSET + 907, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Last Stand", "Last Stand: Victory", SC2LOTV_LOC_ID_OFFSET + 1000, LocationType.VICTORY, + lambda state: logic.last_stand_requirement(state)), + LocationData("Last Stand", "Last Stand: West Zenith Stone", SC2LOTV_LOC_ID_OFFSET + 1001, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state)), + LocationData("Last Stand", "Last Stand: North Zenith Stone", SC2LOTV_LOC_ID_OFFSET + 1002, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state)), + LocationData("Last Stand", "Last Stand: East Zenith Stone", SC2LOTV_LOC_ID_OFFSET + 1003, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state)), + LocationData("Last Stand", "Last Stand: 1 Billion Zerg", SC2LOTV_LOC_ID_OFFSET + 1004, LocationType.EXTRA, + lambda state: logic.last_stand_requirement(state)), + LocationData("Last Stand", "Last Stand: 1.5 Billion Zerg", SC2LOTV_LOC_ID_OFFSET + 1005, LocationType.VANILLA, + lambda state: logic.last_stand_requirement(state) and ( + state.has_all({ItemNames.KHAYDARIN_MONOLITH, ItemNames.PHOTON_CANNON, ItemNames.SHIELD_BATTERY}, player) + or state.has_any({ItemNames.SOA_SOLAR_LANCE, ItemNames.SOA_DEPLOY_FENIX}, player) + )), + LocationData("Forbidden Weapon", "Forbidden Weapon: Victory", SC2LOTV_LOC_ID_OFFSET + 1100, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Forbidden Weapon", "Forbidden Weapon: South Solarite", SC2LOTV_LOC_ID_OFFSET + 1101, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Forbidden Weapon", "Forbidden Weapon: North Solarite", SC2LOTV_LOC_ID_OFFSET + 1102, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Forbidden Weapon", "Forbidden Weapon: Northwest Solarite", SC2LOTV_LOC_ID_OFFSET + 1103, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: Victory", SC2LOTV_LOC_ID_OFFSET + 1200, LocationType.VICTORY, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: Mid Celestial Lock", SC2LOTV_LOC_ID_OFFSET + 1201, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: West Celestial Lock", SC2LOTV_LOC_ID_OFFSET + 1202, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: South Celestial Lock", SC2LOTV_LOC_ID_OFFSET + 1203, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: East Celestial Lock", SC2LOTV_LOC_ID_OFFSET + 1204, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: North Celestial Lock", SC2LOTV_LOC_ID_OFFSET + 1205, LocationType.EXTRA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("Temple of Unification", "Temple of Unification: Titanic Warp Prism", SC2LOTV_LOC_ID_OFFSET + 1206, LocationType.VANILLA, + lambda state: logic.protoss_common_unit(state) + and logic.protoss_anti_armor_anti_air(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: Victory", SC2LOTV_LOC_ID_OFFSET + 1300, LocationType.VICTORY, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: First Hall of Revelation", SC2LOTV_LOC_ID_OFFSET + 1301, LocationType.EXTRA, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: Second Hall of Revelation", SC2LOTV_LOC_ID_OFFSET + 1302, LocationType.EXTRA, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: First Xel'Naga Device", SC2LOTV_LOC_ID_OFFSET + 1303, LocationType.VANILLA, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: Second Xel'Naga Device", SC2LOTV_LOC_ID_OFFSET + 1304, LocationType.VANILLA, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("The Infinite Cycle", "The Infinite Cycle: Third Xel'Naga Device", SC2LOTV_LOC_ID_OFFSET + 1305, LocationType.VANILLA, + lambda state: logic.the_infinite_cycle_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Victory", SC2LOTV_LOC_ID_OFFSET + 1400, LocationType.VICTORY, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Artanis", SC2LOTV_LOC_ID_OFFSET + 1401, LocationType.EXTRA), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Northwest Void Crystal", SC2LOTV_LOC_ID_OFFSET + 1402, LocationType.EXTRA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Northeast Void Crystal", SC2LOTV_LOC_ID_OFFSET + 1403, LocationType.EXTRA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Southwest Void Crystal", SC2LOTV_LOC_ID_OFFSET + 1404, LocationType.EXTRA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Southeast Void Crystal", SC2LOTV_LOC_ID_OFFSET + 1405, LocationType.EXTRA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: South Xel'Naga Vessel", SC2LOTV_LOC_ID_OFFSET + 1406, LocationType.VANILLA), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: Mid Xel'Naga Vessel", SC2LOTV_LOC_ID_OFFSET + 1407, LocationType.VANILLA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Harbinger of Oblivion", "Harbinger of Oblivion: North Xel'Naga Vessel", SC2LOTV_LOC_ID_OFFSET + 1408, LocationType.VANILLA, + lambda state: logic.harbinger_of_oblivion_requirement(state)), + LocationData("Unsealing the Past", "Unsealing the Past: Victory", SC2LOTV_LOC_ID_OFFSET + 1500, LocationType.VICTORY, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: Zerg Cleared", SC2LOTV_LOC_ID_OFFSET + 1501, LocationType.EXTRA), + LocationData("Unsealing the Past", "Unsealing the Past: First Stasis Lock", SC2LOTV_LOC_ID_OFFSET + 1502, LocationType.EXTRA, + lambda state: logic.advanced_tactics \ + or logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: Second Stasis Lock", SC2LOTV_LOC_ID_OFFSET + 1503, LocationType.EXTRA, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: Third Stasis Lock", SC2LOTV_LOC_ID_OFFSET + 1504, LocationType.EXTRA, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: Fourth Stasis Lock", SC2LOTV_LOC_ID_OFFSET + 1505, LocationType.EXTRA, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: South Power Core", SC2LOTV_LOC_ID_OFFSET + 1506, LocationType.VANILLA, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Unsealing the Past", "Unsealing the Past: East Power Core", SC2LOTV_LOC_ID_OFFSET + 1507, LocationType.VANILLA, + lambda state: logic.protoss_basic_splash(state) + and logic.protoss_anti_light_anti_air(state)), + LocationData("Purification", "Purification: Victory", SC2LOTV_LOC_ID_OFFSET + 1600, LocationType.VICTORY, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: North Sector: West Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1601, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: North Sector: Northeast Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1602, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: North Sector: Southeast Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1603, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: South Sector: West Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1604, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: South Sector: North Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1605, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: South Sector: East Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1606, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: West Sector: West Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1607, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: West Sector: Mid Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1608, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: West Sector: East Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1609, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: East Sector: North Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1610, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: East Sector: West Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1611, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: East Sector: South Null Circuit", SC2LOTV_LOC_ID_OFFSET + 1612, LocationType.EXTRA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Purification", "Purification: Purifier Warden", SC2LOTV_LOC_ID_OFFSET + 1613, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Steps of the Rite", "Steps of the Rite: Victory", SC2LOTV_LOC_ID_OFFSET + 1700, LocationType.VICTORY, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: First Terrazine Fog", SC2LOTV_LOC_ID_OFFSET + 1701, LocationType.EXTRA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: Southwest Guardian", SC2LOTV_LOC_ID_OFFSET + 1702, LocationType.EXTRA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: West Guardian", SC2LOTV_LOC_ID_OFFSET + 1703, LocationType.EXTRA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: Northwest Guardian", SC2LOTV_LOC_ID_OFFSET + 1704, LocationType.EXTRA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: Northeast Guardian", SC2LOTV_LOC_ID_OFFSET + 1705, LocationType.EXTRA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: North Mothership", SC2LOTV_LOC_ID_OFFSET + 1706, LocationType.VANILLA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Steps of the Rite", "Steps of the Rite: South Mothership", SC2LOTV_LOC_ID_OFFSET + 1707, LocationType.VANILLA, + lambda state: logic.steps_of_the_rite_requirement(state)), + LocationData("Rak'Shir", "Rak'Shir: Victory", SC2LOTV_LOC_ID_OFFSET + 1800, LocationType.VICTORY, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Rak'Shir", "Rak'Shir: North Slayn Elemental", SC2LOTV_LOC_ID_OFFSET + 1801, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Rak'Shir", "Rak'Shir: Southwest Slayn Elemental", SC2LOTV_LOC_ID_OFFSET + 1802, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Rak'Shir", "Rak'Shir: East Slayn Elemental", SC2LOTV_LOC_ID_OFFSET + 1803, LocationType.VANILLA, + lambda state: logic.protoss_competent_comp(state)), + LocationData("Templar's Charge", "Templar's Charge: Victory", SC2LOTV_LOC_ID_OFFSET + 1900, LocationType.VICTORY, + lambda state: logic.templars_charge_requirement(state)), + LocationData("Templar's Charge", "Templar's Charge: Northwest Power Core", SC2LOTV_LOC_ID_OFFSET + 1901, LocationType.EXTRA, + lambda state: logic.templars_charge_requirement(state)), + LocationData("Templar's Charge", "Templar's Charge: Northeast Power Core", SC2LOTV_LOC_ID_OFFSET + 1902, LocationType.EXTRA, + lambda state: logic.templars_charge_requirement(state)), + LocationData("Templar's Charge", "Templar's Charge: Southeast Power Core", SC2LOTV_LOC_ID_OFFSET + 1903, LocationType.EXTRA, + lambda state: logic.templars_charge_requirement(state)), + LocationData("Templar's Charge", "Templar's Charge: West Hybrid Statis Chamber", SC2LOTV_LOC_ID_OFFSET + 1904, LocationType.VANILLA, + lambda state: logic.templars_charge_requirement(state)), + LocationData("Templar's Charge", "Templar's Charge: Southeast Hybrid Statis Chamber", SC2LOTV_LOC_ID_OFFSET + 1905, LocationType.VANILLA, + lambda state: logic.protoss_fleet(state)), + LocationData("Templar's Return", "Templar's Return: Victory", SC2LOTV_LOC_ID_OFFSET + 2000, LocationType.VICTORY, + lambda state: logic.templars_return_requirement(state)), + LocationData("Templar's Return", "Templar's Return: Citadel: First Gate", SC2LOTV_LOC_ID_OFFSET + 2001, LocationType.EXTRA), + LocationData("Templar's Return", "Templar's Return: Citadel: Second Gate", SC2LOTV_LOC_ID_OFFSET + 2002, LocationType.EXTRA), + LocationData("Templar's Return", "Templar's Return: Citadel: Power Structure", SC2LOTV_LOC_ID_OFFSET + 2003, LocationType.VANILLA), + LocationData("Templar's Return", "Templar's Return: Temple Grounds: Gather Army", SC2LOTV_LOC_ID_OFFSET + 2004, LocationType.VANILLA, + lambda state: logic.templars_return_requirement(state)), + LocationData("Templar's Return", "Templar's Return: Temple Grounds: Power Structure", SC2LOTV_LOC_ID_OFFSET + 2005, LocationType.VANILLA, + lambda state: logic.templars_return_requirement(state)), + LocationData("Templar's Return", "Templar's Return: Caverns: Purifier", SC2LOTV_LOC_ID_OFFSET + 2006, LocationType.EXTRA, + lambda state: logic.templars_return_requirement(state)), + LocationData("Templar's Return", "Templar's Return: Caverns: Dark Templar", SC2LOTV_LOC_ID_OFFSET + 2007, LocationType.EXTRA, + lambda state: logic.templars_return_requirement(state)), + LocationData("The Host", "The Host: Victory", SC2LOTV_LOC_ID_OFFSET + 2100, LocationType.VICTORY, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Southeast Void Shard", SC2LOTV_LOC_ID_OFFSET + 2101, LocationType.VICTORY, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: South Void Shard", SC2LOTV_LOC_ID_OFFSET + 2102, LocationType.EXTRA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Southwest Void Shard", SC2LOTV_LOC_ID_OFFSET + 2103, LocationType.EXTRA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: North Void Shard", SC2LOTV_LOC_ID_OFFSET + 2104, LocationType.EXTRA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Northwest Void Shard", SC2LOTV_LOC_ID_OFFSET + 2105, LocationType.EXTRA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Nerazim Warp in Zone", SC2LOTV_LOC_ID_OFFSET + 2106, LocationType.VANILLA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Tal'darim Warp in Zone", SC2LOTV_LOC_ID_OFFSET + 2107, LocationType.VANILLA, + lambda state: logic.the_host_requirement(state)), + LocationData("The Host", "The Host: Purifier Warp in Zone", SC2LOTV_LOC_ID_OFFSET + 2108, LocationType.VANILLA, + lambda state: logic.the_host_requirement(state)), + LocationData("Salvation", "Salvation: Victory", SC2LOTV_LOC_ID_OFFSET + 2200, LocationType.VICTORY, + lambda state: logic.salvation_requirement(state)), + LocationData("Salvation", "Salvation: Fabrication Matrix", SC2LOTV_LOC_ID_OFFSET + 2201, LocationType.EXTRA, + lambda state: logic.salvation_requirement(state)), + LocationData("Salvation", "Salvation: Assault Cluster", SC2LOTV_LOC_ID_OFFSET + 2202, LocationType.EXTRA, + lambda state: logic.salvation_requirement(state)), + LocationData("Salvation", "Salvation: Hull Breach", SC2LOTV_LOC_ID_OFFSET + 2203, LocationType.EXTRA, + lambda state: logic.salvation_requirement(state)), + LocationData("Salvation", "Salvation: Core Critical", SC2LOTV_LOC_ID_OFFSET + 2204, LocationType.EXTRA, + lambda state: logic.salvation_requirement(state)), + + # Epilogue + LocationData("Into the Void", "Into the Void: Victory", SC2LOTV_LOC_ID_OFFSET + 2300, LocationType.VICTORY, + lambda state: logic.into_the_void_requirement(state)), + LocationData("Into the Void", "Into the Void: Corruption Source", SC2LOTV_LOC_ID_OFFSET + 2301, LocationType.EXTRA), + LocationData("Into the Void", "Into the Void: Southwest Forward Position", SC2LOTV_LOC_ID_OFFSET + 2302, LocationType.VANILLA, + lambda state: logic.into_the_void_requirement(state)), + LocationData("Into the Void", "Into the Void: Northwest Forward Position", SC2LOTV_LOC_ID_OFFSET + 2303, LocationType.VANILLA, + lambda state: logic.into_the_void_requirement(state)), + LocationData("Into the Void", "Into the Void: Southeast Forward Position", SC2LOTV_LOC_ID_OFFSET + 2304, LocationType.VANILLA, + lambda state: logic.into_the_void_requirement(state)), + LocationData("Into the Void", "Into the Void: Northeast Forward Position", SC2LOTV_LOC_ID_OFFSET + 2305, LocationType.VANILLA), + LocationData("The Essence of Eternity", "The Essence of Eternity: Victory", SC2LOTV_LOC_ID_OFFSET + 2400, LocationType.VICTORY, + lambda state: logic.essence_of_eternity_requirement(state)), + LocationData("The Essence of Eternity", "The Essence of Eternity: Void Trashers", SC2LOTV_LOC_ID_OFFSET + 2401, LocationType.EXTRA), + LocationData("Amon's Fall", "Amon's Fall: Victory", SC2LOTV_LOC_ID_OFFSET + 2500, LocationType.VICTORY, + lambda state: logic.amons_fall_requirement(state)), + + # Nova Covert Ops + LocationData("The Escape", "The Escape: Victory", SC2NCO_LOC_ID_OFFSET + 100, LocationType.VICTORY, + lambda state: logic.the_escape_requirement(state)), + LocationData("The Escape", "The Escape: Rifle", SC2NCO_LOC_ID_OFFSET + 101, LocationType.VANILLA, + lambda state: logic.the_escape_first_stage_requirement(state)), + LocationData("The Escape", "The Escape: Grenades", SC2NCO_LOC_ID_OFFSET + 102, LocationType.VANILLA, + lambda state: logic.the_escape_first_stage_requirement(state)), + LocationData("The Escape", "The Escape: Agent Delta", SC2NCO_LOC_ID_OFFSET + 103, LocationType.VANILLA, + lambda state: logic.the_escape_requirement(state)), + LocationData("The Escape", "The Escape: Agent Pierce", SC2NCO_LOC_ID_OFFSET + 104, LocationType.VANILLA, + lambda state: logic.the_escape_requirement(state)), + LocationData("The Escape", "The Escape: Agent Stone", SC2NCO_LOC_ID_OFFSET + 105, LocationType.VANILLA, + lambda state: logic.the_escape_requirement(state)), + LocationData("Sudden Strike", "Sudden Strike: Victory", SC2NCO_LOC_ID_OFFSET + 200, LocationType.VICTORY, + lambda state: logic.sudden_strike_can_reach_objectives(state)), + LocationData("Sudden Strike", "Sudden Strike: Research Center", SC2NCO_LOC_ID_OFFSET + 201, LocationType.VANILLA, + lambda state: logic.sudden_strike_can_reach_objectives(state)), + LocationData("Sudden Strike", "Sudden Strike: Weaponry Labs", SC2NCO_LOC_ID_OFFSET + 202, LocationType.VANILLA, + lambda state: logic.sudden_strike_requirement(state)), + LocationData("Sudden Strike", "Sudden Strike: Brutalisk", SC2NCO_LOC_ID_OFFSET + 203, LocationType.EXTRA, + lambda state: logic.sudden_strike_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Victory", SC2NCO_LOC_ID_OFFSET + 300, LocationType.VICTORY, + lambda state: logic.enemy_intelligence_third_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: West Garrison", SC2NCO_LOC_ID_OFFSET + 301, LocationType.EXTRA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Close Garrison", SC2NCO_LOC_ID_OFFSET + 302, LocationType.EXTRA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Northeast Garrison", SC2NCO_LOC_ID_OFFSET + 303, LocationType.EXTRA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Southeast Garrison", SC2NCO_LOC_ID_OFFSET + 304, LocationType.EXTRA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state) + and logic.enemy_intelligence_cliff_garrison(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: South Garrison", SC2NCO_LOC_ID_OFFSET + 305, LocationType.EXTRA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: All Garrisons", SC2NCO_LOC_ID_OFFSET + 306, LocationType.VANILLA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state) + and logic.enemy_intelligence_cliff_garrison(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Forces Rescued", SC2NCO_LOC_ID_OFFSET + 307, LocationType.VANILLA, + lambda state: logic.enemy_intelligence_first_stage_requirement(state)), + LocationData("Enemy Intelligence", "Enemy Intelligence: Communications Hub", SC2NCO_LOC_ID_OFFSET + 308, LocationType.VANILLA, + lambda state: logic.enemy_intelligence_second_stage_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: Victory", SC2NCO_LOC_ID_OFFSET + 400, LocationType.VICTORY, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: North Base: West Hatchery", SC2NCO_LOC_ID_OFFSET + 401, LocationType.VANILLA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: North Base: North Hatchery", SC2NCO_LOC_ID_OFFSET + 402, LocationType.VANILLA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: North Base: East Hatchery", SC2NCO_LOC_ID_OFFSET + 403, LocationType.VANILLA), + LocationData("Trouble In Paradise", "Trouble In Paradise: South Base: Northwest Hatchery", SC2NCO_LOC_ID_OFFSET + 404, LocationType.VANILLA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: South Base: Southwest Hatchery", SC2NCO_LOC_ID_OFFSET + 405, LocationType.VANILLA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: South Base: East Hatchery", SC2NCO_LOC_ID_OFFSET + 406, LocationType.VANILLA), + LocationData("Trouble In Paradise", "Trouble In Paradise: North Shield Projector", SC2NCO_LOC_ID_OFFSET + 407, LocationType.EXTRA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: East Shield Projector", SC2NCO_LOC_ID_OFFSET + 408, LocationType.EXTRA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: South Shield Projector", SC2NCO_LOC_ID_OFFSET + 409, LocationType.EXTRA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: West Shield Projector", SC2NCO_LOC_ID_OFFSET + 410, LocationType.EXTRA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Trouble In Paradise", "Trouble In Paradise: Fleet Beacon", SC2NCO_LOC_ID_OFFSET + 411, LocationType.VANILLA, + lambda state: logic.trouble_in_paradise_requirement(state)), + LocationData("Night Terrors", "Night Terrors: Victory", SC2NCO_LOC_ID_OFFSET + 500, LocationType.VICTORY, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: 1 Terrazine Node Collected", SC2NCO_LOC_ID_OFFSET + 501, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: 2 Terrazine Nodes Collected", SC2NCO_LOC_ID_OFFSET + 502, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: 3 Terrazine Nodes Collected", SC2NCO_LOC_ID_OFFSET + 503, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: 4 Terrazine Nodes Collected", SC2NCO_LOC_ID_OFFSET + 504, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: 5 Terrazine Nodes Collected", SC2NCO_LOC_ID_OFFSET + 505, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: HERC Outpost", SC2NCO_LOC_ID_OFFSET + 506, LocationType.VANILLA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: Umojan Mine", SC2NCO_LOC_ID_OFFSET + 507, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: Blightbringer", SC2NCO_LOC_ID_OFFSET + 508, LocationType.VANILLA, + lambda state: logic.night_terrors_requirement(state) + and logic.nova_ranged_weapon(state) + and state.has_any( + {ItemNames.NOVA_HELLFIRE_SHOTGUN, ItemNames.NOVA_PULSE_GRENADES, ItemNames.NOVA_STIM_INFUSION, + ItemNames.NOVA_HOLO_DECOY}, player)), + LocationData("Night Terrors", "Night Terrors: Science Facility", SC2NCO_LOC_ID_OFFSET + 509, LocationType.EXTRA, + lambda state: logic.night_terrors_requirement(state)), + LocationData("Night Terrors", "Night Terrors: Eradicators", SC2NCO_LOC_ID_OFFSET + 510, LocationType.VANILLA, + lambda state: logic.night_terrors_requirement(state) + and logic.nova_any_weapon(state)), + LocationData("Flashpoint", "Flashpoint: Victory", SC2NCO_LOC_ID_OFFSET + 600, LocationType.VICTORY, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Close North Evidence Coordinates", SC2NCO_LOC_ID_OFFSET + 601, LocationType.EXTRA, + lambda state: state.has_any( + {ItemNames.LIBERATOR_RAID_ARTILLERY, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, player) + or logic.terran_common_unit(state)), + LocationData("Flashpoint", "Flashpoint: Close East Evidence Coordinates", SC2NCO_LOC_ID_OFFSET + 602, LocationType.EXTRA, + lambda state: state.has_any( + {ItemNames.LIBERATOR_RAID_ARTILLERY, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, player) + or logic.terran_common_unit(state)), + LocationData("Flashpoint", "Flashpoint: Far North Evidence Coordinates", SC2NCO_LOC_ID_OFFSET + 603, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Far East Evidence Coordinates", SC2NCO_LOC_ID_OFFSET + 604, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Experimental Weapon", SC2NCO_LOC_ID_OFFSET + 605, LocationType.VANILLA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Northwest Subway Entrance", SC2NCO_LOC_ID_OFFSET + 606, LocationType.VANILLA, + lambda state: state.has_any( + {ItemNames.LIBERATOR_RAID_ARTILLERY, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, player) + and logic.terran_common_unit(state) + or logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Southeast Subway Entrance", SC2NCO_LOC_ID_OFFSET + 607, LocationType.VANILLA, + lambda state: state.has_any( + {ItemNames.LIBERATOR_RAID_ARTILLERY, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, player) + and logic.terran_common_unit(state) + or logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Northeast Subway Entrance", SC2NCO_LOC_ID_OFFSET + 608, LocationType.VANILLA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Expansion Hatchery", SC2NCO_LOC_ID_OFFSET + 609, LocationType.EXTRA, + lambda state: state.has(ItemNames.LIBERATOR_RAID_ARTILLERY, player) and logic.terran_common_unit(state) + or logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Baneling Spawns", SC2NCO_LOC_ID_OFFSET + 610, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Mutalisk Spawns", SC2NCO_LOC_ID_OFFSET + 611, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Nydus Worm Spawns", SC2NCO_LOC_ID_OFFSET + 612, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Lurker Spawns", SC2NCO_LOC_ID_OFFSET + 613, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Brood Lord Spawns", SC2NCO_LOC_ID_OFFSET + 614, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("Flashpoint", "Flashpoint: Ultralisk Spawns", SC2NCO_LOC_ID_OFFSET + 615, LocationType.EXTRA, + lambda state: logic.flashpoint_far_requirement(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Victory", SC2NCO_LOC_ID_OFFSET + 700, LocationType.VICTORY, + lambda state: logic.enemy_shadow_victory(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Sewers: Domination Visor", SC2NCO_LOC_ID_OFFSET + 701, LocationType.VANILLA, + lambda state: logic.enemy_shadow_domination(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Sewers: Resupply Crate", SC2NCO_LOC_ID_OFFSET + 702, LocationType.EXTRA, + lambda state: logic.enemy_shadow_first_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Sewers: Facility Access", SC2NCO_LOC_ID_OFFSET + 703, LocationType.VANILLA, + lambda state: logic.enemy_shadow_first_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Northwest Door Lock", SC2NCO_LOC_ID_OFFSET + 704, LocationType.VANILLA, + lambda state: logic.enemy_shadow_door_controls(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Southeast Door Lock", SC2NCO_LOC_ID_OFFSET + 705, LocationType.VANILLA, + lambda state: logic.enemy_shadow_door_controls(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Blazefire Gunblade", SC2NCO_LOC_ID_OFFSET + 706, LocationType.VANILLA, + lambda state: logic.enemy_shadow_second_stage(state) + and (story_tech_granted + or state.has(ItemNames.NOVA_BLINK, player) + or (adv_tactics and state.has_all({ItemNames.NOVA_DOMINATION, ItemNames.NOVA_HOLO_DECOY, ItemNames.NOVA_JUMP_SUIT_MODULE}, player)) + ) + ), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Blink Suit", SC2NCO_LOC_ID_OFFSET + 707, LocationType.VANILLA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Advanced Weaponry", SC2NCO_LOC_ID_OFFSET + 708, LocationType.VANILLA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: Entrance Resupply Crate", SC2NCO_LOC_ID_OFFSET + 709, LocationType.EXTRA, + lambda state: logic.enemy_shadow_first_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: West Resupply Crate", SC2NCO_LOC_ID_OFFSET + 710, LocationType.EXTRA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: North Resupply Crate", SC2NCO_LOC_ID_OFFSET + 711, LocationType.EXTRA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: East Resupply Crate", SC2NCO_LOC_ID_OFFSET + 712, LocationType.EXTRA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("In the Enemy's Shadow", "In the Enemy's Shadow: Facility: South Resupply Crate", SC2NCO_LOC_ID_OFFSET + 713, LocationType.EXTRA, + lambda state: logic.enemy_shadow_second_stage(state)), + LocationData("Dark Skies", "Dark Skies: Victory", SC2NCO_LOC_ID_OFFSET + 800, LocationType.VICTORY, + lambda state: logic.dark_skies_requirement(state)), + LocationData("Dark Skies", "Dark Skies: First Squadron of Dominion Fleet", SC2NCO_LOC_ID_OFFSET + 801, LocationType.EXTRA, + lambda state: logic.dark_skies_requirement(state)), + LocationData("Dark Skies", "Dark Skies: Remainder of Dominion Fleet", SC2NCO_LOC_ID_OFFSET + 802, LocationType.EXTRA, + lambda state: logic.dark_skies_requirement(state)), + LocationData("Dark Skies", "Dark Skies: Ji'nara", SC2NCO_LOC_ID_OFFSET + 803, LocationType.EXTRA, + lambda state: logic.dark_skies_requirement(state)), + LocationData("Dark Skies", "Dark Skies: Science Facility", SC2NCO_LOC_ID_OFFSET + 804, LocationType.VANILLA, + lambda state: logic.dark_skies_requirement(state)), + LocationData("End Game", "End Game: Victory", SC2NCO_LOC_ID_OFFSET + 900, LocationType.VICTORY, + lambda state: logic.end_game_requirement(state) and logic.nova_any_weapon(state)), + LocationData("End Game", "End Game: Xanthos", SC2NCO_LOC_ID_OFFSET + 901, LocationType.VANILLA, + lambda state: logic.end_game_requirement(state)), + ] + + beat_events = [] + # Filtering out excluded locations + if world is not None: + excluded_location_types = get_location_types(world, LocationInclusion.option_disabled) + plando_locations = get_plando_locations(world) + exclude_locations = get_option_value(world, "exclude_locations") + location_table = [location for location in location_table + if (LocationType is LocationType.VICTORY or location.name not in exclude_locations) + and location.type not in excluded_location_types + or location.name in plando_locations] + for i, location_data in enumerate(location_table): + # Removing all item-based logic on No Logic + if logic_level == RequiredTactics.option_no_logic: + location_data = location_data._replace(rule=Location.access_rule) + location_table[i] = location_data + # Generating Beat event locations + if location_data.name.endswith((": Victory", ": Defeat")): + beat_events.append( + location_data._replace(name="Beat " + location_data.name.rsplit(": ", 1)[0], code=None) + ) + return tuple(location_table + beat_events) + +lookup_location_id_to_type = {loc.code: loc.type for loc in get_locations(None) if loc.code is not None} \ No newline at end of file diff --git a/worlds/sc2/MissionTables.py b/worlds/sc2/MissionTables.py new file mode 100644 index 000000000000..99b6448aff35 --- /dev/null +++ b/worlds/sc2/MissionTables.py @@ -0,0 +1,737 @@ +from typing import NamedTuple, Dict, List, Set, Union, Literal, Iterable, Callable +from enum import IntEnum, Enum + + +class SC2Race(IntEnum): + ANY = 0 + TERRAN = 1 + ZERG = 2 + PROTOSS = 3 + + +class MissionPools(IntEnum): + STARTER = 0 + EASY = 1 + MEDIUM = 2 + HARD = 3 + VERY_HARD = 4 + FINAL = 5 + + +class SC2CampaignGoalPriority(IntEnum): + """ + Campaign's priority to goal election + """ + NONE = 0 + MINI_CAMPAIGN = 1 # A goal shouldn't be in a mini-campaign if there's at least one 'big' campaign + HARD = 2 # A campaign ending with a hard mission + VERY_HARD = 3 # A campaign ending with a very hard mission + EPILOGUE = 4 # Epilogue shall be always preferred as the goal if present + + +class SC2Campaign(Enum): + + def __new__(cls, *args, **kwargs): + value = len(cls.__members__) + 1 + obj = object.__new__(cls) + obj._value_ = value + return obj + + def __init__(self, campaign_id: int, name: str, goal_priority: SC2CampaignGoalPriority, race: SC2Race): + self.id = campaign_id + self.campaign_name = name + self.goal_priority = goal_priority + self.race = race + + GLOBAL = 0, "Global", SC2CampaignGoalPriority.NONE, SC2Race.ANY + WOL = 1, "Wings of Liberty", SC2CampaignGoalPriority.VERY_HARD, SC2Race.TERRAN + PROPHECY = 2, "Prophecy", SC2CampaignGoalPriority.MINI_CAMPAIGN, SC2Race.PROTOSS + HOTS = 3, "Heart of the Swarm", SC2CampaignGoalPriority.HARD, SC2Race.ZERG + PROLOGUE = 4, "Whispers of Oblivion (Legacy of the Void: Prologue)", SC2CampaignGoalPriority.MINI_CAMPAIGN, SC2Race.PROTOSS + LOTV = 5, "Legacy of the Void", SC2CampaignGoalPriority.VERY_HARD, SC2Race.PROTOSS + EPILOGUE = 6, "Into the Void (Legacy of the Void: Epilogue)", SC2CampaignGoalPriority.EPILOGUE, SC2Race.ANY + NCO = 7, "Nova Covert Ops", SC2CampaignGoalPriority.HARD, SC2Race.TERRAN + + +class SC2Mission(Enum): + + def __new__(cls, *args, **kwargs): + value = len(cls.__members__) + 1 + obj = object.__new__(cls) + obj._value_ = value + return obj + + def __init__(self, mission_id: int, name: str, campaign: SC2Campaign, area: str, race: SC2Race, pool: MissionPools, map_file: str, build: bool = True): + self.id = mission_id + self.mission_name = name + self.campaign = campaign + self.area = area + self.race = race + self.pool = pool + self.map_file = map_file + self.build = build + + # Wings of Liberty + LIBERATION_DAY = 1, "Liberation Day", SC2Campaign.WOL, "Mar Sara", SC2Race.ANY, MissionPools.STARTER, "ap_liberation_day", False + THE_OUTLAWS = 2, "The Outlaws", SC2Campaign.WOL, "Mar Sara", SC2Race.TERRAN, MissionPools.EASY, "ap_the_outlaws" + ZERO_HOUR = 3, "Zero Hour", SC2Campaign.WOL, "Mar Sara", SC2Race.TERRAN, MissionPools.EASY, "ap_zero_hour" + EVACUATION = 4, "Evacuation", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.EASY, "ap_evacuation" + OUTBREAK = 5, "Outbreak", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.EASY, "ap_outbreak" + SAFE_HAVEN = 6, "Safe Haven", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_safe_haven" + HAVENS_FALL = 7, "Haven's Fall", SC2Campaign.WOL, "Colonist", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_havens_fall" + SMASH_AND_GRAB = 8, "Smash and Grab", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.EASY, "ap_smash_and_grab" + THE_DIG = 9, "The Dig", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_dig" + THE_MOEBIUS_FACTOR = 10, "The Moebius Factor", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_moebius_factor" + SUPERNOVA = 11, "Supernova", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.HARD, "ap_supernova" + MAW_OF_THE_VOID = 12, "Maw of the Void", SC2Campaign.WOL, "Artifact", SC2Race.TERRAN, MissionPools.HARD, "ap_maw_of_the_void" + DEVILS_PLAYGROUND = 13, "Devil's Playground", SC2Campaign.WOL, "Covert", SC2Race.TERRAN, MissionPools.EASY, "ap_devils_playground" + WELCOME_TO_THE_JUNGLE = 14, "Welcome to the Jungle", SC2Campaign.WOL, "Covert", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_welcome_to_the_jungle" + BREAKOUT = 15, "Breakout", SC2Campaign.WOL, "Covert", SC2Race.ANY, MissionPools.STARTER, "ap_breakout", False + GHOST_OF_A_CHANCE = 16, "Ghost of a Chance", SC2Campaign.WOL, "Covert", SC2Race.ANY, MissionPools.STARTER, "ap_ghost_of_a_chance", False + THE_GREAT_TRAIN_ROBBERY = 17, "The Great Train Robbery", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_the_great_train_robbery" + CUTTHROAT = 18, "Cutthroat", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_cutthroat" + ENGINE_OF_DESTRUCTION = 19, "Engine of Destruction", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.HARD, "ap_engine_of_destruction" + MEDIA_BLITZ = 20, "Media Blitz", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_media_blitz" + PIERCING_OF_THE_SHROUD = 21, "Piercing the Shroud", SC2Campaign.WOL, "Rebellion", SC2Race.TERRAN, MissionPools.STARTER, "ap_piercing_the_shroud", False + GATES_OF_HELL = 26, "Gates of Hell", SC2Campaign.WOL, "Char", SC2Race.TERRAN, MissionPools.HARD, "ap_gates_of_hell" + BELLY_OF_THE_BEAST = 27, "Belly of the Beast", SC2Campaign.WOL, "Char", SC2Race.ANY, MissionPools.STARTER, "ap_belly_of_the_beast", False + SHATTER_THE_SKY = 28, "Shatter the Sky", SC2Campaign.WOL, "Char", SC2Race.TERRAN, MissionPools.HARD, "ap_shatter_the_sky" + ALL_IN = 29, "All-In", SC2Campaign.WOL, "Char", SC2Race.TERRAN, MissionPools.VERY_HARD, "ap_all_in" + + # Prophecy + WHISPERS_OF_DOOM = 22, "Whispers of Doom", SC2Campaign.PROPHECY, "_1", SC2Race.ANY, MissionPools.STARTER, "ap_whispers_of_doom", False + A_SINISTER_TURN = 23, "A Sinister Turn", SC2Campaign.PROPHECY, "_2", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_a_sinister_turn" + ECHOES_OF_THE_FUTURE = 24, "Echoes of the Future", SC2Campaign.PROPHECY, "_3", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_echoes_of_the_future" + IN_UTTER_DARKNESS = 25, "In Utter Darkness", SC2Campaign.PROPHECY, "_4", SC2Race.PROTOSS, MissionPools.HARD, "ap_in_utter_darkness" + + # Heart of the Swarm + LAB_RAT = 30, "Lab Rat", SC2Campaign.HOTS, "Umoja", SC2Race.ZERG, MissionPools.STARTER, "ap_lab_rat" + BACK_IN_THE_SADDLE = 31, "Back in the Saddle", SC2Campaign.HOTS, "Umoja", SC2Race.ANY, MissionPools.STARTER, "ap_back_in_the_saddle", False + RENDEZVOUS = 32, "Rendezvous", SC2Campaign.HOTS, "Umoja", SC2Race.ZERG, MissionPools.EASY, "ap_rendezvous" + HARVEST_OF_SCREAMS = 33, "Harvest of Screams", SC2Campaign.HOTS, "Kaldir", SC2Race.ZERG, MissionPools.EASY, "ap_harvest_of_screams" + SHOOT_THE_MESSENGER = 34, "Shoot the Messenger", SC2Campaign.HOTS, "Kaldir", SC2Race.ZERG, MissionPools.EASY, "ap_shoot_the_messenger" + ENEMY_WITHIN = 35, "Enemy Within", SC2Campaign.HOTS, "Kaldir", SC2Race.ANY, MissionPools.EASY, "ap_enemy_within", False + DOMINATION = 36, "Domination", SC2Campaign.HOTS, "Char", SC2Race.ZERG, MissionPools.EASY, "ap_domination" + FIRE_IN_THE_SKY = 37, "Fire in the Sky", SC2Campaign.HOTS, "Char", SC2Race.ZERG, MissionPools.MEDIUM, "ap_fire_in_the_sky" + OLD_SOLDIERS = 38, "Old Soldiers", SC2Campaign.HOTS, "Char", SC2Race.ZERG, MissionPools.MEDIUM, "ap_old_soldiers" + WAKING_THE_ANCIENT = 39, "Waking the Ancient", SC2Campaign.HOTS, "Zerus", SC2Race.ZERG, MissionPools.MEDIUM, "ap_waking_the_ancient" + THE_CRUCIBLE = 40, "The Crucible", SC2Campaign.HOTS, "Zerus", SC2Race.ZERG, MissionPools.MEDIUM, "ap_the_crucible" + SUPREME = 41, "Supreme", SC2Campaign.HOTS, "Zerus", SC2Race.ANY, MissionPools.MEDIUM, "ap_supreme", False + INFESTED = 42, "Infested", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.MEDIUM, "ap_infested" + HAND_OF_DARKNESS = 43, "Hand of Darkness", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_hand_of_darkness" + PHANTOMS_OF_THE_VOID = 44, "Phantoms of the Void", SC2Campaign.HOTS, "Skygeirr Station", SC2Race.ZERG, MissionPools.HARD, "ap_phantoms_of_the_void" + WITH_FRIENDS_LIKE_THESE = 45, "With Friends Like These", SC2Campaign.HOTS, "Dominion Space", SC2Race.ANY, MissionPools.STARTER, "ap_with_friends_like_these", False + CONVICTION = 46, "Conviction", SC2Campaign.HOTS, "Dominion Space", SC2Race.ANY, MissionPools.MEDIUM, "ap_conviction", False + PLANETFALL = 47, "Planetfall", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_planetfall" + DEATH_FROM_ABOVE = 48, "Death From Above", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_death_from_above" + THE_RECKONING = 49, "The Reckoning", SC2Campaign.HOTS, "Korhal", SC2Race.ZERG, MissionPools.HARD, "ap_the_reckoning" + + # Prologue + DARK_WHISPERS = 50, "Dark Whispers", SC2Campaign.PROLOGUE, "_1", SC2Race.PROTOSS, MissionPools.EASY, "ap_dark_whispers" + GHOSTS_IN_THE_FOG = 51, "Ghosts in the Fog", SC2Campaign.PROLOGUE, "_2", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_ghosts_in_the_fog" + EVIL_AWOKEN = 52, "Evil Awoken", SC2Campaign.PROLOGUE, "_3", SC2Race.PROTOSS, MissionPools.STARTER, "ap_evil_awoken", False + + # LotV + FOR_AIUR = 53, "For Aiur!", SC2Campaign.LOTV, "Aiur", SC2Race.ANY, MissionPools.STARTER, "ap_for_aiur", False + THE_GROWING_SHADOW = 54, "The Growing Shadow", SC2Campaign.LOTV, "Aiur", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_growing_shadow" + THE_SPEAR_OF_ADUN = 55, "The Spear of Adun", SC2Campaign.LOTV, "Aiur", SC2Race.PROTOSS, MissionPools.EASY, "ap_the_spear_of_adun" + SKY_SHIELD = 56, "Sky Shield", SC2Campaign.LOTV, "Korhal", SC2Race.PROTOSS, MissionPools.EASY, "ap_sky_shield" + BROTHERS_IN_ARMS = 57, "Brothers in Arms", SC2Campaign.LOTV, "Korhal", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_brothers_in_arms" + AMON_S_REACH = 58, "Amon's Reach", SC2Campaign.LOTV, "Shakuras", SC2Race.PROTOSS, MissionPools.EASY, "ap_amon_s_reach" + LAST_STAND = 59, "Last Stand", SC2Campaign.LOTV, "Shakuras", SC2Race.PROTOSS, MissionPools.HARD, "ap_last_stand" + FORBIDDEN_WEAPON = 60, "Forbidden Weapon", SC2Campaign.LOTV, "Purifier", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_forbidden_weapon" + TEMPLE_OF_UNIFICATION = 61, "Temple of Unification", SC2Campaign.LOTV, "Ulnar", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_temple_of_unification" + THE_INFINITE_CYCLE = 62, "The Infinite Cycle", SC2Campaign.LOTV, "Ulnar", SC2Race.ANY, MissionPools.HARD, "ap_the_infinite_cycle", False + HARBINGER_OF_OBLIVION = 63, "Harbinger of Oblivion", SC2Campaign.LOTV, "Ulnar", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_harbinger_of_oblivion" + UNSEALING_THE_PAST = 64, "Unsealing the Past", SC2Campaign.LOTV, "Purifier", SC2Race.PROTOSS, MissionPools.MEDIUM, "ap_unsealing_the_past" + PURIFICATION = 65, "Purification", SC2Campaign.LOTV, "Purifier", SC2Race.PROTOSS, MissionPools.HARD, "ap_purification" + STEPS_OF_THE_RITE = 66, "Steps of the Rite", SC2Campaign.LOTV, "Tal'darim", SC2Race.PROTOSS, MissionPools.HARD, "ap_steps_of_the_rite" + RAK_SHIR = 67, "Rak'Shir", SC2Campaign.LOTV, "Tal'darim", SC2Race.PROTOSS, MissionPools.HARD, "ap_rak_shir" + TEMPLAR_S_CHARGE = 68, "Templar's Charge", SC2Campaign.LOTV, "Moebius", SC2Race.PROTOSS, MissionPools.HARD, "ap_templar_s_charge" + TEMPLAR_S_RETURN = 69, "Templar's Return", SC2Campaign.LOTV, "Return to Aiur", SC2Race.PROTOSS, MissionPools.EASY, "ap_templar_s_return", False + THE_HOST = 70, "The Host", SC2Campaign.LOTV, "Return to Aiur", SC2Race.PROTOSS, MissionPools.HARD, "ap_the_host", + SALVATION = 71, "Salvation", SC2Campaign.LOTV, "Return to Aiur", SC2Race.PROTOSS, MissionPools.VERY_HARD, "ap_salvation" + + # Epilogue + INTO_THE_VOID = 72, "Into the Void", SC2Campaign.EPILOGUE, "_1", SC2Race.PROTOSS, MissionPools.VERY_HARD, "ap_into_the_void" + THE_ESSENCE_OF_ETERNITY = 73, "The Essence of Eternity", SC2Campaign.EPILOGUE, "_2", SC2Race.TERRAN, MissionPools.VERY_HARD, "ap_the_essence_of_eternity" + AMON_S_FALL = 74, "Amon's Fall", SC2Campaign.EPILOGUE, "_3", SC2Race.ZERG, MissionPools.VERY_HARD, "ap_amon_s_fall" + + # Nova Covert Ops + THE_ESCAPE = 75, "The Escape", SC2Campaign.NCO, "_1", SC2Race.ANY, MissionPools.MEDIUM, "ap_the_escape", False + SUDDEN_STRIKE = 76, "Sudden Strike", SC2Campaign.NCO, "_1", SC2Race.TERRAN, MissionPools.EASY, "ap_sudden_strike" + ENEMY_INTELLIGENCE = 77, "Enemy Intelligence", SC2Campaign.NCO, "_1", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_enemy_intelligence" + TROUBLE_IN_PARADISE = 78, "Trouble In Paradise", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.HARD, "ap_trouble_in_paradise" + NIGHT_TERRORS = 79, "Night Terrors", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_night_terrors" + FLASHPOINT = 80, "Flashpoint", SC2Campaign.NCO, "_2", SC2Race.TERRAN, MissionPools.HARD, "ap_flashpoint" + IN_THE_ENEMY_S_SHADOW = 81, "In the Enemy's Shadow", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.MEDIUM, "ap_in_the_enemy_s_shadow", False + DARK_SKIES = 82, "Dark Skies", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.HARD, "ap_dark_skies" + END_GAME = 83, "End Game", SC2Campaign.NCO, "_3", SC2Race.TERRAN, MissionPools.VERY_HARD, "ap_end_game" + + +class MissionConnection: + campaign: SC2Campaign + connect_to: int # -1 connects to Menu + + def __init__(self, connect_to, campaign = SC2Campaign.GLOBAL): + self.campaign = campaign + self.connect_to = connect_to + + def _asdict(self): + return { + "campaign": self.campaign.id, + "connect_to": self.connect_to + } + + +class MissionInfo(NamedTuple): + mission: SC2Mission + required_world: List[Union[MissionConnection, Dict[Literal["campaign", "connect_to"], int]]] + category: str + number: int = 0 # number of worlds need beaten + completion_critical: bool = False # missions needed to beat game + or_requirements: bool = False # true if the requirements should be or-ed instead of and-ed + ui_vertical_padding: int = 0 + + +class FillMission(NamedTuple): + type: MissionPools + connect_to: List[MissionConnection] + category: str + number: int = 0 # number of worlds need beaten + completion_critical: bool = False # missions needed to beat game + or_requirements: bool = False # true if the requirements should be or-ed instead of and-ed + removal_priority: int = 0 # how many missions missing from the pool required to remove this mission + + + +def vanilla_shuffle_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.WOL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.WOL)], "Mar Sara", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.WOL)], "Mar Sara", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(1, SC2Campaign.WOL)], "Mar Sara", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(2, SC2Campaign.WOL)], "Colonist"), + FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.WOL)], "Colonist"), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.WOL)], "Colonist", number=7), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.WOL)], "Colonist", number=7, removal_priority=1), + FillMission(MissionPools.EASY, [MissionConnection(2, SC2Campaign.WOL)], "Artifact", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(7, SC2Campaign.WOL)], "Artifact", number=8, completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(8, SC2Campaign.WOL)], "Artifact", number=11, completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(9, SC2Campaign.WOL)], "Artifact", number=14, completion_critical=True, removal_priority=7), + FillMission(MissionPools.HARD, [MissionConnection(10, SC2Campaign.WOL)], "Artifact", completion_critical=True, removal_priority=6), + FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.WOL)], "Covert", number=4), + FillMission(MissionPools.MEDIUM, [MissionConnection(12, SC2Campaign.WOL)], "Covert"), + FillMission(MissionPools.HARD, [MissionConnection(13, SC2Campaign.WOL)], "Covert", number=8, removal_priority=3), + FillMission(MissionPools.HARD, [MissionConnection(13, SC2Campaign.WOL)], "Covert", number=8, removal_priority=2), + FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.WOL)], "Rebellion", number=6), + FillMission(MissionPools.HARD, [MissionConnection(16, SC2Campaign.WOL)], "Rebellion"), + FillMission(MissionPools.HARD, [MissionConnection(17, SC2Campaign.WOL)], "Rebellion"), + FillMission(MissionPools.HARD, [MissionConnection(18, SC2Campaign.WOL)], "Rebellion", removal_priority=8), + FillMission(MissionPools.HARD, [MissionConnection(19, SC2Campaign.WOL)], "Rebellion", removal_priority=5), + FillMission(MissionPools.HARD, [MissionConnection(11, SC2Campaign.WOL)], "Char", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(21, SC2Campaign.WOL)], "Char", completion_critical=True, removal_priority=4), + FillMission(MissionPools.HARD, [MissionConnection(21, SC2Campaign.WOL)], "Char", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(22, SC2Campaign.WOL), MissionConnection(23, SC2Campaign.WOL)], "Char", completion_critical=True, or_requirements=True) + ], + SC2Campaign.PROPHECY: [ + FillMission(MissionPools.MEDIUM, [MissionConnection(8, SC2Campaign.WOL)], "_1"), + FillMission(MissionPools.HARD, [MissionConnection(0, SC2Campaign.PROPHECY)], "_2", removal_priority=2), + FillMission(MissionPools.HARD, [MissionConnection(1, SC2Campaign.PROPHECY)], "_3", removal_priority=1), + FillMission(MissionPools.FINAL, [MissionConnection(2, SC2Campaign.PROPHECY)], "_4"), + ], + SC2Campaign.HOTS: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.HOTS)], "Umoja", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.HOTS)], "Umoja", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(1, SC2Campaign.HOTS)], "Umoja", completion_critical=True, removal_priority=1), + FillMission(MissionPools.EASY, [MissionConnection(2, SC2Campaign.HOTS)], "Kaldir", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.HOTS)], "Kaldir", completion_critical=True, removal_priority=2), + FillMission(MissionPools.MEDIUM, [MissionConnection(4, SC2Campaign.HOTS)], "Kaldir", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(2, SC2Campaign.HOTS)], "Char", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(6, SC2Campaign.HOTS)], "Char", completion_critical=True, removal_priority=3), + FillMission(MissionPools.MEDIUM, [MissionConnection(7, SC2Campaign.HOTS)], "Char", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(5, SC2Campaign.HOTS), MissionConnection(8, SC2Campaign.HOTS)], "Zerus", completion_critical=True, or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(9, SC2Campaign.HOTS)], "Zerus", completion_critical=True, removal_priority=4), + FillMission(MissionPools.MEDIUM, [MissionConnection(10, SC2Campaign.HOTS)], "Zerus", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(5, SC2Campaign.HOTS), MissionConnection(8, SC2Campaign.HOTS), MissionConnection(11, SC2Campaign.HOTS)], "Skygeirr Station", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.HOTS)], "Skygeirr Station", completion_critical=True, removal_priority=5), + FillMission(MissionPools.HARD, [MissionConnection(13, SC2Campaign.HOTS)], "Skygeirr Station", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(5, SC2Campaign.HOTS), MissionConnection(8, SC2Campaign.HOTS), MissionConnection(11, SC2Campaign.HOTS)], "Dominion Space", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(15, SC2Campaign.HOTS)], "Dominion Space", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(14, SC2Campaign.HOTS), MissionConnection(16, SC2Campaign.HOTS)], "Korhal", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(17, SC2Campaign.HOTS)], "Korhal", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(18, SC2Campaign.HOTS)], "Korhal", completion_critical=True), + ], + SC2Campaign.PROLOGUE: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.PROLOGUE)], "_1"), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.PROLOGUE)], "_2", removal_priority=1), + FillMission(MissionPools.FINAL, [MissionConnection(1, SC2Campaign.PROLOGUE)], "_3") + ], + SC2Campaign.LOTV: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.LOTV)], "Aiur", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.LOTV)], "Aiur", completion_critical=True, removal_priority=3), + FillMission(MissionPools.EASY, [MissionConnection(1, SC2Campaign.LOTV)], "Aiur", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.LOTV)], "Korhal", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.LOTV)], "Korhal", completion_critical=True, removal_priority=7), + FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.LOTV)], "Shakuras", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.LOTV)], "Shakuras", completion_critical=True, removal_priority=6), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV), MissionConnection(6, SC2Campaign.LOTV)], "Purifier", completion_critical=True, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV), MissionConnection(6, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], "Ulnar", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(8, SC2Campaign.LOTV)], "Ulnar", completion_critical=True, removal_priority=1), + FillMission(MissionPools.HARD, [MissionConnection(9, SC2Campaign.LOTV)], "Ulnar", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(10, SC2Campaign.LOTV)], "Purifier", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(11, SC2Campaign.LOTV)], "Purifier", completion_critical=True, removal_priority=5), + FillMission(MissionPools.HARD, [MissionConnection(10, SC2Campaign.LOTV)], "Tal'darim", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(13, SC2Campaign.LOTV)], "Tal'darim", completion_critical=True, removal_priority=4), + FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(14, SC2Campaign.LOTV)], "Moebius", completion_critical=True, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(12, SC2Campaign.LOTV), MissionConnection(14, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(16, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True, removal_priority=2), + FillMission(MissionPools.FINAL, [MissionConnection(17, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True), + ], + SC2Campaign.EPILOGUE: [ + FillMission(MissionPools.VERY_HARD, [MissionConnection(24, SC2Campaign.WOL), MissionConnection(19, SC2Campaign.HOTS), MissionConnection(18, SC2Campaign.LOTV)], "_1", completion_critical=True), + FillMission(MissionPools.VERY_HARD, [MissionConnection(0, SC2Campaign.EPILOGUE)], "_2", completion_critical=True, removal_priority=1), + FillMission(MissionPools.FINAL, [MissionConnection(1, SC2Campaign.EPILOGUE)], "_3", completion_critical=True), + ], + SC2Campaign.NCO: [ + FillMission(MissionPools.EASY, [MissionConnection(-1, SC2Campaign.NCO)], "_1", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.NCO)], "_1", completion_critical=True, removal_priority=6), + FillMission(MissionPools.MEDIUM, [MissionConnection(1, SC2Campaign.NCO)], "_1", completion_critical=True, removal_priority=5), + FillMission(MissionPools.HARD, [MissionConnection(2, SC2Campaign.NCO)], "_2", completion_critical=True, removal_priority=7), + FillMission(MissionPools.HARD, [MissionConnection(3, SC2Campaign.NCO)], "_2", completion_critical=True, removal_priority=4), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.NCO)], "_2", completion_critical=True, removal_priority=3), + FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.NCO)], "_3", completion_critical=True, removal_priority=2), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.NCO)], "_3", completion_critical=True, removal_priority=1), + FillMission(MissionPools.FINAL, [MissionConnection(7, SC2Campaign.NCO)], "_3", completion_critical=True), + ] + } + + +def mini_campaign_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.WOL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.WOL)], "Mar Sara", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.WOL)], "Colonist"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1, SC2Campaign.WOL)], "Colonist"), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.WOL)], "Artifact", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.WOL)], "Artifact", number=4, completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.WOL)], "Artifact", number=8, completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.WOL)], "Covert", number=2), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.WOL)], "Covert"), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.WOL)], "Rebellion", number=3), + FillMission(MissionPools.HARD, [MissionConnection(8, SC2Campaign.WOL)], "Rebellion"), + FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.WOL)], "Char", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.WOL)], "Char", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(10, SC2Campaign.WOL), MissionConnection(11, SC2Campaign.WOL)], "Char", completion_critical=True, or_requirements=True) + ], + SC2Campaign.PROPHECY: [ + FillMission(MissionPools.MEDIUM, [MissionConnection(4, SC2Campaign.WOL)], "_1"), + FillMission(MissionPools.FINAL, [MissionConnection(0, SC2Campaign.PROPHECY)], "_2"), + ], + SC2Campaign.HOTS: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.HOTS)], "Umoja", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.HOTS)], "Kaldir"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1, SC2Campaign.HOTS)], "Kaldir"), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.HOTS)], "Char"), + FillMission(MissionPools.MEDIUM, [MissionConnection(3, SC2Campaign.HOTS)], "Char"), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.HOTS)], "Zerus", number=3), + FillMission(MissionPools.MEDIUM, [MissionConnection(5, SC2Campaign.HOTS)], "Zerus"), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.HOTS)], "Skygeirr Station", number=5), + FillMission(MissionPools.HARD, [MissionConnection(7, SC2Campaign.HOTS)], "Skygeirr Station"), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.HOTS)], "Dominion Space", number=5), + FillMission(MissionPools.HARD, [MissionConnection(9, SC2Campaign.HOTS)], "Dominion Space"), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.HOTS)], "Korhal", completion_critical=True, number=8), + FillMission(MissionPools.FINAL, [MissionConnection(11, SC2Campaign.HOTS)], "Korhal", completion_critical=True), + ], + SC2Campaign.PROLOGUE: [ + FillMission(MissionPools.EASY, [MissionConnection(-1, SC2Campaign.PROLOGUE)], "_1"), + FillMission(MissionPools.FINAL, [MissionConnection(0, SC2Campaign.PROLOGUE)], "_2") + ], + SC2Campaign.LOTV: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1, SC2Campaign.LOTV)], "Aiur",completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0, SC2Campaign.LOTV)], "Aiur", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(1, SC2Campaign.LOTV)], "Korhal", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(1, SC2Campaign.LOTV)], "Shakuras", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(2, SC2Campaign.LOTV), MissionConnection(3, SC2Campaign.LOTV)], "Purifier", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.LOTV)], "Purifier", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(4, SC2Campaign.LOTV)], "Ulnar", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(6, SC2Campaign.LOTV)], "Tal'darim", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(8, SC2Campaign.LOTV)], "Return to Aiur", completion_critical=True), + ], + SC2Campaign.EPILOGUE: [ + FillMission(MissionPools.VERY_HARD, [MissionConnection(12, SC2Campaign.WOL), MissionConnection(12, SC2Campaign.HOTS), MissionConnection(9, SC2Campaign.LOTV)], "_1", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(0, SC2Campaign.EPILOGUE)], "_2", completion_critical=True), + ], + SC2Campaign.NCO: [ + FillMission(MissionPools.EASY, [MissionConnection(-1, SC2Campaign.NCO)], "_1", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0, SC2Campaign.NCO)], "_1", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(1, SC2Campaign.NCO)], "_2", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(2, SC2Campaign.NCO)], "_3", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(3, SC2Campaign.NCO)], "_3", completion_critical=True), + ] + } + + +def gauntlet_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "I", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0)], "II", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(1)], "III", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(2)], "IV", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(3)], "V", completion_critical=True), + FillMission(MissionPools.HARD, [MissionConnection(4)], "VI", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(5)], "Final", completion_critical=True) + ] + } + + +def mini_gauntlet_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "I", completion_critical=True), + FillMission(MissionPools.EASY, [MissionConnection(0)], "II", completion_critical=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(1)], "III", completion_critical=True), + FillMission(MissionPools.FINAL, [MissionConnection(2)], "Final", completion_critical=True) + ] + } + + +def grid_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "_1"), + FillMission(MissionPools.EASY, [MissionConnection(0)], "_1"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1), MissionConnection(6), MissionConnection( 3)], "_1", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(2), MissionConnection(7)], "_1", or_requirements=True), + FillMission(MissionPools.EASY, [MissionConnection(0)], "_2"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1), MissionConnection(4)], "_2", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(2), MissionConnection(5), MissionConnection(10), MissionConnection(7)], "_2", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(3), MissionConnection(6), MissionConnection(11)], "_2", or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(4), MissionConnection(9), MissionConnection(12)], "_3", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(5), MissionConnection(8), MissionConnection(10), MissionConnection(13)], "_3", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(6), MissionConnection(9), MissionConnection(11), MissionConnection(14)], "_3", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(7), MissionConnection(10)], "_3", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(8), MissionConnection(13)], "_4", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(9), MissionConnection(12), MissionConnection(14)], "_4", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(10), MissionConnection(13)], "_4", or_requirements=True), + FillMission(MissionPools.FINAL, [MissionConnection(11), MissionConnection(14)], "_4", or_requirements=True) + ] + } + +def mini_grid_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "_1"), + FillMission(MissionPools.EASY, [MissionConnection(0)], "_1"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1), MissionConnection(5)], "_1", or_requirements=True), + FillMission(MissionPools.EASY, [MissionConnection(0)], "_2"), + FillMission(MissionPools.MEDIUM, [MissionConnection(1), MissionConnection(3)], "_2", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(2), MissionConnection(4)], "_2", or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(3), MissionConnection(7)], "_3", or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(4), MissionConnection(6)], "_3", or_requirements=True), + FillMission(MissionPools.FINAL, [MissionConnection(5), MissionConnection(7)], "_3", or_requirements=True) + ] + } + +def tiny_grid_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "_1"), + FillMission(MissionPools.MEDIUM, [MissionConnection(0)], "_1"), + FillMission(MissionPools.EASY, [MissionConnection(0)], "_2"), + FillMission(MissionPools.FINAL, [MissionConnection(1), MissionConnection(2)], "_2", or_requirements=True), + ] + } + +def blitz_order() -> Dict[SC2Campaign, List[FillMission]]: + return { + SC2Campaign.GLOBAL: [ + FillMission(MissionPools.STARTER, [MissionConnection(-1)], "I"), + FillMission(MissionPools.EASY, [MissionConnection(-1)], "I"), + FillMission(MissionPools.MEDIUM, [MissionConnection(0), MissionConnection(1)], "II", number=1, or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0), MissionConnection(1)], "II", number=1, or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0), MissionConnection(1)], "III", number=2, or_requirements=True), + FillMission(MissionPools.MEDIUM, [MissionConnection(0), MissionConnection(1)], "III", number=2, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(0), MissionConnection(1)], "IV", number=3, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(0), MissionConnection(1)], "IV", number=3, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(0), MissionConnection(1)], "V", number=4, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(0), MissionConnection(1)], "V", number=4, or_requirements=True), + FillMission(MissionPools.HARD, [MissionConnection(0), MissionConnection(1)], "Final", number=5, or_requirements=True), + FillMission(MissionPools.FINAL, [MissionConnection(0), MissionConnection(1)], "Final", number=5, or_requirements=True) + ] + } + + +mission_orders: List[Callable[[], Dict[SC2Campaign, List[FillMission]]]] = [ + vanilla_shuffle_order, + vanilla_shuffle_order, + mini_campaign_order, + grid_order, + mini_grid_order, + blitz_order, + gauntlet_order, + mini_gauntlet_order, + tiny_grid_order +] + + +vanilla_mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]] = { + SC2Campaign.WOL: { + SC2Mission.LIBERATION_DAY.mission_name: MissionInfo(SC2Mission.LIBERATION_DAY, [], SC2Mission.LIBERATION_DAY.area, completion_critical=True), + SC2Mission.THE_OUTLAWS.mission_name: MissionInfo(SC2Mission.THE_OUTLAWS, [MissionConnection(1, SC2Campaign.WOL)], SC2Mission.THE_OUTLAWS.area, completion_critical=True), + SC2Mission.ZERO_HOUR.mission_name: MissionInfo(SC2Mission.ZERO_HOUR, [MissionConnection(2, SC2Campaign.WOL)], SC2Mission.ZERO_HOUR.area, completion_critical=True), + SC2Mission.EVACUATION.mission_name: MissionInfo(SC2Mission.EVACUATION, [MissionConnection(3, SC2Campaign.WOL)], SC2Mission.EVACUATION.area), + SC2Mission.OUTBREAK.mission_name: MissionInfo(SC2Mission.OUTBREAK, [MissionConnection(4, SC2Campaign.WOL)], SC2Mission.OUTBREAK.area), + SC2Mission.SAFE_HAVEN.mission_name: MissionInfo(SC2Mission.SAFE_HAVEN, [MissionConnection(5, SC2Campaign.WOL)], SC2Mission.SAFE_HAVEN.area, number=7), + SC2Mission.HAVENS_FALL.mission_name: MissionInfo(SC2Mission.HAVENS_FALL, [MissionConnection(5, SC2Campaign.WOL)], SC2Mission.HAVENS_FALL.area, number=7), + SC2Mission.SMASH_AND_GRAB.mission_name: MissionInfo(SC2Mission.SMASH_AND_GRAB, [MissionConnection(3, SC2Campaign.WOL)], SC2Mission.SMASH_AND_GRAB.area, completion_critical=True), + SC2Mission.THE_DIG.mission_name: MissionInfo(SC2Mission.THE_DIG, [MissionConnection(8, SC2Campaign.WOL)], SC2Mission.THE_DIG.area, number=8, completion_critical=True), + SC2Mission.THE_MOEBIUS_FACTOR.mission_name: MissionInfo(SC2Mission.THE_MOEBIUS_FACTOR, [MissionConnection(9, SC2Campaign.WOL)], SC2Mission.THE_MOEBIUS_FACTOR.area, number=11, completion_critical=True), + SC2Mission.SUPERNOVA.mission_name: MissionInfo(SC2Mission.SUPERNOVA, [MissionConnection(10, SC2Campaign.WOL)], SC2Mission.SUPERNOVA.area, number=14, completion_critical=True), + SC2Mission.MAW_OF_THE_VOID.mission_name: MissionInfo(SC2Mission.MAW_OF_THE_VOID, [MissionConnection(11, SC2Campaign.WOL)], SC2Mission.MAW_OF_THE_VOID.area, completion_critical=True), + SC2Mission.DEVILS_PLAYGROUND.mission_name: MissionInfo(SC2Mission.DEVILS_PLAYGROUND, [MissionConnection(3, SC2Campaign.WOL)], SC2Mission.DEVILS_PLAYGROUND.area, number=4), + SC2Mission.WELCOME_TO_THE_JUNGLE.mission_name: MissionInfo(SC2Mission.WELCOME_TO_THE_JUNGLE, [MissionConnection(13, SC2Campaign.WOL)], SC2Mission.WELCOME_TO_THE_JUNGLE.area), + SC2Mission.BREAKOUT.mission_name: MissionInfo(SC2Mission.BREAKOUT, [MissionConnection(14, SC2Campaign.WOL)], SC2Mission.BREAKOUT.area, number=8), + SC2Mission.GHOST_OF_A_CHANCE.mission_name: MissionInfo(SC2Mission.GHOST_OF_A_CHANCE, [MissionConnection(14, SC2Campaign.WOL)], SC2Mission.GHOST_OF_A_CHANCE.area, number=8), + SC2Mission.THE_GREAT_TRAIN_ROBBERY.mission_name: MissionInfo(SC2Mission.THE_GREAT_TRAIN_ROBBERY, [MissionConnection(3, SC2Campaign.WOL)], SC2Mission.THE_GREAT_TRAIN_ROBBERY.area, number=6), + SC2Mission.CUTTHROAT.mission_name: MissionInfo(SC2Mission.CUTTHROAT, [MissionConnection(17, SC2Campaign.WOL)], SC2Mission.THE_GREAT_TRAIN_ROBBERY.area), + SC2Mission.ENGINE_OF_DESTRUCTION.mission_name: MissionInfo(SC2Mission.ENGINE_OF_DESTRUCTION, [MissionConnection(18, SC2Campaign.WOL)], SC2Mission.ENGINE_OF_DESTRUCTION.area), + SC2Mission.MEDIA_BLITZ.mission_name: MissionInfo(SC2Mission.MEDIA_BLITZ, [MissionConnection(19, SC2Campaign.WOL)], SC2Mission.MEDIA_BLITZ.area), + SC2Mission.PIERCING_OF_THE_SHROUD.mission_name: MissionInfo(SC2Mission.PIERCING_OF_THE_SHROUD, [MissionConnection(20, SC2Campaign.WOL)], SC2Mission.PIERCING_OF_THE_SHROUD.area), + SC2Mission.GATES_OF_HELL.mission_name: MissionInfo(SC2Mission.GATES_OF_HELL, [MissionConnection(12, SC2Campaign.WOL)], SC2Mission.GATES_OF_HELL.area, completion_critical=True), + SC2Mission.BELLY_OF_THE_BEAST.mission_name: MissionInfo(SC2Mission.BELLY_OF_THE_BEAST, [MissionConnection(22, SC2Campaign.WOL)], SC2Mission.BELLY_OF_THE_BEAST.area, completion_critical=True), + SC2Mission.SHATTER_THE_SKY.mission_name: MissionInfo(SC2Mission.SHATTER_THE_SKY, [MissionConnection(22, SC2Campaign.WOL)], SC2Mission.SHATTER_THE_SKY.area, completion_critical=True), + SC2Mission.ALL_IN.mission_name: MissionInfo(SC2Mission.ALL_IN, [MissionConnection(23, SC2Campaign.WOL), MissionConnection(24, SC2Campaign.WOL)], SC2Mission.ALL_IN.area, or_requirements=True, completion_critical=True) + }, + SC2Campaign.PROPHECY: { + SC2Mission.WHISPERS_OF_DOOM.mission_name: MissionInfo(SC2Mission.WHISPERS_OF_DOOM, [MissionConnection(9, SC2Campaign.WOL)], SC2Mission.WHISPERS_OF_DOOM.area), + SC2Mission.A_SINISTER_TURN.mission_name: MissionInfo(SC2Mission.A_SINISTER_TURN, [MissionConnection(1, SC2Campaign.PROPHECY)], SC2Mission.A_SINISTER_TURN.area), + SC2Mission.ECHOES_OF_THE_FUTURE.mission_name: MissionInfo(SC2Mission.ECHOES_OF_THE_FUTURE, [MissionConnection(2, SC2Campaign.PROPHECY)], SC2Mission.ECHOES_OF_THE_FUTURE.area), + SC2Mission.IN_UTTER_DARKNESS.mission_name: MissionInfo(SC2Mission.IN_UTTER_DARKNESS, [MissionConnection(3, SC2Campaign.PROPHECY)], SC2Mission.IN_UTTER_DARKNESS.area) + }, + SC2Campaign.HOTS: { + SC2Mission.LAB_RAT.mission_name: MissionInfo(SC2Mission.LAB_RAT, [], SC2Mission.LAB_RAT.area, completion_critical=True), + SC2Mission.BACK_IN_THE_SADDLE.mission_name: MissionInfo(SC2Mission.BACK_IN_THE_SADDLE, [MissionConnection(1, SC2Campaign.HOTS)], SC2Mission.BACK_IN_THE_SADDLE.area, completion_critical=True), + SC2Mission.RENDEZVOUS.mission_name: MissionInfo(SC2Mission.RENDEZVOUS, [MissionConnection(2, SC2Campaign.HOTS)], SC2Mission.RENDEZVOUS.area, completion_critical=True), + SC2Mission.HARVEST_OF_SCREAMS.mission_name: MissionInfo(SC2Mission.HARVEST_OF_SCREAMS, [MissionConnection(3, SC2Campaign.HOTS)], SC2Mission.HARVEST_OF_SCREAMS.area), + SC2Mission.SHOOT_THE_MESSENGER.mission_name: MissionInfo(SC2Mission.SHOOT_THE_MESSENGER, [MissionConnection(4, SC2Campaign.HOTS)], SC2Mission.SHOOT_THE_MESSENGER.area), + SC2Mission.ENEMY_WITHIN.mission_name: MissionInfo(SC2Mission.ENEMY_WITHIN, [MissionConnection(5, SC2Campaign.HOTS)], SC2Mission.ENEMY_WITHIN.area), + SC2Mission.DOMINATION.mission_name: MissionInfo(SC2Mission.DOMINATION, [MissionConnection(3, SC2Campaign.HOTS)], SC2Mission.DOMINATION.area), + SC2Mission.FIRE_IN_THE_SKY.mission_name: MissionInfo(SC2Mission.FIRE_IN_THE_SKY, [MissionConnection(7, SC2Campaign.HOTS)], SC2Mission.FIRE_IN_THE_SKY.area), + SC2Mission.OLD_SOLDIERS.mission_name: MissionInfo(SC2Mission.OLD_SOLDIERS, [MissionConnection(8, SC2Campaign.HOTS)], SC2Mission.OLD_SOLDIERS.area), + SC2Mission.WAKING_THE_ANCIENT.mission_name: MissionInfo(SC2Mission.WAKING_THE_ANCIENT, [MissionConnection(6, SC2Campaign.HOTS), MissionConnection(9, SC2Campaign.HOTS)], SC2Mission.WAKING_THE_ANCIENT.area, completion_critical=True, or_requirements=True), + SC2Mission.THE_CRUCIBLE.mission_name: MissionInfo(SC2Mission.THE_CRUCIBLE, [MissionConnection(10, SC2Campaign.HOTS)], SC2Mission.THE_CRUCIBLE.area, completion_critical=True), + SC2Mission.SUPREME.mission_name: MissionInfo(SC2Mission.SUPREME, [MissionConnection(11, SC2Campaign.HOTS)], SC2Mission.SUPREME.area, completion_critical=True), + SC2Mission.INFESTED.mission_name: MissionInfo(SC2Mission.INFESTED, [MissionConnection(6, SC2Campaign.HOTS), MissionConnection(9, SC2Campaign.HOTS), MissionConnection(12, SC2Campaign.HOTS)], SC2Mission.INFESTED.area), + SC2Mission.HAND_OF_DARKNESS.mission_name: MissionInfo(SC2Mission.HAND_OF_DARKNESS, [MissionConnection(13, SC2Campaign.HOTS)], SC2Mission.HAND_OF_DARKNESS.area), + SC2Mission.PHANTOMS_OF_THE_VOID.mission_name: MissionInfo(SC2Mission.PHANTOMS_OF_THE_VOID, [MissionConnection(14, SC2Campaign.HOTS)], SC2Mission.PHANTOMS_OF_THE_VOID.area), + SC2Mission.WITH_FRIENDS_LIKE_THESE.mission_name: MissionInfo(SC2Mission.WITH_FRIENDS_LIKE_THESE, [MissionConnection(6, SC2Campaign.HOTS), MissionConnection(9, SC2Campaign.HOTS), MissionConnection(12, SC2Campaign.HOTS)], SC2Mission.WITH_FRIENDS_LIKE_THESE.area), + SC2Mission.CONVICTION.mission_name: MissionInfo(SC2Mission.CONVICTION, [MissionConnection(16, SC2Campaign.HOTS)], SC2Mission.CONVICTION.area), + SC2Mission.PLANETFALL.mission_name: MissionInfo(SC2Mission.PLANETFALL, [MissionConnection(15, SC2Campaign.HOTS), MissionConnection(17, SC2Campaign.HOTS)], SC2Mission.PLANETFALL.area, completion_critical=True), + SC2Mission.DEATH_FROM_ABOVE.mission_name: MissionInfo(SC2Mission.DEATH_FROM_ABOVE, [MissionConnection(18, SC2Campaign.HOTS)], SC2Mission.DEATH_FROM_ABOVE.area, completion_critical=True), + SC2Mission.THE_RECKONING.mission_name: MissionInfo(SC2Mission.THE_RECKONING, [MissionConnection(19, SC2Campaign.HOTS)], SC2Mission.THE_RECKONING.area, completion_critical=True), + }, + SC2Campaign.PROLOGUE: { + SC2Mission.DARK_WHISPERS.mission_name: MissionInfo(SC2Mission.DARK_WHISPERS, [], SC2Mission.DARK_WHISPERS.area), + SC2Mission.GHOSTS_IN_THE_FOG.mission_name: MissionInfo(SC2Mission.GHOSTS_IN_THE_FOG, [MissionConnection(1, SC2Campaign.PROLOGUE)], SC2Mission.GHOSTS_IN_THE_FOG.area), + SC2Mission.EVIL_AWOKEN.mission_name: MissionInfo(SC2Mission.EVIL_AWOKEN, [MissionConnection(2, SC2Campaign.PROLOGUE)], SC2Mission.EVIL_AWOKEN.area) + }, + SC2Campaign.LOTV: { + SC2Mission.FOR_AIUR.mission_name: MissionInfo(SC2Mission.FOR_AIUR, [], SC2Mission.FOR_AIUR.area, completion_critical=True), + SC2Mission.THE_GROWING_SHADOW.mission_name: MissionInfo(SC2Mission.THE_GROWING_SHADOW, [MissionConnection(1, SC2Campaign.LOTV)], SC2Mission.THE_GROWING_SHADOW.area, completion_critical=True), + SC2Mission.THE_SPEAR_OF_ADUN.mission_name: MissionInfo(SC2Mission.THE_SPEAR_OF_ADUN, [MissionConnection(2, SC2Campaign.LOTV)], SC2Mission.THE_SPEAR_OF_ADUN.area, completion_critical=True), + SC2Mission.SKY_SHIELD.mission_name: MissionInfo(SC2Mission.SKY_SHIELD, [MissionConnection(3, SC2Campaign.LOTV)], SC2Mission.SKY_SHIELD.area, completion_critical=True), + SC2Mission.BROTHERS_IN_ARMS.mission_name: MissionInfo(SC2Mission.BROTHERS_IN_ARMS, [MissionConnection(4, SC2Campaign.LOTV)], SC2Mission.BROTHERS_IN_ARMS.area, completion_critical=True), + SC2Mission.AMON_S_REACH.mission_name: MissionInfo(SC2Mission.AMON_S_REACH, [MissionConnection(3, SC2Campaign.LOTV)], SC2Mission.AMON_S_REACH.area, completion_critical=True), + SC2Mission.LAST_STAND.mission_name: MissionInfo(SC2Mission.LAST_STAND, [MissionConnection(6, SC2Campaign.LOTV)], SC2Mission.LAST_STAND.area, completion_critical=True), + SC2Mission.FORBIDDEN_WEAPON.mission_name: MissionInfo(SC2Mission.FORBIDDEN_WEAPON, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV)], SC2Mission.FORBIDDEN_WEAPON.area, completion_critical=True, or_requirements=True), + SC2Mission.TEMPLE_OF_UNIFICATION.mission_name: MissionInfo(SC2Mission.TEMPLE_OF_UNIFICATION, [MissionConnection(5, SC2Campaign.LOTV), MissionConnection(7, SC2Campaign.LOTV), MissionConnection(8, SC2Campaign.LOTV)], SC2Mission.TEMPLE_OF_UNIFICATION.area, completion_critical=True), + SC2Mission.THE_INFINITE_CYCLE.mission_name: MissionInfo(SC2Mission.THE_INFINITE_CYCLE, [MissionConnection(9, SC2Campaign.LOTV)], SC2Mission.THE_INFINITE_CYCLE.area, completion_critical=True), + SC2Mission.HARBINGER_OF_OBLIVION.mission_name: MissionInfo(SC2Mission.HARBINGER_OF_OBLIVION, [MissionConnection(10, SC2Campaign.LOTV)], SC2Mission.HARBINGER_OF_OBLIVION.area, completion_critical=True), + SC2Mission.UNSEALING_THE_PAST.mission_name: MissionInfo(SC2Mission.UNSEALING_THE_PAST, [MissionConnection(11, SC2Campaign.LOTV)], SC2Mission.UNSEALING_THE_PAST.area, completion_critical=True), + SC2Mission.PURIFICATION.mission_name: MissionInfo(SC2Mission.PURIFICATION, [MissionConnection(12, SC2Campaign.LOTV)], SC2Mission.PURIFICATION.area, completion_critical=True), + SC2Mission.STEPS_OF_THE_RITE.mission_name: MissionInfo(SC2Mission.STEPS_OF_THE_RITE, [MissionConnection(11, SC2Campaign.LOTV)], SC2Mission.STEPS_OF_THE_RITE.area, completion_critical=True), + SC2Mission.RAK_SHIR.mission_name: MissionInfo(SC2Mission.RAK_SHIR, [MissionConnection(14, SC2Campaign.LOTV)], SC2Mission.RAK_SHIR.area, completion_critical=True), + SC2Mission.TEMPLAR_S_CHARGE.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_CHARGE, [MissionConnection(13, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_CHARGE.area, completion_critical=True, or_requirements=True), + SC2Mission.TEMPLAR_S_RETURN.mission_name: MissionInfo(SC2Mission.TEMPLAR_S_RETURN, [MissionConnection(13, SC2Campaign.LOTV), MissionConnection(15, SC2Campaign.LOTV), MissionConnection(16, SC2Campaign.LOTV)], SC2Mission.TEMPLAR_S_RETURN.area, completion_critical=True), + SC2Mission.THE_HOST.mission_name: MissionInfo(SC2Mission.THE_HOST, [MissionConnection(17, SC2Campaign.LOTV)], SC2Mission.THE_HOST.area, completion_critical=True), + SC2Mission.SALVATION.mission_name: MissionInfo(SC2Mission.SALVATION, [MissionConnection(18, SC2Campaign.LOTV)], SC2Mission.SALVATION.area, completion_critical=True), + }, + SC2Campaign.EPILOGUE: { + SC2Mission.INTO_THE_VOID.mission_name: MissionInfo(SC2Mission.INTO_THE_VOID, [MissionConnection(25, SC2Campaign.WOL), MissionConnection(20, SC2Campaign.HOTS), MissionConnection(19, SC2Campaign.LOTV)], SC2Mission.INTO_THE_VOID.area, completion_critical=True), + SC2Mission.THE_ESSENCE_OF_ETERNITY.mission_name: MissionInfo(SC2Mission.THE_ESSENCE_OF_ETERNITY, [MissionConnection(1, SC2Campaign.EPILOGUE)], SC2Mission.THE_ESSENCE_OF_ETERNITY.area, completion_critical=True), + SC2Mission.AMON_S_FALL.mission_name: MissionInfo(SC2Mission.AMON_S_FALL, [MissionConnection(2, SC2Campaign.EPILOGUE)], SC2Mission.AMON_S_FALL.area, completion_critical=True), + }, + SC2Campaign.NCO: { + SC2Mission.THE_ESCAPE.mission_name: MissionInfo(SC2Mission.THE_ESCAPE, [], SC2Mission.THE_ESCAPE.area, completion_critical=True), + SC2Mission.SUDDEN_STRIKE.mission_name: MissionInfo(SC2Mission.SUDDEN_STRIKE, [MissionConnection(1, SC2Campaign.NCO)], SC2Mission.SUDDEN_STRIKE.area, completion_critical=True), + SC2Mission.ENEMY_INTELLIGENCE.mission_name: MissionInfo(SC2Mission.ENEMY_INTELLIGENCE, [MissionConnection(2, SC2Campaign.NCO)], SC2Mission.ENEMY_INTELLIGENCE.area, completion_critical=True), + SC2Mission.TROUBLE_IN_PARADISE.mission_name: MissionInfo(SC2Mission.TROUBLE_IN_PARADISE, [MissionConnection(3, SC2Campaign.NCO)], SC2Mission.TROUBLE_IN_PARADISE.area, completion_critical=True), + SC2Mission.NIGHT_TERRORS.mission_name: MissionInfo(SC2Mission.NIGHT_TERRORS, [MissionConnection(4, SC2Campaign.NCO)], SC2Mission.NIGHT_TERRORS.area, completion_critical=True), + SC2Mission.FLASHPOINT.mission_name: MissionInfo(SC2Mission.FLASHPOINT, [MissionConnection(5, SC2Campaign.NCO)], SC2Mission.FLASHPOINT.area, completion_critical=True), + SC2Mission.IN_THE_ENEMY_S_SHADOW.mission_name: MissionInfo(SC2Mission.IN_THE_ENEMY_S_SHADOW, [MissionConnection(6, SC2Campaign.NCO)], SC2Mission.IN_THE_ENEMY_S_SHADOW.area, completion_critical=True), + SC2Mission.DARK_SKIES.mission_name: MissionInfo(SC2Mission.DARK_SKIES, [MissionConnection(7, SC2Campaign.NCO)], SC2Mission.DARK_SKIES.area, completion_critical=True), + SC2Mission.END_GAME.mission_name: MissionInfo(SC2Mission.END_GAME, [MissionConnection(8, SC2Campaign.NCO)], SC2Mission.END_GAME.area, completion_critical=True), + } +} + +lookup_id_to_mission: Dict[int, SC2Mission] = { + mission.id: mission for mission in SC2Mission +} + +lookup_name_to_mission: Dict[str, SC2Mission] = { + mission.mission_name: mission for mission in SC2Mission +} + +lookup_id_to_campaign: Dict[int, SC2Campaign] = { + campaign.id: campaign for campaign in SC2Campaign +} + + +campaign_mission_table: Dict[SC2Campaign, Set[SC2Mission]] = { + campaign: set() for campaign in SC2Campaign +} +for mission in SC2Mission: + campaign_mission_table[mission.campaign].add(mission) + + +def get_campaign_difficulty(campaign: SC2Campaign, excluded_missions: Iterable[SC2Mission] = ()) -> MissionPools: + """ + + :param campaign: + :param excluded_missions: + :return: Campaign's the most difficult non-excluded mission + """ + excluded_mission_set = set(excluded_missions) + included_missions = campaign_mission_table[campaign].difference(excluded_mission_set) + return max([mission.pool for mission in included_missions]) + + +def get_campaign_goal_priority(campaign: SC2Campaign, excluded_missions: Iterable[SC2Mission] = ()) -> SC2CampaignGoalPriority: + """ + Gets a modified campaign goal priority. + If all the campaign's goal missions are excluded, it's ineligible to have the goal + If the campaign's very hard missions are excluded, the priority is lowered to hard + :param campaign: + :param excluded_missions: + :return: + """ + if excluded_missions is None: + return campaign.goal_priority + else: + goal_missions = set(get_campaign_potential_goal_missions(campaign)) + excluded_mission_set = set(excluded_missions) + remaining_goals = goal_missions.difference(excluded_mission_set) + if remaining_goals == set(): + # All potential goals are excluded, the campaign can't be a goal + return SC2CampaignGoalPriority.NONE + elif campaign.goal_priority == SC2CampaignGoalPriority.VERY_HARD: + # Check if a very hard campaign doesn't get rid of it's last very hard mission + difficulty = get_campaign_difficulty(campaign, excluded_missions) + if difficulty == MissionPools.VERY_HARD: + return SC2CampaignGoalPriority.VERY_HARD + else: + return SC2CampaignGoalPriority.HARD + else: + return campaign.goal_priority + + +class SC2CampaignGoal(NamedTuple): + mission: SC2Mission + location: str + + +campaign_final_mission_locations: Dict[SC2Campaign, SC2CampaignGoal] = { + SC2Campaign.WOL: SC2CampaignGoal(SC2Mission.ALL_IN, "All-In: Victory"), + SC2Campaign.PROPHECY: SC2CampaignGoal(SC2Mission.IN_UTTER_DARKNESS, "In Utter Darkness: Kills"), + SC2Campaign.HOTS: None, + SC2Campaign.PROLOGUE: SC2CampaignGoal(SC2Mission.EVIL_AWOKEN, "Evil Awoken: Victory"), + SC2Campaign.LOTV: SC2CampaignGoal(SC2Mission.SALVATION, "Salvation: Victory"), + SC2Campaign.EPILOGUE: None, + SC2Campaign.NCO: None, +} + +campaign_alt_final_mission_locations: Dict[SC2Campaign, Dict[SC2Mission, str]] = { + SC2Campaign.WOL: { + SC2Mission.MAW_OF_THE_VOID: "Maw of the Void: Victory", + SC2Mission.ENGINE_OF_DESTRUCTION: "Engine of Destruction: Victory", + SC2Mission.SUPERNOVA: "Supernova: Victory", + SC2Mission.GATES_OF_HELL: "Gates of Hell: Victory", + SC2Mission.SHATTER_THE_SKY: "Shatter the Sky: Victory" + }, + SC2Campaign.PROPHECY: None, + SC2Campaign.HOTS: { + SC2Mission.THE_RECKONING: "The Reckoning: Victory", + SC2Mission.THE_CRUCIBLE: "The Crucible: Victory", + SC2Mission.HAND_OF_DARKNESS: "Hand of Darkness: Victory", + SC2Mission.PHANTOMS_OF_THE_VOID: "Phantoms of the Void: Victory", + SC2Mission.PLANETFALL: "Planetfall: Victory", + SC2Mission.DEATH_FROM_ABOVE: "Death From Above: Victory" + }, + SC2Campaign.PROLOGUE: { + SC2Mission.GHOSTS_IN_THE_FOG: "Ghosts in the Fog: Victory" + }, + SC2Campaign.LOTV: { + SC2Mission.THE_HOST: "The Host: Victory", + SC2Mission.TEMPLAR_S_CHARGE: "Templar's Charge: Victory" + }, + SC2Campaign.EPILOGUE: { + SC2Mission.AMON_S_FALL: "Amon's Fall: Victory", + SC2Mission.INTO_THE_VOID: "Into the Void: Victory", + SC2Mission.THE_ESSENCE_OF_ETERNITY: "The Essence of Eternity: Victory", + }, + SC2Campaign.NCO: { + SC2Mission.END_GAME: "End Game: Victory", + SC2Mission.FLASHPOINT: "Flashpoint: Victory", + SC2Mission.DARK_SKIES: "Dark Skies: Victory", + SC2Mission.NIGHT_TERRORS: "Night Terrors: Victory", + SC2Mission.TROUBLE_IN_PARADISE: "Trouble In Paradise: Victory" + } +} + +campaign_race_exceptions: Dict[SC2Mission, SC2Race] = { + SC2Mission.WITH_FRIENDS_LIKE_THESE: SC2Race.TERRAN +} + + +def get_goal_location(mission: SC2Mission) -> Union[str, None]: + """ + + :param mission: + :return: Goal location assigned to the goal mission + """ + campaign = mission.campaign + primary_campaign_goal = campaign_final_mission_locations[campaign] + if primary_campaign_goal is not None: + if primary_campaign_goal.mission == mission: + return primary_campaign_goal.location + + campaign_alt_goals = campaign_alt_final_mission_locations[campaign] + if campaign_alt_goals is not None: + return campaign_alt_goals.get(mission) + + return None + + +def get_campaign_potential_goal_missions(campaign: SC2Campaign) -> List[SC2Mission]: + """ + + :param campaign: + :return: All missions that can be the campaign's goal + """ + missions: List[SC2Mission] = list() + primary_goal_mission = campaign_final_mission_locations[campaign] + if primary_goal_mission is not None: + missions.append(primary_goal_mission.mission) + alt_goal_locations = campaign_alt_final_mission_locations[campaign] + if alt_goal_locations is not None: + for mission in alt_goal_locations.keys(): + missions.append(mission) + + return missions + + +def get_no_build_missions() -> List[SC2Mission]: + return [mission for mission in SC2Mission if not mission.build] diff --git a/worlds/sc2/Options.py b/worlds/sc2/Options.py new file mode 100644 index 000000000000..88febb7096ef --- /dev/null +++ b/worlds/sc2/Options.py @@ -0,0 +1,908 @@ +from dataclasses import dataclass, fields, Field +from typing import FrozenSet, Union, Set + +from Options import Choice, Toggle, DefaultOnToggle, ItemSet, OptionSet, Range, PerGameCommonOptions +from .MissionTables import SC2Campaign, SC2Mission, lookup_name_to_mission, MissionPools, get_no_build_missions, \ + campaign_mission_table +from worlds.AutoWorld import World + + +class GameDifficulty(Choice): + """ + The difficulty of the campaign, affects enemy AI, starting units, and game speed. + + For those unfamiliar with the Archipelago randomizer, the recommended settings are one difficulty level + lower than the vanilla game + """ + display_name = "Game Difficulty" + option_casual = 0 + option_normal = 1 + option_hard = 2 + option_brutal = 3 + default = 1 + + +class GameSpeed(Choice): + """Optional setting to override difficulty-based game speed.""" + display_name = "Game Speed" + option_default = 0 + option_slower = 1 + option_slow = 2 + option_normal = 3 + option_fast = 4 + option_faster = 5 + default = option_default + + +class DisableForcedCamera(Toggle): + """ + Prevents the game from moving or locking the camera without the player's consent. + """ + display_name = "Disable Forced Camera Movement" + + +class SkipCutscenes(Toggle): + """ + Skips all cutscenes and prevents dialog from blocking progress. + """ + display_name = "Skip Cutscenes" + + +class AllInMap(Choice): + """Determines what version of All-In (WoL final map) that will be generated for the campaign.""" + display_name = "All In Map" + option_ground = 0 + option_air = 1 + + +class MissionOrder(Choice): + """ + Determines the order the missions are played in. The last three mission orders end in a random mission. + Vanilla (83 total if all campaigns enabled): Keeps the standard mission order and branching from the vanilla Campaigns. + Vanilla Shuffled (83 total if all campaigns enabled): Keeps same branching paths from the vanilla Campaigns but randomizes the order of missions within. + Mini Campaign (47 total if all campaigns enabled): Shorter version of the campaign with randomized missions and optional branches. + Medium Grid (16): A 4x4 grid of random missions. Start at the top-left and forge a path towards bottom-right mission to win. + Mini Grid (9): A 3x3 version of Grid. Complete the bottom-right mission to win. + Blitz (12): 12 random missions that open up very quickly. Complete the bottom-right mission to win. + Gauntlet (7): Linear series of 7 random missions to complete the campaign. + Mini Gauntlet (4): Linear series of 4 random missions to complete the campaign. + Tiny Grid (4): A 2x2 version of Grid. Complete the bottom-right mission to win. + Grid (variable): A grid that will resize to use all non-excluded missions. Corners may be omitted to make the grid more square. Complete the bottom-right mission to win. + """ + display_name = "Mission Order" + option_vanilla = 0 + option_vanilla_shuffled = 1 + option_mini_campaign = 2 + option_medium_grid = 3 + option_mini_grid = 4 + option_blitz = 5 + option_gauntlet = 6 + option_mini_gauntlet = 7 + option_tiny_grid = 8 + option_grid = 9 + + +class MaximumCampaignSize(Range): + """ + Sets an upper bound on how many missions to include when a variable-size mission order is selected. + If a set-size mission order is selected, does nothing. + """ + display_name = "Maximum Campaign Size" + range_start = 1 + range_end = 83 + default = 83 + + +class GridTwoStartPositions(Toggle): + """ + If turned on and 'grid' mission order is selected, removes a mission from the starting + corner sets the adjacent two missions as the starter missions. + """ + display_name = "Start with two unlocked missions on grid" + default = Toggle.option_false + + +class ColorChoice(Choice): + option_white = 0 + option_red = 1 + option_blue = 2 + option_teal = 3 + option_purple = 4 + option_yellow = 5 + option_orange = 6 + option_green = 7 + option_light_pink = 8 + option_violet = 9 + option_light_grey = 10 + option_dark_green = 11 + option_brown = 12 + option_light_green = 13 + option_dark_grey = 14 + option_pink = 15 + option_rainbow = 16 + option_default = 17 + default = option_default + + +class PlayerColorTerranRaynor(ColorChoice): + """Determines in-game team color for playable Raynor's Raiders (Terran) factions.""" + display_name = "Terran Player Color (Raynor)" + + +class PlayerColorProtoss(ColorChoice): + """Determines in-game team color for playable Protoss factions.""" + display_name = "Protoss Player Color" + + +class PlayerColorZerg(ColorChoice): + """Determines in-game team color for playable Zerg factions before Kerrigan becomes Primal Kerrigan.""" + display_name = "Zerg Player Color" + + +class PlayerColorZergPrimal(ColorChoice): + """Determines in-game team color for playable Zerg factions after Kerrigan becomes Primal Kerrigan.""" + display_name = "Zerg Player Color (Primal)" + + +class EnableWolMissions(DefaultOnToggle): + """ + Enables missions from main Wings of Liberty campaign. + """ + display_name = "Enable Wings of Liberty missions" + + +class EnableProphecyMissions(DefaultOnToggle): + """ + Enables missions from Prophecy mini-campaign. + """ + display_name = "Enable Prophecy missions" + + +class EnableHotsMissions(DefaultOnToggle): + """ + Enables missions from Heart of the Swarm campaign. + """ + display_name = "Enable Heart of the Swarm missions" + + +class EnableLotVPrologueMissions(DefaultOnToggle): + """ + Enables missions from Prologue campaign. + """ + display_name = "Enable Prologue (Legacy of the Void) missions" + + +class EnableLotVMissions(DefaultOnToggle): + """ + Enables missions from Legacy of the Void campaign. + """ + display_name = "Enable Legacy of the Void (main campaign) missions" + + +class EnableEpilogueMissions(DefaultOnToggle): + """ + Enables missions from Epilogue campaign. + These missions are considered very hard. + + Enabling Wings of Liberty, Heart of the Swarm and Legacy of the Void is strongly recommended in order to play Epilogue. + Not recommended for short mission orders. + See also: Exclude Very Hard Missions + """ + display_name = "Enable Epilogue missions" + + +class EnableNCOMissions(DefaultOnToggle): + """ + Enables missions from Nova Covert Ops campaign. + + Note: For best gameplay experience it's recommended to also enable Wings of Liberty campaign. + """ + display_name = "Enable Nova Covert Ops missions" + + +class ShuffleCampaigns(DefaultOnToggle): + """ + Shuffles the missions between campaigns if enabled. + Only available for Vanilla Shuffled and Mini Campaign mission order + """ + display_name = "Shuffle Campaigns" + + +class ShuffleNoBuild(DefaultOnToggle): + """ + Determines if the no-build missions are included in the shuffle. + If turned off, the no-build missions will not appear. Has no effect for Vanilla mission order. + """ + display_name = "Shuffle No-Build Missions" + + +class StarterUnit(Choice): + """ + Unlocks a random unit at the start of the game. + + Off: No units are provided, the first unit must be obtained from the randomizer + Balanced: A unit that doesn't give the player too much power early on is given + Any Starter Unit: Any starter unit can be given + """ + display_name = "Starter Unit" + option_off = 0 + option_balanced = 1 + option_any_starter_unit = 2 + + +class RequiredTactics(Choice): + """ + Determines the maximum tactical difficulty of the world (separate from mission difficulty). Higher settings + increase randomness. + + Standard: All missions can be completed with good micro and macro. + Advanced: Completing missions may require relying on starting units and micro-heavy units. + No Logic: Units and upgrades may be placed anywhere. LIKELY TO RENDER THE RUN IMPOSSIBLE ON HARDER DIFFICULTIES! + Locks Grant Story Tech option to true. + """ + display_name = "Required Tactics" + option_standard = 0 + option_advanced = 1 + option_no_logic = 2 + + +class GenericUpgradeMissions(Range): + """Determines the percentage of missions in the mission order that must be completed before + level 1 of all weapon and armor upgrades is unlocked. Level 2 upgrades require double the amount of missions, + and level 3 requires triple the amount. The required amounts are always rounded down. + If set to 0, upgrades are instead added to the item pool and must be found to be used.""" + display_name = "Generic Upgrade Missions" + range_start = 0 + range_end = 100 + default = 0 + + +class GenericUpgradeResearch(Choice): + """Determines how weapon and armor upgrades affect missions once unlocked. + + Vanilla: Upgrades must be researched as normal. + Auto In No-Build: In No-Build missions, upgrades are automatically researched. + In all other missions, upgrades must be researched as normal. + Auto In Build: In No-Build missions, upgrades are unavailable as normal. + In all other missions, upgrades are automatically researched. + Always Auto: Upgrades are automatically researched in all missions.""" + display_name = "Generic Upgrade Research" + option_vanilla = 0 + option_auto_in_no_build = 1 + option_auto_in_build = 2 + option_always_auto = 3 + + +class GenericUpgradeItems(Choice): + """Determines how weapon and armor upgrades are split into items. All options produce 3 levels of each item. + Does nothing if upgrades are unlocked by completed mission counts. + + Individual Items: All weapon and armor upgrades are each an item, + resulting in 18 total upgrade items for Terran and 15 total items for Zerg and Protoss each. + Bundle Weapon And Armor: All types of weapon upgrades are one item per race, + and all types of armor upgrades are one item per race, + resulting in 18 total items. + Bundle Unit Class: Weapon and armor upgrades are merged, + but upgrades are bundled separately for each race: + Infantry, Vehicle, and Starship upgrades for Terran (9 items), + Ground and Flyer upgrades for Zerg (6 items), + Ground and Air upgrades for Protoss (6 items), + resulting in 21 total items. + Bundle All: All weapon and armor upgrades are one item per race, + resulting in 9 total items.""" + display_name = "Generic Upgrade Items" + option_individual_items = 0 + option_bundle_weapon_and_armor = 1 + option_bundle_unit_class = 2 + option_bundle_all = 3 + + +class NovaCovertOpsItems(Toggle): + """ + If turned on, the equipment upgrades from Nova Covert Ops may be present in the world. + + If Nova Covert Ops campaign is enabled, this option is locked to be turned on. + """ + display_name = "Nova Covert Ops Items" + default = Toggle.option_true + + +class BroodWarItems(Toggle): + """If turned on, returning items from StarCraft: Brood War may appear in the world.""" + display_name = "Brood War Items" + default = Toggle.option_true + + +class ExtendedItems(Toggle): + """If turned on, original items that did not appear in Campaign mode may appear in the world.""" + display_name = "Extended Items" + default = Toggle.option_true + + +# Current maximum number of upgrades for a unit +MAX_UPGRADES_OPTION = 12 + + +class EnsureGenericItems(Range): + """ + Specifies a minimum percentage of the generic item pool that will be present for the slot. + The generic item pool is the pool of all generically useful items after all exclusions. + Generically-useful items include: Worker upgrades, Building upgrades, economy upgrades, + Mercenaries, Kerrigan levels and abilities, and Spear of Adun abilities + Increasing this percentage will make units less common. + """ + display_name = "Ensure Generic Items" + range_start = 0 + range_end = 100 + default = 25 + + +class MinNumberOfUpgrades(Range): + """ + Set a minimum to the number of upgrades a unit/structure can have. + Note that most units have 4 or 6 upgrades. + If a unit has fewer upgrades than the minimum, it will have all of its upgrades. + + Doesn't affect shared unit upgrades. + """ + display_name = "Minimum number of upgrades per unit/structure" + range_start = 0 + range_end = MAX_UPGRADES_OPTION + default = 2 + + +class MaxNumberOfUpgrades(Range): + """ + Set a maximum to the number of upgrades a unit/structure can have. -1 is used to define unlimited. + Note that most unit have 4 to 6 upgrades. + + Doesn't affect shared unit upgrades. + """ + display_name = "Maximum number of upgrades per unit/structure" + range_start = -1 + range_end = MAX_UPGRADES_OPTION + default = -1 + + +class KerriganPresence(Choice): + """ + Determines whether Kerrigan is playable outside of missions that require her. + + Vanilla: Kerrigan is playable as normal, appears in the same missions as in vanilla game. + Not Present: Kerrigan is not playable, unless the mission requires her to be present. Other hero units stay playable, + and locations normally requiring Kerrigan can be checked by any unit. + Kerrigan level items, active abilities and passive abilities affecting her will not appear. + In missions where the Kerrigan unit is required, story abilities are given in same way as Grant Story Tech is set to true + Not Present And No Passives: In addition to the above, Kerrigan's passive abilities affecting other units (such as Twin Drones) will not appear. + + Note: Always set to "Not Present" if Heart of the Swarm campaign is disabled. + """ + display_name = "Kerrigan Presence" + option_vanilla = 0 + option_not_present = 1 + option_not_present_and_no_passives = 2 + + +class KerriganLevelsPerMissionCompleted(Range): + """ + Determines how many levels Kerrigan gains when a mission is beaten. + + NOTE: Setting this too low can result in generation failures if The Infinite Cycle or Supreme are in the mission pool. + """ + display_name = "Levels Per Mission Beaten" + range_start = 0 + range_end = 20 + default = 0 + + +class KerriganLevelsPerMissionCompletedCap(Range): + """ + Limits how many total levels Kerrigan can gain from beating missions. This does not affect levels gained from items. + Set to -1 to disable this limit. + + NOTE: The following missions have these level requirements: + Supreme: 35 + The Infinite Cycle: 70 + See Grant Story Levels for more details. + """ + display_name = "Levels Per Mission Beaten Cap" + range_start = -1 + range_end = 140 + default = -1 + + +class KerriganLevelItemSum(Range): + """ + Determines the sum of the level items in the world. This does not affect levels gained from beating missions. + + NOTE: The following missions have these level requirements: + Supreme: 35 + The Infinite Cycle: 70 + See Grant Story Levels for more details. + """ + display_name = "Kerrigan Level Item Sum" + range_start = 0 + range_end = 140 + default = 70 + + +class KerriganLevelItemDistribution(Choice): + """Determines the amount and size of Kerrigan level items. + + Vanilla: Uses the distribution in the vanilla campaign. + This entails 32 individual levels and 6 packs of varying sizes. + This distribution always adds up to 70, ignoring the Level Item Sum setting. + Smooth: Uses a custom, condensed distribution of 10 items between sizes 4 and 10, + intended to fit more levels into settings with little room for filler while keeping some variance in level gains. + This distribution always adds up to 70, ignoring the Level Item Sum setting. + Size 70: Uses items worth 70 levels each. + Size 35: Uses items worth 35 levels each. + Size 14: Uses items worth 14 levels each. + Size 10: Uses items worth 10 levels each. + Size 7: Uses items worth 7 levels each. + Size 5: Uses items worth 5 levels each. + Size 2: Uses items worth 2 level eachs. + Size 1: Uses individual levels. As there are not enough locations in the game for this distribution, + this will result in a greatly reduced total level, and is likely to remove many other items.""" + display_name = "Kerrigan Level Item Distribution" + option_vanilla = 0 + option_smooth = 1 + option_size_70 = 2 + option_size_35 = 3 + option_size_14 = 4 + option_size_10 = 5 + option_size_7 = 6 + option_size_5 = 7 + option_size_2 = 8 + option_size_1 = 9 + default = option_smooth + + +class KerriganTotalLevelCap(Range): + """ + Limits how many total levels Kerrigan can gain from any source. Depending on your other settings, + there may be more levels available in the world, but they will not affect Kerrigan. + Set to -1 to disable this limit. + + NOTE: The following missions have these level requirements: + Supreme: 35 + The Infinite Cycle: 70 + See Grant Story Levels for more details. + """ + display_name = "Total Level Cap" + range_start = -1 + range_end = 140 + default = -1 + + +class StartPrimaryAbilities(Range): + """Number of Primary Abilities (Kerrigan Tier 1, 2, and 4) to start the game with. + If set to 4, a Tier 7 ability is also included.""" + display_name = "Starting Primary Abilities" + range_start = 0 + range_end = 4 + default = 0 + + +class KerriganPrimalStatus(Choice): + """Determines when Kerrigan appears in her Primal Zerg form. + This greatly increases her energy regeneration. + + Vanilla: Kerrigan is human in missions that canonically appear before The Crucible, + and zerg thereafter. + Always Zerg: Kerrigan is always zerg. + Always Human: Kerrigan is always human. + Level 35: Kerrigan is human until reaching level 35, and zerg thereafter. + Half Completion: Kerrigan is human until half of the missions in the world are completed, + and zerg thereafter. + Item: Kerrigan's Primal Form is an item. She is human until it is found, and zerg thereafter.""" + display_name = "Kerrigan Primal Status" + option_vanilla = 0 + option_always_zerg = 1 + option_always_human = 2 + option_level_35 = 3 + option_half_completion = 4 + option_item = 5 + + +class SpearOfAdunPresence(Choice): + """ + Determines in which missions Spear of Adun calldowns will be available. + Affects only abilities used from Spear of Adun top menu. + + Not Present: Spear of Adun calldowns are unavailable. + LotV Protoss: Spear of Adun calldowns are only available in LotV main campaign + Protoss: Spear od Adun calldowns are available in any Protoss mission + Everywhere: Spear od Adun calldowns are available in any mission of any race + """ + display_name = "Spear of Adun Presence" + option_not_present = 0 + option_lotv_protoss = 1 + option_protoss = 2 + option_everywhere = 3 + default = option_lotv_protoss + + # Fix case + @classmethod + def get_option_name(cls, value: int) -> str: + if value == SpearOfAdunPresence.option_lotv_protoss: + return "LotV Protoss" + else: + return super().get_option_name(value) + + +class SpearOfAdunPresentInNoBuild(Toggle): + """ + Determines if Spear of Adun calldowns are available in no-build missions. + + If turned on, Spear of Adun calldown powers are available in missions specified under "Spear of Adun Presence". + If turned off, Spear of Adun calldown powers are unavailable in all no-build missions + """ + display_name = "Spear of Adun Present in No-Build" + + +class SpearOfAdunAutonomouslyCastAbilityPresence(Choice): + """ + Determines availability of Spear of Adun powers, that are autonomously cast. + Affects abilities like Reconstruction Beam or Overwatch + + Not Presents: Autocasts are not available. + LotV Protoss: Spear of Adun autocasts are only available in LotV main campaign + Protoss: Spear od Adun autocasts are available in any Protoss mission + Everywhere: Spear od Adun autocasts are available in any mission of any race + """ + display_name = "Spear of Adun Autonomously Cast Powers Presence" + option_not_present = 0 + option_lotv_protoss = 1 + option_protoss = 2 + option_everywhere = 3 + default = option_lotv_protoss + + # Fix case + @classmethod + def get_option_name(cls, value: int) -> str: + if value == SpearOfAdunPresence.option_lotv_protoss: + return "LotV Protoss" + else: + return super().get_option_name(value) + + +class SpearOfAdunAutonomouslyCastPresentInNoBuild(Toggle): + """ + Determines if Spear of Adun autocasts are available in no-build missions. + + If turned on, Spear of Adun autocasts are available in missions specified under "Spear of Adun Autonomously Cast Powers Presence". + If turned off, Spear of Adun autocasts are unavailable in all no-build missions + """ + display_name = "Spear of Adun Autonomously Cast Powers Present in No-Build" + + +class GrantStoryTech(Toggle): + """ + If set true, grants special tech required for story mission completion for duration of the mission. + Otherwise, you need to find these tech by a normal means as items. + Affects story missions like Back in the Saddle and Supreme + + Locked to true if Required Tactics is set to no logic. + """ + display_name = "Grant Story Tech" + + +class GrantStoryLevels(Choice): + """ + If enabled, grants Kerrigan the required minimum levels for the following missions: + Supreme: 35 + The Infinite Cycle: 70 + The bonus levels only apply during the listed missions, and can exceed the Total Level Cap. + + If disabled, either of these missions is included, and there are not enough levels in the world, generation may fail. + To prevent this, either increase the amount of levels in the world, or enable this option. + + If disabled and Required Tactics is set to no logic, this option is forced to Minimum. + + Disabled: Kerrigan does not get bonus levels for these missions, + instead the levels must be gained from items or beating missions. + Additive: Kerrigan gains bonus levels equal to the mission's required level. + Minimum: Kerrigan is either at her real level, or at the mission's required level, + depending on which is higher. + """ + display_name = "Grant Story Levels" + option_disabled = 0 + option_additive = 1 + option_minimum = 2 + default = option_minimum + + +class TakeOverAIAllies(Toggle): + """ + On maps supporting this feature allows you to take control over an AI Ally. + """ + display_name = "Take Over AI Allies" + + +class LockedItems(ItemSet): + """Guarantees that these items will be unlockable""" + display_name = "Locked Items" + + +class ExcludedItems(ItemSet): + """Guarantees that these items will not be unlockable""" + display_name = "Excluded Items" + + +class ExcludedMissions(OptionSet): + """Guarantees that these missions will not appear in the campaign + Doesn't apply to vanilla mission order. + It may be impossible to build a valid campaign if too many missions are excluded.""" + display_name = "Excluded Missions" + valid_keys = {mission.mission_name for mission in SC2Mission} + + +class ExcludeVeryHardMissions(Choice): + """ + Excludes Very Hard missions outside of Epilogue campaign (All-In, Salvation, and all Epilogue missions are considered Very Hard). + Doesn't apply to "Vanilla" mission order. + + Default: Not excluded for mission orders "Vanilla Shuffled" or "Grid" with Maximum Campaign Size >= 20, + excluded for any other order + Yes: Non-Epilogue Very Hard missions are excluded and won't be generated + No: Non-Epilogue Very Hard missions can appear normally. Not recommended for too short mission orders. + + See also: Excluded Missions, Enable Epilogue Missions, Maximum Campaign Size + """ + display_name = "Exclude Very Hard Missions" + option_default = 0 + option_true = 1 + option_false = 2 + + @classmethod + def get_option_name(cls, value): + return ["Default", "Yes", "No"][int(value)] + + +class LocationInclusion(Choice): + option_enabled = 0 + option_resources = 1 + option_disabled = 2 + + +class VanillaLocations(LocationInclusion): + """ + Enables or disables item rewards for completing vanilla objectives. + Vanilla objectives are bonus objectives from the vanilla game, + along with some additional objectives to balance the missions. + Enable these locations for a balanced experience. + + Enabled: All locations fitting into this do their normal rewards + Resources: Forces these locations to contain Starting Resources + Disabled: Removes item rewards from these locations. + + Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. + See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) + """ + display_name = "Vanilla Locations" + + +class ExtraLocations(LocationInclusion): + """ + Enables or disables item rewards for mission progress and minor objectives. + This includes mandatory mission objectives, + collecting reinforcements and resource pickups, + destroying structures, and overcoming minor challenges. + Enables these locations to add more checks and items to your world. + + Enabled: All locations fitting into this do their normal rewards + Resources: Forces these locations to contain Starting Resources + Disabled: Removes item rewards from these locations. + + Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. + See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) + """ + display_name = "Extra Locations" + + +class ChallengeLocations(LocationInclusion): + """ + Enables or disables item rewards for completing challenge tasks. + Challenges are tasks that are more difficult than completing the mission, and are often based on achievements. + You might be required to visit the same mission later after getting stronger in order to finish these tasks. + Enable these locations to increase the difficulty of completing the multiworld. + + Enabled: All locations fitting into this do their normal rewards + Resources: Forces these locations to contain Starting Resources + Disabled: Removes item rewards from these locations. + + Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. + See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) + """ + display_name = "Challenge Locations" + + +class MasteryLocations(LocationInclusion): + """ + Enables or disables item rewards for overcoming especially difficult challenges. + These challenges are often based on Mastery achievements and Feats of Strength. + Enable these locations to add the most difficult checks to the world. + + Enabled: All locations fitting into this do their normal rewards + Resources: Forces these locations to contain Starting Resources + Disabled: Removes item rewards from these locations. + + Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. + See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) + """ + display_name = "Mastery Locations" + + +class MineralsPerItem(Range): + """ + Configures how many minerals are given per resource item. + """ + display_name = "Minerals Per Item" + range_start = 0 + range_end = 500 + default = 25 + + +class VespenePerItem(Range): + """ + Configures how much vespene gas is given per resource item. + """ + display_name = "Vespene Per Item" + range_start = 0 + range_end = 500 + default = 25 + + +class StartingSupplyPerItem(Range): + """ + Configures how much starting supply per is given per item. + """ + display_name = "Starting Supply Per Item" + range_start = 0 + range_end = 200 + default = 5 + + +@dataclass +class Starcraft2Options(PerGameCommonOptions): + game_difficulty: GameDifficulty + game_speed: GameSpeed + disable_forced_camera: DisableForcedCamera + skip_cutscenes: SkipCutscenes + all_in_map: AllInMap + mission_order: MissionOrder + maximum_campaign_size: MaximumCampaignSize + grid_two_start_positions: GridTwoStartPositions + player_color_terran_raynor: PlayerColorTerranRaynor + player_color_protoss: PlayerColorProtoss + player_color_zerg: PlayerColorZerg + player_color_zerg_primal: PlayerColorZergPrimal + enable_wol_missions: EnableWolMissions + enable_prophecy_missions: EnableProphecyMissions + enable_hots_missions: EnableHotsMissions + enable_lotv_prologue_missions: EnableLotVPrologueMissions + enable_lotv_missions: EnableLotVMissions + enable_epilogue_missions: EnableEpilogueMissions + enable_nco_missions: EnableNCOMissions + shuffle_campaigns: ShuffleCampaigns + shuffle_no_build: ShuffleNoBuild + starter_unit: StarterUnit + required_tactics: RequiredTactics + ensure_generic_items: EnsureGenericItems + min_number_of_upgrades: MinNumberOfUpgrades + max_number_of_upgrades: MaxNumberOfUpgrades + generic_upgrade_missions: GenericUpgradeMissions + generic_upgrade_research: GenericUpgradeResearch + generic_upgrade_items: GenericUpgradeItems + kerrigan_presence: KerriganPresence + kerrigan_levels_per_mission_completed: KerriganLevelsPerMissionCompleted + kerrigan_levels_per_mission_completed_cap: KerriganLevelsPerMissionCompletedCap + kerrigan_level_item_sum: KerriganLevelItemSum + kerrigan_level_item_distribution: KerriganLevelItemDistribution + kerrigan_total_level_cap: KerriganTotalLevelCap + start_primary_abilities: StartPrimaryAbilities + kerrigan_primal_status: KerriganPrimalStatus + spear_of_adun_presence: SpearOfAdunPresence + spear_of_adun_present_in_no_build: SpearOfAdunPresentInNoBuild + spear_of_adun_autonomously_cast_ability_presence: SpearOfAdunAutonomouslyCastAbilityPresence + spear_of_adun_autonomously_cast_present_in_no_build: SpearOfAdunAutonomouslyCastPresentInNoBuild + grant_story_tech: GrantStoryTech + grant_story_levels: GrantStoryLevels + take_over_ai_allies: TakeOverAIAllies + locked_items: LockedItems + excluded_items: ExcludedItems + excluded_missions: ExcludedMissions + exclude_very_hard_missions: ExcludeVeryHardMissions + nco_items: NovaCovertOpsItems + bw_items: BroodWarItems + ext_items: ExtendedItems + vanilla_locations: VanillaLocations + extra_locations: ExtraLocations + challenge_locations: ChallengeLocations + mastery_locations: MasteryLocations + minerals_per_item: MineralsPerItem + vespene_per_item: VespenePerItem + starting_supply_per_item: StartingSupplyPerItem + + +def get_option_value(world: World, name: str) -> Union[int, FrozenSet]: + if world is None: + field: Field = [class_field for class_field in fields(Starcraft2Options) if class_field.name == name][0] + return field.type.default + + player_option = getattr(world.options, name) + + return player_option.value + + +def get_enabled_campaigns(world: World) -> Set[SC2Campaign]: + enabled_campaigns = set() + if get_option_value(world, "enable_wol_missions"): + enabled_campaigns.add(SC2Campaign.WOL) + if get_option_value(world, "enable_prophecy_missions"): + enabled_campaigns.add(SC2Campaign.PROPHECY) + if get_option_value(world, "enable_hots_missions"): + enabled_campaigns.add(SC2Campaign.HOTS) + if get_option_value(world, "enable_lotv_prologue_missions"): + enabled_campaigns.add(SC2Campaign.PROLOGUE) + if get_option_value(world, "enable_lotv_missions"): + enabled_campaigns.add(SC2Campaign.LOTV) + if get_option_value(world, "enable_epilogue_missions"): + enabled_campaigns.add(SC2Campaign.EPILOGUE) + if get_option_value(world, "enable_nco_missions"): + enabled_campaigns.add(SC2Campaign.NCO) + return enabled_campaigns + + +def get_disabled_campaigns(world: World) -> Set[SC2Campaign]: + all_campaigns = set(SC2Campaign) + enabled_campaigns = get_enabled_campaigns(world) + disabled_campaigns = all_campaigns.difference(enabled_campaigns) + disabled_campaigns.remove(SC2Campaign.GLOBAL) + return disabled_campaigns + + +def get_excluded_missions(world: World) -> Set[SC2Mission]: + mission_order_type = get_option_value(world, "mission_order") + excluded_mission_names = get_option_value(world, "excluded_missions") + shuffle_no_build = get_option_value(world, "shuffle_no_build") + disabled_campaigns = get_disabled_campaigns(world) + + excluded_missions: Set[SC2Mission] = set([lookup_name_to_mission[name] for name in excluded_mission_names]) + + # Excluding Very Hard missions depending on options + if (get_option_value(world, "exclude_very_hard_missions") == ExcludeVeryHardMissions.option_true + ) or ( + get_option_value(world, "exclude_very_hard_missions") == ExcludeVeryHardMissions.option_default + and ( + mission_order_type not in [MissionOrder.option_vanilla_shuffled, MissionOrder.option_grid] + or ( + mission_order_type == MissionOrder.option_grid + and get_option_value(world, "maximum_campaign_size") < 20 + ) + ) + ): + excluded_missions = excluded_missions.union( + [mission for mission in SC2Mission if + mission.pool == MissionPools.VERY_HARD and mission.campaign != SC2Campaign.EPILOGUE] + ) + # Omitting No-Build missions if not shuffling no-build + if not shuffle_no_build: + excluded_missions = excluded_missions.union(get_no_build_missions()) + # Omitting missions not in enabled campaigns + for campaign in disabled_campaigns: + excluded_missions = excluded_missions.union(campaign_mission_table[campaign]) + + return excluded_missions + + +campaign_depending_orders = [ + MissionOrder.option_vanilla, + MissionOrder.option_vanilla_shuffled, + MissionOrder.option_mini_campaign +] + +kerrigan_unit_available = [ + KerriganPresence.option_vanilla, +] \ No newline at end of file diff --git a/worlds/sc2/PoolFilter.py b/worlds/sc2/PoolFilter.py new file mode 100644 index 000000000000..5f8151ed399f --- /dev/null +++ b/worlds/sc2/PoolFilter.py @@ -0,0 +1,595 @@ +from typing import Callable, Dict, List, Set, Union, Tuple +from BaseClasses import Item, Location +from .Items import get_full_item_list, spider_mine_sources, second_pass_placeable_items, progressive_if_nco, \ + progressive_if_ext, spear_of_adun_calldowns, spear_of_adun_castable_passives, nova_equipment +from .MissionTables import mission_orders, MissionInfo, MissionPools, \ + get_campaign_goal_priority, campaign_final_mission_locations, campaign_alt_final_mission_locations, \ + SC2Campaign, SC2Race, SC2CampaignGoalPriority, SC2Mission +from .Options import get_option_value, MissionOrder, \ + get_enabled_campaigns, get_disabled_campaigns, RequiredTactics, kerrigan_unit_available, GrantStoryTech, \ + TakeOverAIAllies, SpearOfAdunPresence, SpearOfAdunAutonomouslyCastAbilityPresence, campaign_depending_orders, \ + ShuffleCampaigns, get_excluded_missions, ShuffleNoBuild, ExtraLocations, GrantStoryLevels +from . import ItemNames +from worlds.AutoWorld import World + +# Items with associated upgrades +UPGRADABLE_ITEMS = {item.parent_item for item in get_full_item_list().values() if item.parent_item} + +BARRACKS_UNITS = { + ItemNames.MARINE, ItemNames.MEDIC, ItemNames.FIREBAT, ItemNames.MARAUDER, + ItemNames.REAPER, ItemNames.GHOST, ItemNames.SPECTRE, ItemNames.HERC, +} +FACTORY_UNITS = { + ItemNames.HELLION, ItemNames.VULTURE, ItemNames.GOLIATH, ItemNames.DIAMONDBACK, + ItemNames.SIEGE_TANK, ItemNames.THOR, ItemNames.PREDATOR, ItemNames.WIDOW_MINE, + ItemNames.CYCLONE, ItemNames.WARHOUND, +} +STARPORT_UNITS = { + ItemNames.MEDIVAC, ItemNames.WRAITH, ItemNames.VIKING, ItemNames.BANSHEE, + ItemNames.BATTLECRUISER, ItemNames.HERCULES, ItemNames.SCIENCE_VESSEL, ItemNames.RAVEN, + ItemNames.LIBERATOR, ItemNames.VALKYRIE, +} + + +def filter_missions(world: World) -> Dict[MissionPools, List[SC2Mission]]: + + """ + Returns a semi-randomly pruned tuple of no-build, easy, medium, and hard mission sets + """ + world: World = world + mission_order_type = get_option_value(world, "mission_order") + shuffle_no_build = get_option_value(world, "shuffle_no_build") + enabled_campaigns = get_enabled_campaigns(world) + grant_story_tech = get_option_value(world, "grant_story_tech") == GrantStoryTech.option_true + grant_story_levels = get_option_value(world, "grant_story_levels") != GrantStoryLevels.option_disabled + extra_locations = get_option_value(world, "extra_locations") + excluded_missions: Set[SC2Mission] = get_excluded_missions(world) + mission_pools: Dict[MissionPools, List[SC2Mission]] = {} + for mission in SC2Mission: + if not mission_pools.get(mission.pool): + mission_pools[mission.pool] = list() + mission_pools[mission.pool].append(mission) + # A bit of safeguard: + for mission_pool in MissionPools: + if not mission_pools.get(mission_pool): + mission_pools[mission_pool] = [] + + if mission_order_type == MissionOrder.option_vanilla: + # Vanilla uses the entire mission pool + goal_priorities: Dict[SC2Campaign, SC2CampaignGoalPriority] = {campaign: get_campaign_goal_priority(campaign) for campaign in enabled_campaigns} + goal_level = max(goal_priorities.values()) + candidate_campaigns = [campaign for campaign, goal_priority in goal_priorities.items() if goal_priority == goal_level] + goal_campaign = world.random.choice(candidate_campaigns) + if campaign_final_mission_locations[goal_campaign] is not None: + mission_pools[MissionPools.FINAL] = [campaign_final_mission_locations[goal_campaign].mission] + else: + mission_pools[MissionPools.FINAL] = [list(campaign_alt_final_mission_locations[goal_campaign].keys())[0]] + remove_final_mission_from_other_pools(mission_pools) + return mission_pools + + # Finding the goal map + goal_priorities = {campaign: get_campaign_goal_priority(campaign, excluded_missions) for campaign in enabled_campaigns} + goal_level = max(goal_priorities.values()) + candidate_campaigns = [campaign for campaign, goal_priority in goal_priorities.items() if goal_priority == goal_level] + goal_campaign = world.random.choice(candidate_campaigns) + primary_goal = campaign_final_mission_locations[goal_campaign] + if primary_goal is None or primary_goal.mission in excluded_missions: + # No primary goal or its mission is excluded + candidate_missions = list(campaign_alt_final_mission_locations[goal_campaign].keys()) + candidate_missions = [mission for mission in candidate_missions if mission not in excluded_missions] + if len(candidate_missions) == 0: + raise Exception("There are no valid goal missions. Please exclude fewer missions.") + goal_mission = world.random.choice(candidate_missions) + else: + goal_mission = primary_goal.mission + + # Excluding missions + for difficulty, mission_pool in mission_pools.items(): + mission_pools[difficulty] = [mission for mission in mission_pool if mission not in excluded_missions] + mission_pools[MissionPools.FINAL] = [goal_mission] + + # Mission pool changes + adv_tactics = get_option_value(world, "required_tactics") != RequiredTactics.option_standard + + def move_mission(mission: SC2Mission, current_pool, new_pool): + if mission in mission_pools[current_pool]: + mission_pools[current_pool].remove(mission) + mission_pools[new_pool].append(mission) + # WoL + if shuffle_no_build == ShuffleNoBuild.option_false or adv_tactics: + # Replacing No Build missions with Easy missions + # WoL + move_mission(SC2Mission.ZERO_HOUR, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.EVACUATION, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.DEVILS_PLAYGROUND, MissionPools.EASY, MissionPools.STARTER) + # LotV + move_mission(SC2Mission.THE_GROWING_SHADOW, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.THE_SPEAR_OF_ADUN, MissionPools.EASY, MissionPools.STARTER) + if extra_locations == ExtraLocations.option_enabled: + move_mission(SC2Mission.SKY_SHIELD, MissionPools.EASY, MissionPools.STARTER) + # Pushing this to Easy + move_mission(SC2Mission.THE_GREAT_TRAIN_ROBBERY, MissionPools.MEDIUM, MissionPools.EASY) + if shuffle_no_build == ShuffleNoBuild.option_false: + # Pushing Outbreak to Normal, as it cannot be placed as the second mission on Build-Only + move_mission(SC2Mission.OUTBREAK, MissionPools.EASY, MissionPools.MEDIUM) + # Pushing extra Normal missions to Easy + move_mission(SC2Mission.ECHOES_OF_THE_FUTURE, MissionPools.MEDIUM, MissionPools.EASY) + move_mission(SC2Mission.CUTTHROAT, MissionPools.MEDIUM, MissionPools.EASY) + # Additional changes on Advanced Tactics + if adv_tactics: + # WoL + move_mission(SC2Mission.THE_GREAT_TRAIN_ROBBERY, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.SMASH_AND_GRAB, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.THE_MOEBIUS_FACTOR, MissionPools.MEDIUM, MissionPools.EASY) + move_mission(SC2Mission.WELCOME_TO_THE_JUNGLE, MissionPools.MEDIUM, MissionPools.EASY) + move_mission(SC2Mission.ENGINE_OF_DESTRUCTION, MissionPools.HARD, MissionPools.MEDIUM) + # LotV + move_mission(SC2Mission.AMON_S_REACH, MissionPools.EASY, MissionPools.STARTER) + # Prophecy needs to be adjusted on tiny grid + if enabled_campaigns == {SC2Campaign.PROPHECY} and mission_order_type == MissionOrder.option_tiny_grid: + move_mission(SC2Mission.A_SINISTER_TURN, MissionPools.MEDIUM, MissionPools.EASY) + # Prologue's only valid starter is the goal mission + if enabled_campaigns == {SC2Campaign.PROLOGUE} \ + or mission_order_type in campaign_depending_orders \ + and get_option_value(world, "shuffle_campaigns") == ShuffleCampaigns.option_false: + move_mission(SC2Mission.DARK_WHISPERS, MissionPools.EASY, MissionPools.STARTER) + # HotS + kerriganless = get_option_value(world, "kerrigan_presence") not in kerrigan_unit_available \ + or SC2Campaign.HOTS not in enabled_campaigns + if adv_tactics: + # Medium -> Easy + for mission in (SC2Mission.FIRE_IN_THE_SKY, SC2Mission.WAKING_THE_ANCIENT, SC2Mission.CONVICTION): + move_mission(mission, MissionPools.MEDIUM, MissionPools.EASY) + # Hard -> Medium + move_mission(SC2Mission.PHANTOMS_OF_THE_VOID, MissionPools.HARD, MissionPools.MEDIUM) + if not kerriganless: + # Additional starter mission assuming player starts with minimal anti-air + move_mission(SC2Mission.WAKING_THE_ANCIENT, MissionPools.EASY, MissionPools.STARTER) + if grant_story_tech: + # Additional starter mission if player is granted story tech + move_mission(SC2Mission.ENEMY_WITHIN, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.TEMPLAR_S_RETURN, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.THE_ESCAPE, MissionPools.MEDIUM, MissionPools.STARTER) + move_mission(SC2Mission.IN_THE_ENEMY_S_SHADOW, MissionPools.MEDIUM, MissionPools.STARTER) + if (grant_story_tech and grant_story_levels) or kerriganless: + # The player has, all the stuff he needs, provided under these settings + move_mission(SC2Mission.SUPREME, MissionPools.MEDIUM, MissionPools.STARTER) + move_mission(SC2Mission.THE_INFINITE_CYCLE, MissionPools.HARD, MissionPools.STARTER) + if get_option_value(world, "take_over_ai_allies") == TakeOverAIAllies.option_true: + move_mission(SC2Mission.HARBINGER_OF_OBLIVION, MissionPools.MEDIUM, MissionPools.STARTER) + if len(mission_pools[MissionPools.STARTER]) < 2 and not kerriganless or adv_tactics: + # Conditionally moving Easy missions to Starter + move_mission(SC2Mission.HARVEST_OF_SCREAMS, MissionPools.EASY, MissionPools.STARTER) + move_mission(SC2Mission.DOMINATION, MissionPools.EASY, MissionPools.STARTER) + if len(mission_pools[MissionPools.STARTER]) < 2: + move_mission(SC2Mission.TEMPLAR_S_RETURN, MissionPools.EASY, MissionPools.STARTER) + if len(mission_pools[MissionPools.STARTER]) + len(mission_pools[MissionPools.EASY]) < 2: + # Flashpoint needs just a few items at start but competent comp at the end + move_mission(SC2Mission.FLASHPOINT, MissionPools.HARD, MissionPools.EASY) + + remove_final_mission_from_other_pools(mission_pools) + return mission_pools + + +def remove_final_mission_from_other_pools(mission_pools: Dict[MissionPools, List[SC2Mission]]): + final_missions = mission_pools[MissionPools.FINAL] + for pool, missions in mission_pools.items(): + if pool == MissionPools.FINAL: + continue + for final_mission in final_missions: + while final_mission in missions: + missions.remove(final_mission) + + +def get_item_upgrades(inventory: List[Item], parent_item: Union[Item, str]) -> List[Item]: + item_name = parent_item.name if isinstance(parent_item, Item) else parent_item + return [ + inv_item for inv_item in inventory + if get_full_item_list()[inv_item.name].parent_item == item_name + ] + + +def get_item_quantity(item: Item, world: World): + if (not get_option_value(world, "nco_items")) \ + and SC2Campaign.NCO in get_disabled_campaigns(world) \ + and item.name in progressive_if_nco: + return 1 + if (not get_option_value(world, "ext_items")) \ + and item.name in progressive_if_ext: + return 1 + return get_full_item_list()[item.name].quantity + + +def copy_item(item: Item): + return Item(item.name, item.classification, item.code, item.player) + + +def num_missions(world: World) -> int: + mission_order_type = get_option_value(world, "mission_order") + if mission_order_type != MissionOrder.option_grid: + mission_order = mission_orders[mission_order_type]() + misssions = [mission for campaign in mission_order for mission in mission_order[campaign]] + return len(misssions) - 1 # Menu + else: + mission_pools = filter_missions(world) + return sum(len(pool) for _, pool in mission_pools.items()) + + +class ValidInventory: + + def has(self, item: str, player: int): + return item in self.logical_inventory + + def has_any(self, items: Set[str], player: int): + return any(item in self.logical_inventory for item in items) + + def has_all(self, items: Set[str], player: int): + return all(item in self.logical_inventory for item in items) + + def has_group(self, item_group: str, player: int, count: int = 1): + return False # Deliberately fails here, as item pooling is not aware about mission layout + + def count_group(self, item_name_group: str, player: int) -> int: + return 0 # For item filtering assume no missions are beaten + + def count(self, item: str, player: int) -> int: + return len([inventory_item for inventory_item in self.logical_inventory if inventory_item == item]) + + def has_units_per_structure(self) -> bool: + return len(BARRACKS_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure and \ + len(FACTORY_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure and \ + len(STARPORT_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure + + def generate_reduced_inventory(self, inventory_size: int, mission_requirements: List[Tuple[str, Callable]]) -> List[Item]: + """Attempts to generate a reduced inventory that can fulfill the mission requirements.""" + inventory = list(self.item_pool) + locked_items = list(self.locked_items) + item_list = get_full_item_list() + self.logical_inventory = [ + item.name for item in inventory + locked_items + self.existing_items + if item_list[item.name].is_important_for_filtering() # Track all Progression items and those with complex rules for filtering + ] + requirements = mission_requirements + parent_items = self.item_children.keys() + parent_lookup = {child: parent for parent, children in self.item_children.items() for child in children} + minimum_upgrades = get_option_value(self.world, "min_number_of_upgrades") + + def attempt_removal(item: Item) -> bool: + inventory.remove(item) + # Only run logic checks when removing logic items + if item.name in self.logical_inventory: + self.logical_inventory.remove(item.name) + if not all(requirement(self) for (_, requirement) in mission_requirements): + # If item cannot be removed, lock or revert + self.logical_inventory.append(item.name) + for _ in range(get_item_quantity(item, self.world)): + locked_items.append(copy_item(item)) + return False + return True + + # Limit the maximum number of upgrades + maxNbUpgrade = get_option_value(self.world, "max_number_of_upgrades") + if maxNbUpgrade != -1: + unit_avail_upgrades = {} + # Needed to take into account locked/existing items + unit_nb_upgrades = {} + for item in inventory: + cItem = item_list[item.name] + if item.name in UPGRADABLE_ITEMS and item.name not in unit_avail_upgrades: + unit_avail_upgrades[item.name] = [] + unit_nb_upgrades[item.name] = 0 + elif cItem.parent_item is not None: + if cItem.parent_item not in unit_avail_upgrades: + unit_avail_upgrades[cItem.parent_item] = [item] + unit_nb_upgrades[cItem.parent_item] = 1 + else: + unit_avail_upgrades[cItem.parent_item].append(item) + unit_nb_upgrades[cItem.parent_item] += 1 + # For those two categories, we count them but dont include them in removal + for item in locked_items + self.existing_items: + cItem = item_list[item.name] + if item.name in UPGRADABLE_ITEMS and item.name not in unit_avail_upgrades: + unit_avail_upgrades[item.name] = [] + unit_nb_upgrades[item.name] = 0 + elif cItem.parent_item is not None: + if cItem.parent_item not in unit_avail_upgrades: + unit_nb_upgrades[cItem.parent_item] = 1 + else: + unit_nb_upgrades[cItem.parent_item] += 1 + # Making sure that the upgrades being removed is random + shuffled_unit_upgrade_list = list(unit_avail_upgrades.keys()) + self.world.random.shuffle(shuffled_unit_upgrade_list) + for unit in shuffled_unit_upgrade_list: + while (unit_nb_upgrades[unit] > maxNbUpgrade) \ + and (len(unit_avail_upgrades[unit]) > 0): + itemCandidate = self.world.random.choice(unit_avail_upgrades[unit]) + success = attempt_removal(itemCandidate) + # Whatever it succeed to remove the iventory or it fails and thus + # lock it, the upgrade is no longer available for removal + unit_avail_upgrades[unit].remove(itemCandidate) + if success: + unit_nb_upgrades[unit] -= 1 + + # Locking minimum upgrades for items that have already been locked/placed when minimum required + if minimum_upgrades > 0: + known_items = self.existing_items + locked_items + known_parents = [item for item in known_items if item in parent_items] + for parent in known_parents: + child_items = self.item_children[parent] + removable_upgrades = [item for item in inventory if item in child_items] + locked_upgrade_count = sum(1 if item in child_items else 0 for item in known_items) + self.world.random.shuffle(removable_upgrades) + while len(removable_upgrades) > 0 and locked_upgrade_count < minimum_upgrades: + item_to_lock = removable_upgrades.pop() + inventory.remove(item_to_lock) + locked_items.append(copy_item(item_to_lock)) + locked_upgrade_count += 1 + + if self.min_units_per_structure > 0 and self.has_units_per_structure(): + requirements.append(("Minimum units per structure", lambda state: state.has_units_per_structure())) + + # Determining if the full-size inventory can complete campaign + failed_locations: List[str] = [location for (location, requirement) in requirements if not requirement(self)] + if len(failed_locations) > 0: + raise Exception(f"Too many items excluded - couldn't satisfy access rules for the following locations:\n{failed_locations}") + + # Optionally locking generic items + generic_items = [item for item in inventory if item.name in second_pass_placeable_items] + reserved_generic_percent = get_option_value(self.world, "ensure_generic_items") / 100 + reserved_generic_amount = int(len(generic_items) * reserved_generic_percent) + removable_generic_items = [] + self.world.random.shuffle(generic_items) + for item in generic_items[:reserved_generic_amount]: + locked_items.append(copy_item(item)) + inventory.remove(item) + if item.name not in self.logical_inventory and item.name not in self.locked_items: + removable_generic_items.append(item) + + # Main cull process + unused_items = [] # Reusable items for the second pass + while len(inventory) + len(locked_items) > inventory_size: + if len(inventory) == 0: + # There are more items than locations and all of them are already locked due to YAML or logic. + # First, drop non-logic generic items to free up space + while len(removable_generic_items) > 0 and len(locked_items) > inventory_size: + removed_item = removable_generic_items.pop() + locked_items.remove(removed_item) + # If there still isn't enough space, push locked items into start inventory + self.world.random.shuffle(locked_items) + while len(locked_items) > inventory_size: + item: Item = locked_items.pop() + self.multiworld.push_precollected(item) + break + # Select random item from removable items + item = self.world.random.choice(inventory) + # Do not remove item if it would drop upgrades below minimum + if minimum_upgrades > 0: + parent_item = parent_lookup.get(item, None) + if parent_item: + count = sum(1 if item in self.item_children[parent_item] else 0 for item in inventory + locked_items) + if count <= minimum_upgrades: + if parent_item in inventory: + # Attempt to remove parent instead, if possible + item = parent_item + else: + # Lock remaining upgrades + for item in self.item_children[parent_item]: + if item in inventory: + inventory.remove(item) + locked_items.append(copy_item(item)) + continue + + # Drop child items when removing a parent + if item in parent_items: + items_to_remove = [item for item in self.item_children[item] if item in inventory] + success = attempt_removal(item) + if success: + while len(items_to_remove) > 0: + item_to_remove = items_to_remove.pop() + if item_to_remove not in inventory: + continue + attempt_removal(item_to_remove) + else: + # Unimportant upgrades may be added again in the second pass + if attempt_removal(item): + unused_items.append(item.name) + + # Removing extra dependencies + # WoL + logical_inventory_set = set(self.logical_inventory) + if not spider_mine_sources & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Spider Mine)")] + if not BARRACKS_UNITS & logical_inventory_set: + inventory = [item for item in inventory if + not (item.name.startswith(ItemNames.TERRAN_INFANTRY_UPGRADE_PREFIX) or item.name == ItemNames.ORBITAL_STRIKE)] + if not FACTORY_UNITS & logical_inventory_set: + inventory = [item for item in inventory if not item.name.startswith(ItemNames.TERRAN_VEHICLE_UPGRADE_PREFIX)] + if not STARPORT_UNITS & logical_inventory_set: + inventory = [item for item in inventory if not item.name.startswith(ItemNames.TERRAN_SHIP_UPGRADE_PREFIX)] + # HotS + # Baneling without sources => remove Baneling and upgrades + if (ItemNames.ZERGLING_BANELING_ASPECT in self.logical_inventory + and ItemNames.ZERGLING not in self.logical_inventory + and ItemNames.KERRIGAN_SPAWN_BANELINGS not in self.logical_inventory + ): + inventory = [item for item in inventory if item.name != ItemNames.ZERGLING_BANELING_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.ZERGLING_BANELING_ASPECT] + # Spawn Banelings without Zergling => remove Baneling unit, keep upgrades except macro ones + if (ItemNames.ZERGLING_BANELING_ASPECT in self.logical_inventory + and ItemNames.ZERGLING not in self.logical_inventory + and ItemNames.KERRIGAN_SPAWN_BANELINGS in self.logical_inventory + ): + inventory = [item for item in inventory if item.name != ItemNames.ZERGLING_BANELING_ASPECT] + inventory = [item for item in inventory if item.name != ItemNames.BANELING_RAPID_METAMORPH] + if not {ItemNames.MUTALISK, ItemNames.CORRUPTOR, ItemNames.SCOURGE} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.startswith(ItemNames.ZERG_FLYER_UPGRADE_PREFIX)] + locked_items = [item for item in locked_items if not item.name.startswith(ItemNames.ZERG_FLYER_UPGRADE_PREFIX)] + # T3 items removal rules - remove morph and its upgrades if the basic unit isn't in + if not {ItemNames.MUTALISK, ItemNames.CORRUPTOR} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Mutalisk/Corruptor)")] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.MUTALISK_CORRUPTOR_DEVOURER_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT] + if ItemNames.ROACH not in logical_inventory_set: + inventory = [item for item in inventory if item.name != ItemNames.ROACH_RAVAGER_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.ROACH_RAVAGER_ASPECT] + if ItemNames.HYDRALISK not in logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Hydralisk)")] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.HYDRALISK_LURKER_ASPECT] + inventory = [item for item in inventory if item_list[item.name].parent_item != ItemNames.HYDRALISK_IMPALER_ASPECT] + # LotV + # Shared unit upgrades between several units + if not {ItemNames.STALKER, ItemNames.INSTIGATOR, ItemNames.SLAYER} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Stalker/Instigator/Slayer)")] + if not {ItemNames.PHOENIX, ItemNames.MIRAGE} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Phoenix/Mirage)")] + if not {ItemNames.VOID_RAY, ItemNames.DESTROYER} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Void Ray/Destroyer)")] + if not {ItemNames.IMMORTAL, ItemNames.ANNIHILATOR} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Immortal/Annihilator)")] + if not {ItemNames.DARK_TEMPLAR, ItemNames.AVENGER, ItemNames.BLOOD_HUNTER} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Dark Templar/Avenger/Blood Hunter)")] + if not {ItemNames.HIGH_TEMPLAR, ItemNames.SIGNIFIER, ItemNames.ASCENDANT, ItemNames.DARK_TEMPLAR} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Archon)")] + logical_inventory_set.difference_update([item_name for item_name in logical_inventory_set if item_name.endswith("(Archon)")]) + if not {ItemNames.HIGH_TEMPLAR, ItemNames.SIGNIFIER, ItemNames.ARCHON_HIGH_ARCHON} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(High Templar/Signifier)")] + if ItemNames.SUPPLICANT not in logical_inventory_set: + inventory = [item for item in inventory if item.name != ItemNames.ASCENDANT_POWER_OVERWHELMING] + if not {ItemNames.DARK_ARCHON, ItemNames.DARK_TEMPLAR_DARK_ARCHON_MELD} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Dark Archon)")] + if not {ItemNames.SENTRY, ItemNames.ENERGIZER, ItemNames.HAVOC} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Sentry/Energizer/Havoc)")] + if not {ItemNames.SENTRY, ItemNames.ENERGIZER, ItemNames.HAVOC, ItemNames.SHIELD_BATTERY} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Sentry/Energizer/Havoc/Shield Battery)")] + if not {ItemNames.ZEALOT, ItemNames.CENTURION, ItemNames.SENTINEL} & logical_inventory_set: + inventory = [item for item in inventory if not item.name.endswith("(Zealot/Sentinel/Centurion)")] + # Static defense upgrades only if static defense present + if not {ItemNames.PHOTON_CANNON, ItemNames.KHAYDARIN_MONOLITH, ItemNames.NEXUS_OVERCHARGE, ItemNames.SHIELD_BATTERY} & logical_inventory_set: + inventory = [item for item in inventory if item.name != ItemNames.ENHANCED_TARGETING] + if not {ItemNames.PHOTON_CANNON, ItemNames.KHAYDARIN_MONOLITH, ItemNames.NEXUS_OVERCHARGE} & logical_inventory_set: + inventory = [item for item in inventory if item.name != ItemNames.OPTIMIZED_ORDNANCE] + + # Cull finished, adding locked items back into inventory + inventory += locked_items + + # Replacing empty space with generically useful items + replacement_items = [item for item in self.item_pool + if (item not in inventory + and item not in self.locked_items + and ( + item.name in second_pass_placeable_items + or item.name in unused_items))] + self.world.random.shuffle(replacement_items) + while len(inventory) < inventory_size and len(replacement_items) > 0: + item = replacement_items.pop() + inventory.append(item) + + return inventory + + def __init__(self, world: World , + item_pool: List[Item], existing_items: List[Item], locked_items: List[Item], + used_races: Set[SC2Race], nova_equipment_used: bool): + self.multiworld = world.multiworld + self.player = world.player + self.world: World = world + self.logical_inventory = list() + self.locked_items = locked_items[:] + self.existing_items = existing_items + soa_presence = get_option_value(world, "spear_of_adun_presence") + soa_autocast_presence = get_option_value(world, "spear_of_adun_autonomously_cast_ability_presence") + # Initial filter of item pool + self.item_pool = [] + item_quantities: dict[str, int] = dict() + # Inventory restrictiveness based on number of missions with checks + mission_count = num_missions(world) + self.min_units_per_structure = int(mission_count / 7) + min_upgrades = 1 if mission_count < 10 else 2 + for item in item_pool: + item_info = get_full_item_list()[item.name] + if item_info.race != SC2Race.ANY and item_info.race not in used_races: + if soa_presence == SpearOfAdunPresence.option_everywhere \ + and item.name in spear_of_adun_calldowns: + # Add SoA powers regardless of used races as it's present everywhere + self.item_pool.append(item) + if soa_autocast_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_everywhere \ + and item.name in spear_of_adun_castable_passives: + self.item_pool.append(item) + # Drop any item belonging to a race not used in the campaign + continue + if item.name in nova_equipment and not nova_equipment_used: + # Drop Nova equipment if there's no NCO mission generated + continue + if item_info.type == "Upgrade": + # Locking upgrades based on mission duration + if item.name not in item_quantities: + item_quantities[item.name] = 0 + item_quantities[item.name] += 1 + if item_quantities[item.name] <= min_upgrades: + self.locked_items.append(item) + else: + self.item_pool.append(item) + elif item_info.type == "Goal": + self.locked_items.append(item) + else: + self.item_pool.append(item) + self.item_children: Dict[Item, List[Item]] = dict() + for item in self.item_pool + locked_items + existing_items: + if item.name in UPGRADABLE_ITEMS: + self.item_children[item] = get_item_upgrades(self.item_pool, item) + + +def filter_items(world: World, mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]], location_cache: List[Location], + item_pool: List[Item], existing_items: List[Item], locked_items: List[Item]) -> List[Item]: + """ + Returns a semi-randomly pruned set of items based on number of available locations. + The returned inventory must be capable of logically accessing every location in the world. + """ + open_locations = [location for location in location_cache if location.item is None] + inventory_size = len(open_locations) + used_races = get_used_races(mission_req_table, world) + nova_equipment_used = is_nova_equipment_used(mission_req_table) + mission_requirements = [(location.name, location.access_rule) for location in location_cache] + valid_inventory = ValidInventory(world, item_pool, existing_items, locked_items, used_races, nova_equipment_used) + + valid_items = valid_inventory.generate_reduced_inventory(inventory_size, mission_requirements) + return valid_items + + +def get_used_races(mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]], world: World) -> Set[SC2Race]: + grant_story_tech = get_option_value(world, "grant_story_tech") + take_over_ai_allies = get_option_value(world, "take_over_ai_allies") + kerrigan_presence = get_option_value(world, "kerrigan_presence") \ + and SC2Campaign.HOTS in get_enabled_campaigns(world) + missions = missions_in_mission_table(mission_req_table) + + # By missions + races = set([mission.race for mission in missions]) + + # Conditionally logic-less no-builds (They're set to SC2Race.ANY): + if grant_story_tech == GrantStoryTech.option_false: + if SC2Mission.ENEMY_WITHIN in missions: + # Zerg units need to be unlocked + races.add(SC2Race.ZERG) + if kerrigan_presence in kerrigan_unit_available \ + and not missions.isdisjoint({SC2Mission.BACK_IN_THE_SADDLE, SC2Mission.SUPREME, SC2Mission.CONVICTION, SC2Mission.THE_INFINITE_CYCLE}): + # You need some Kerrigan abilities (they're granted if Kerriganless or story tech granted) + races.add(SC2Race.ZERG) + + # If you take over the AI Ally, you need to have its race stuff + if take_over_ai_allies == TakeOverAIAllies.option_true \ + and not missions.isdisjoint({SC2Mission.THE_RECKONING}): + # Jimmy in The Reckoning + races.add(SC2Race.TERRAN) + + return races + +def is_nova_equipment_used(mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]]) -> bool: + missions = missions_in_mission_table(mission_req_table) + return any([mission.campaign == SC2Campaign.NCO for mission in missions]) + + +def missions_in_mission_table(mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]]) -> Set[SC2Mission]: + return set([mission.mission for campaign_missions in mission_req_table.values() for mission in + campaign_missions.values()]) diff --git a/worlds/sc2/Regions.py b/worlds/sc2/Regions.py new file mode 100644 index 000000000000..e6c001b186a7 --- /dev/null +++ b/worlds/sc2/Regions.py @@ -0,0 +1,691 @@ +from typing import List, Dict, Tuple, Optional, Callable, NamedTuple, Union +import math + +from BaseClasses import MultiWorld, Region, Entrance, Location, CollectionState +from .Locations import LocationData +from .Options import get_option_value, MissionOrder, get_enabled_campaigns, campaign_depending_orders, \ + GridTwoStartPositions +from .MissionTables import MissionInfo, mission_orders, vanilla_mission_req_table, \ + MissionPools, SC2Campaign, get_goal_location, SC2Mission, MissionConnection +from .PoolFilter import filter_missions +from worlds.AutoWorld import World + + +class SC2MissionSlot(NamedTuple): + campaign: SC2Campaign + slot: Union[MissionPools, SC2Mission, None] + + +def create_regions( + world: World, locations: Tuple[LocationData, ...], location_cache: List[Location] +) -> Tuple[Dict[SC2Campaign, Dict[str, MissionInfo]], int, str]: + """ + Creates region connections by calling the multiworld's `connect()` methods + Returns a 3-tuple containing: + * dict[SC2Campaign, Dict[str, MissionInfo]] mapping a campaign and mission name to its data + * int The number of missions in the world + * str The name of the goal location + """ + mission_order_type: int = get_option_value(world, "mission_order") + + if mission_order_type == MissionOrder.option_vanilla: + return create_vanilla_regions(world, locations, location_cache) + elif mission_order_type == MissionOrder.option_grid: + return create_grid_regions(world, locations, location_cache) + else: + return create_structured_regions(world, locations, location_cache, mission_order_type) + +def create_vanilla_regions( + world: World, + locations: Tuple[LocationData, ...], + location_cache: List[Location], +) -> Tuple[Dict[SC2Campaign, Dict[str, MissionInfo]], int, str]: + locations_per_region = get_locations_per_region(locations) + regions = [create_region(world, locations_per_region, location_cache, "Menu")] + + mission_pools: Dict[MissionPools, List[SC2Mission]] = filter_missions(world) + final_mission = mission_pools[MissionPools.FINAL][0] + + enabled_campaigns = get_enabled_campaigns(world) + names: Dict[str, int] = {} + + # Generating all regions and locations for each enabled campaign + for campaign in enabled_campaigns: + for region_name in vanilla_mission_req_table[campaign].keys(): + regions.append(create_region(world, locations_per_region, location_cache, region_name)) + world.multiworld.regions += regions + vanilla_mission_reqs = {campaign: missions for campaign, missions in vanilla_mission_req_table.items() if campaign in enabled_campaigns} + + def wol_cleared_missions(state: CollectionState, mission_count: int) -> bool: + return state.has_group("WoL Missions", world.player, mission_count) + + player: int = world.player + if SC2Campaign.WOL in enabled_campaigns: + connect(world, names, 'Menu', 'Liberation Day') + connect(world, names, 'Liberation Day', 'The Outlaws', + lambda state: state.has("Beat Liberation Day", player)) + connect(world, names, 'The Outlaws', 'Zero Hour', + lambda state: state.has("Beat The Outlaws", player)) + connect(world, names, 'Zero Hour', 'Evacuation', + lambda state: state.has("Beat Zero Hour", player)) + connect(world, names, 'Evacuation', 'Outbreak', + lambda state: state.has("Beat Evacuation", player)) + connect(world, names, "Outbreak", "Safe Haven", + lambda state: wol_cleared_missions(state, 7) and state.has("Beat Outbreak", player)) + connect(world, names, "Outbreak", "Haven's Fall", + lambda state: wol_cleared_missions(state, 7) and state.has("Beat Outbreak", player)) + connect(world, names, 'Zero Hour', 'Smash and Grab', + lambda state: state.has("Beat Zero Hour", player)) + connect(world, names, 'Smash and Grab', 'The Dig', + lambda state: wol_cleared_missions(state, 8) and state.has("Beat Smash and Grab", player)) + connect(world, names, 'The Dig', 'The Moebius Factor', + lambda state: wol_cleared_missions(state, 11) and state.has("Beat The Dig", player)) + connect(world, names, 'The Moebius Factor', 'Supernova', + lambda state: wol_cleared_missions(state, 14) and state.has("Beat The Moebius Factor", player)) + connect(world, names, 'Supernova', 'Maw of the Void', + lambda state: state.has("Beat Supernova", player)) + connect(world, names, 'Zero Hour', "Devil's Playground", + lambda state: wol_cleared_missions(state, 4) and state.has("Beat Zero Hour", player)) + connect(world, names, "Devil's Playground", 'Welcome to the Jungle', + lambda state: state.has("Beat Devil's Playground", player)) + connect(world, names, "Welcome to the Jungle", 'Breakout', + lambda state: wol_cleared_missions(state, 8) and state.has("Beat Welcome to the Jungle", player)) + connect(world, names, "Welcome to the Jungle", 'Ghost of a Chance', + lambda state: wol_cleared_missions(state, 8) and state.has("Beat Welcome to the Jungle", player)) + connect(world, names, "Zero Hour", 'The Great Train Robbery', + lambda state: wol_cleared_missions(state, 6) and state.has("Beat Zero Hour", player)) + connect(world, names, 'The Great Train Robbery', 'Cutthroat', + lambda state: state.has("Beat The Great Train Robbery", player)) + connect(world, names, 'Cutthroat', 'Engine of Destruction', + lambda state: state.has("Beat Cutthroat", player)) + connect(world, names, 'Engine of Destruction', 'Media Blitz', + lambda state: state.has("Beat Engine of Destruction", player)) + connect(world, names, 'Media Blitz', 'Piercing the Shroud', + lambda state: state.has("Beat Media Blitz", player)) + connect(world, names, 'Maw of the Void', 'Gates of Hell', + lambda state: state.has("Beat Maw of the Void", player)) + connect(world, names, 'Gates of Hell', 'Belly of the Beast', + lambda state: state.has("Beat Gates of Hell", player)) + connect(world, names, 'Gates of Hell', 'Shatter the Sky', + lambda state: state.has("Beat Gates of Hell", player)) + connect(world, names, 'Gates of Hell', 'All-In', + lambda state: state.has('Beat Gates of Hell', player) and ( + state.has('Beat Shatter the Sky', player) or state.has('Beat Belly of the Beast', player))) + + if SC2Campaign.PROPHECY in enabled_campaigns: + if SC2Campaign.WOL in enabled_campaigns: + connect(world, names, 'The Dig', 'Whispers of Doom', + lambda state: state.has("Beat The Dig", player)), + else: + vanilla_mission_reqs[SC2Campaign.PROPHECY] = vanilla_mission_reqs[SC2Campaign.PROPHECY].copy() + vanilla_mission_reqs[SC2Campaign.PROPHECY][SC2Mission.WHISPERS_OF_DOOM.mission_name] = MissionInfo( + SC2Mission.WHISPERS_OF_DOOM, [], SC2Mission.WHISPERS_OF_DOOM.area) + connect(world, names, 'Menu', 'Whispers of Doom'), + connect(world, names, 'Whispers of Doom', 'A Sinister Turn', + lambda state: state.has("Beat Whispers of Doom", player)) + connect(world, names, 'A Sinister Turn', 'Echoes of the Future', + lambda state: state.has("Beat A Sinister Turn", player)) + connect(world, names, 'Echoes of the Future', 'In Utter Darkness', + lambda state: state.has("Beat Echoes of the Future", player)) + + if SC2Campaign.HOTS in enabled_campaigns: + connect(world, names, 'Menu', 'Lab Rat'), + connect(world, names, 'Lab Rat', 'Back in the Saddle', + lambda state: state.has("Beat Lab Rat", player)), + connect(world, names, 'Back in the Saddle', 'Rendezvous', + lambda state: state.has("Beat Back in the Saddle", player)), + connect(world, names, 'Rendezvous', 'Harvest of Screams', + lambda state: state.has("Beat Rendezvous", player)), + connect(world, names, 'Harvest of Screams', 'Shoot the Messenger', + lambda state: state.has("Beat Harvest of Screams", player)), + connect(world, names, 'Shoot the Messenger', 'Enemy Within', + lambda state: state.has("Beat Shoot the Messenger", player)), + connect(world, names, 'Rendezvous', 'Domination', + lambda state: state.has("Beat Rendezvous", player)), + connect(world, names, 'Domination', 'Fire in the Sky', + lambda state: state.has("Beat Domination", player)), + connect(world, names, 'Fire in the Sky', 'Old Soldiers', + lambda state: state.has("Beat Fire in the Sky", player)), + connect(world, names, 'Old Soldiers', 'Waking the Ancient', + lambda state: state.has("Beat Old Soldiers", player)), + connect(world, names, 'Enemy Within', 'Waking the Ancient', + lambda state: state.has("Beat Enemy Within", player)), + connect(world, names, 'Waking the Ancient', 'The Crucible', + lambda state: state.has("Beat Waking the Ancient", player)), + connect(world, names, 'The Crucible', 'Supreme', + lambda state: state.has("Beat The Crucible", player)), + connect(world, names, 'Supreme', 'Infested', + lambda state: state.has("Beat Supreme", player) and + state.has("Beat Old Soldiers", player) and + state.has("Beat Enemy Within", player)), + connect(world, names, 'Infested', 'Hand of Darkness', + lambda state: state.has("Beat Infested", player)), + connect(world, names, 'Hand of Darkness', 'Phantoms of the Void', + lambda state: state.has("Beat Hand of Darkness", player)), + connect(world, names, 'Supreme', 'With Friends Like These', + lambda state: state.has("Beat Supreme", player) and + state.has("Beat Old Soldiers", player) and + state.has("Beat Enemy Within", player)), + connect(world, names, 'With Friends Like These', 'Conviction', + lambda state: state.has("Beat With Friends Like These", player)), + connect(world, names, 'Conviction', 'Planetfall', + lambda state: state.has("Beat Conviction", player) and + state.has("Beat Phantoms of the Void", player)), + connect(world, names, 'Planetfall', 'Death From Above', + lambda state: state.has("Beat Planetfall", player)), + connect(world, names, 'Death From Above', 'The Reckoning', + lambda state: state.has("Beat Death From Above", player)), + + if SC2Campaign.PROLOGUE in enabled_campaigns: + connect(world, names, "Menu", "Dark Whispers") + connect(world, names, "Dark Whispers", "Ghosts in the Fog", + lambda state: state.has("Beat Dark Whispers", player)) + connect(world, names, "Dark Whispers", "Evil Awoken", + lambda state: state.has("Beat Ghosts in the Fog", player)) + + if SC2Campaign.LOTV in enabled_campaigns: + connect(world, names, "Menu", "For Aiur!") + connect(world, names, "For Aiur!", "The Growing Shadow", + lambda state: state.has("Beat For Aiur!", player)), + connect(world, names, "The Growing Shadow", "The Spear of Adun", + lambda state: state.has("Beat The Growing Shadow", player)), + connect(world, names, "The Spear of Adun", "Sky Shield", + lambda state: state.has("Beat The Spear of Adun", player)), + connect(world, names, "Sky Shield", "Brothers in Arms", + lambda state: state.has("Beat Sky Shield", player)), + connect(world, names, "Brothers in Arms", "Forbidden Weapon", + lambda state: state.has("Beat Brothers in Arms", player)), + connect(world, names, "The Spear of Adun", "Amon's Reach", + lambda state: state.has("Beat The Spear of Adun", player)), + connect(world, names, "Amon's Reach", "Last Stand", + lambda state: state.has("Beat Amon's Reach", player)), + connect(world, names, "Last Stand", "Forbidden Weapon", + lambda state: state.has("Beat Last Stand", player)), + connect(world, names, "Forbidden Weapon", "Temple of Unification", + lambda state: state.has("Beat Brothers in Arms", player) + and state.has("Beat Last Stand", player) + and state.has("Beat Forbidden Weapon", player)), + connect(world, names, "Temple of Unification", "The Infinite Cycle", + lambda state: state.has("Beat Temple of Unification", player)), + connect(world, names, "The Infinite Cycle", "Harbinger of Oblivion", + lambda state: state.has("Beat The Infinite Cycle", player)), + connect(world, names, "Harbinger of Oblivion", "Unsealing the Past", + lambda state: state.has("Beat Harbinger of Oblivion", player)), + connect(world, names, "Unsealing the Past", "Purification", + lambda state: state.has("Beat Unsealing the Past", player)), + connect(world, names, "Purification", "Templar's Charge", + lambda state: state.has("Beat Purification", player)), + connect(world, names, "Harbinger of Oblivion", "Steps of the Rite", + lambda state: state.has("Beat Harbinger of Oblivion", player)), + connect(world, names, "Steps of the Rite", "Rak'Shir", + lambda state: state.has("Beat Steps of the Rite", player)), + connect(world, names, "Rak'Shir", "Templar's Charge", + lambda state: state.has("Beat Rak'Shir", player)), + connect(world, names, "Templar's Charge", "Templar's Return", + lambda state: state.has("Beat Purification", player) + and state.has("Beat Rak'Shir", player) + and state.has("Beat Templar's Charge", player)), + connect(world, names, "Templar's Return", "The Host", + lambda state: state.has("Beat Templar's Return", player)), + connect(world, names, "The Host", "Salvation", + lambda state: state.has("Beat The Host", player)), + + if SC2Campaign.EPILOGUE in enabled_campaigns: + # TODO: Make this aware about excluded campaigns + connect(world, names, "Salvation", "Into the Void", + lambda state: state.has("Beat Salvation", player) + and state.has("Beat The Reckoning", player) + and state.has("Beat All-In", player)), + connect(world, names, "Into the Void", "The Essence of Eternity", + lambda state: state.has("Beat Into the Void", player)), + connect(world, names, "The Essence of Eternity", "Amon's Fall", + lambda state: state.has("Beat The Essence of Eternity", player)), + + if SC2Campaign.NCO in enabled_campaigns: + connect(world, names, "Menu", "The Escape") + connect(world, names, "The Escape", "Sudden Strike", + lambda state: state.has("Beat The Escape", player)) + connect(world, names, "Sudden Strike", "Enemy Intelligence", + lambda state: state.has("Beat Sudden Strike", player)) + connect(world, names, "Enemy Intelligence", "Trouble In Paradise", + lambda state: state.has("Beat Enemy Intelligence", player)) + connect(world, names, "Trouble In Paradise", "Night Terrors", + lambda state: state.has("Beat Evacuation", player)) + connect(world, names, "Night Terrors", "Flashpoint", + lambda state: state.has("Beat Night Terrors", player)) + connect(world, names, "Flashpoint", "In the Enemy's Shadow", + lambda state: state.has("Beat Flashpoint", player)) + connect(world, names, "In the Enemy's Shadow", "Dark Skies", + lambda state: state.has("Beat In the Enemy's Shadow", player)) + connect(world, names, "Dark Skies", "End Game", + lambda state: state.has("Beat Dark Skies", player)) + + goal_location = get_goal_location(final_mission) + assert goal_location, f"Unable to find a goal location for mission {final_mission}" + setup_final_location(goal_location, location_cache) + + return (vanilla_mission_reqs, final_mission.id, goal_location) + + +def create_grid_regions( + world: World, + locations: Tuple[LocationData, ...], + location_cache: List[Location], +) -> Tuple[Dict[SC2Campaign, Dict[str, MissionInfo]], int, str]: + locations_per_region = get_locations_per_region(locations) + + mission_pools = filter_missions(world) + final_mission = mission_pools[MissionPools.FINAL][0] + + mission_pool = [mission for mission_pool in mission_pools.values() for mission in mission_pool] + + num_missions = min(len(mission_pool), get_option_value(world, "maximum_campaign_size")) + remove_top_left: bool = get_option_value(world, "grid_two_start_positions") == GridTwoStartPositions.option_true + + regions = [create_region(world, locations_per_region, location_cache, "Menu")] + names: Dict[str, int] = {} + missions: Dict[Tuple[int, int], SC2Mission] = {} + + grid_size_x, grid_size_y, num_corners_to_remove = get_grid_dimensions(num_missions + remove_top_left) + # pick missions in order along concentric diagonals + # each diagonal will have the same difficulty + # this keeps long sides from possibly stealing lower-difficulty missions from future columns + num_diagonals = grid_size_x + grid_size_y - 1 + diagonal_difficulty = MissionPools.STARTER + missions_to_add = mission_pools[MissionPools.STARTER] + for diagonal in range(num_diagonals): + if diagonal == num_diagonals - 1: + diagonal_difficulty = MissionPools.FINAL + grid_coords = (grid_size_x-1, grid_size_y-1) + missions[grid_coords] = final_mission + break + if diagonal == 0 and remove_top_left: + continue + diagonal_length = min(diagonal + 1, num_diagonals - diagonal, grid_size_x, grid_size_y) + if len(missions_to_add) < diagonal_length: + raise Exception(f"There are not enough {diagonal_difficulty.name} missions to fill the campaign. Please exclude fewer missions.") + for i in range(diagonal_length): + # (0,0) + (0,1)*diagonal + (1,-1)*i + (1,-1)*max(diagonal - grid_size_y + 1, 0) + grid_coords = (i + max(diagonal - grid_size_y + 1, 0), diagonal - i - max(diagonal - grid_size_y + 1, 0)) + if grid_coords == (grid_size_x - 1, 0) and num_corners_to_remove >= 2: + pass + elif grid_coords == (0, grid_size_y - 1) and num_corners_to_remove >= 1: + pass + else: + mission_index = world.random.randint(0, len(missions_to_add) - 1) + missions[grid_coords] = missions_to_add.pop(mission_index) + + if diagonal_difficulty < MissionPools.VERY_HARD: + diagonal_difficulty = MissionPools(diagonal_difficulty.value + 1) + missions_to_add.extend(mission_pools[diagonal_difficulty]) + + # Generating regions and locations from selected missions + for x in range(grid_size_x): + for y in range(grid_size_y): + if missions.get((x, y)): + regions.append(create_region(world, locations_per_region, location_cache, missions[(x, y)].mission_name)) + world.multiworld.regions += regions + + # This pattern is horrifying, why are we using the dict as an ordered dict??? + slot_map: Dict[Tuple[int, int], int] = {} + for index, coords in enumerate(missions): + slot_map[coords] = index + 1 + + mission_req_table: Dict[str, MissionInfo] = {} + for coords, mission in missions.items(): + prepend_vertical = 0 + if not mission: + continue + connections: List[MissionConnection] = [] + if coords == (0, 0) or (remove_top_left and sum(coords) == 1): + # Connect to the "Menu" starting region + connect(world, names, "Menu", mission.mission_name) + else: + for dx, dy in ((-1, 0), (1, 0), (0, -1), (0, 1)): + connected_coords = (coords[0] + dx, coords[1] + dy) + if connected_coords in missions: + # connections.append(missions[connected_coords]) + connections.append(MissionConnection(slot_map[connected_coords])) + connect(world, names, missions[connected_coords].mission_name, mission.mission_name, + make_grid_connect_rule(missions, connected_coords, world.player), + ) + if coords[1] == 1 and not missions.get((coords[0], 0)): + prepend_vertical = 1 + mission_req_table[mission.mission_name] = MissionInfo( + mission, + connections, + category=f'_{coords[0] + 1}', + or_requirements=True, + ui_vertical_padding=prepend_vertical, + ) + + final_mission_id = final_mission.id + # Changing the completion condition for alternate final missions into an event + final_location = get_goal_location(final_mission) + setup_final_location(final_location, location_cache) + + return {SC2Campaign.GLOBAL: mission_req_table}, final_mission_id, final_location + + +def make_grid_connect_rule( + missions: Dict[Tuple[int, int], SC2Mission], + connected_coords: Tuple[int, int], + player: int +) -> Callable[[CollectionState], bool]: + return lambda state: state.has(f"Beat {missions[connected_coords].mission_name}", player) + + +def create_structured_regions( + world: World, + locations: Tuple[LocationData, ...], + location_cache: List[Location], + mission_order_type: int, +) -> Tuple[Dict[SC2Campaign, Dict[str, MissionInfo]], int, str]: + locations_per_region = get_locations_per_region(locations) + + mission_order = mission_orders[mission_order_type]() + enabled_campaigns = get_enabled_campaigns(world) + shuffle_campaigns = get_option_value(world, "shuffle_campaigns") + + mission_pools: Dict[MissionPools, List[SC2Mission]] = filter_missions(world) + final_mission = mission_pools[MissionPools.FINAL][0] + + regions = [create_region(world, locations_per_region, location_cache, "Menu")] + + names: Dict[str, int] = {} + + mission_slots: List[SC2MissionSlot] = [] + mission_pool = [mission for mission_pool in mission_pools.values() for mission in mission_pool] + + if mission_order_type in campaign_depending_orders: + # Do slot removal per campaign + for campaign in enabled_campaigns: + campaign_mission_pool = [mission for mission in mission_pool if mission.campaign == campaign] + campaign_mission_pool_size = len(campaign_mission_pool) + + removals = len(mission_order[campaign]) - campaign_mission_pool_size + + for mission in mission_order[campaign]: + # Removing extra missions if mission pool is too small + if 0 < mission.removal_priority <= removals: + mission_slots.append(SC2MissionSlot(campaign, None)) + elif mission.type == MissionPools.FINAL: + if campaign == final_mission.campaign: + # Campaign is elected to be goal + mission_slots.append(SC2MissionSlot(campaign, final_mission)) + else: + # Not the goal, find the most difficult mission in the pool and set the difficulty + campaign_difficulty = max(mission.pool for mission in campaign_mission_pool) + mission_slots.append(SC2MissionSlot(campaign, campaign_difficulty)) + else: + mission_slots.append(SC2MissionSlot(campaign, mission.type)) + else: + order = mission_order[SC2Campaign.GLOBAL] + # Determining if missions must be removed + mission_pool_size = sum(len(mission_pool) for mission_pool in mission_pools.values()) + removals = len(order) - mission_pool_size + + # Initial fill out of mission list and marking All-In mission + for mission in order: + # Removing extra missions if mission pool is too small + if 0 < mission.removal_priority <= removals: + mission_slots.append(SC2MissionSlot(SC2Campaign.GLOBAL, None)) + elif mission.type == MissionPools.FINAL: + mission_slots.append(SC2MissionSlot(SC2Campaign.GLOBAL, final_mission)) + else: + mission_slots.append(SC2MissionSlot(SC2Campaign.GLOBAL, mission.type)) + + no_build_slots = [] + easy_slots = [] + medium_slots = [] + hard_slots = [] + very_hard_slots = [] + + # Search through missions to find slots needed to fill + for i in range(len(mission_slots)): + mission_slot = mission_slots[i] + if mission_slot is None: + continue + if isinstance(mission_slot, SC2MissionSlot): + if mission_slot.slot is None: + continue + if mission_slot.slot == MissionPools.STARTER: + no_build_slots.append(i) + elif mission_slot.slot == MissionPools.EASY: + easy_slots.append(i) + elif mission_slot.slot == MissionPools.MEDIUM: + medium_slots.append(i) + elif mission_slot.slot == MissionPools.HARD: + hard_slots.append(i) + elif mission_slot.slot == MissionPools.VERY_HARD: + very_hard_slots.append(i) + + def pick_mission(slot): + if shuffle_campaigns or mission_order_type not in campaign_depending_orders: + # Pick a mission from any campaign + filler = world.random.randint(0, len(missions_to_add) - 1) + mission = missions_to_add.pop(filler) + slot_campaign = mission_slots[slot].campaign + mission_slots[slot] = SC2MissionSlot(slot_campaign, mission) + else: + # Pick a mission from required campaign + slot_campaign = mission_slots[slot].campaign + campaign_mission_candidates = [mission for mission in missions_to_add if mission.campaign == slot_campaign] + mission = world.random.choice(campaign_mission_candidates) + missions_to_add.remove(mission) + mission_slots[slot] = SC2MissionSlot(slot_campaign, mission) + + # Add no_build missions to the pool and fill in no_build slots + missions_to_add: List[SC2Mission] = mission_pools[MissionPools.STARTER] + if len(no_build_slots) > len(missions_to_add): + raise Exception("There are no valid No-Build missions. Please exclude fewer missions.") + for slot in no_build_slots: + pick_mission(slot) + + # Add easy missions into pool and fill in easy slots + missions_to_add = missions_to_add + mission_pools[MissionPools.EASY] + if len(easy_slots) > len(missions_to_add): + raise Exception("There are not enough Easy missions to fill the campaign. Please exclude fewer missions.") + for slot in easy_slots: + pick_mission(slot) + + # Add medium missions into pool and fill in medium slots + missions_to_add = missions_to_add + mission_pools[MissionPools.MEDIUM] + if len(medium_slots) > len(missions_to_add): + raise Exception("There are not enough Easy and Medium missions to fill the campaign. Please exclude fewer missions.") + for slot in medium_slots: + pick_mission(slot) + + # Add hard missions into pool and fill in hard slots + missions_to_add = missions_to_add + mission_pools[MissionPools.HARD] + if len(hard_slots) > len(missions_to_add): + raise Exception("There are not enough missions to fill the campaign. Please exclude fewer missions.") + for slot in hard_slots: + pick_mission(slot) + + # Add very hard missions into pool and fill in very hard slots + missions_to_add = missions_to_add + mission_pools[MissionPools.VERY_HARD] + if len(very_hard_slots) > len(missions_to_add): + raise Exception("There are not enough missions to fill the campaign. Please exclude fewer missions.") + for slot in very_hard_slots: + pick_mission(slot) + + # Generating regions and locations from selected missions + for mission_slot in mission_slots: + if isinstance(mission_slot.slot, SC2Mission): + regions.append(create_region(world, locations_per_region, location_cache, mission_slot.slot.mission_name)) + world.multiworld.regions += regions + + campaigns: List[SC2Campaign] + if mission_order_type in campaign_depending_orders: + campaigns = list(enabled_campaigns) + else: + campaigns = [SC2Campaign.GLOBAL] + + mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]] = {} + campaign_mission_slots: Dict[SC2Campaign, List[SC2MissionSlot]] = \ + { + campaign: [mission_slot for mission_slot in mission_slots if campaign == mission_slot.campaign] + for campaign in campaigns + } + + slot_map: Dict[SC2Campaign, List[int]] = dict() + + for campaign in campaigns: + mission_req_table.update({campaign: dict()}) + + # Mapping original mission slots to shifted mission slots when missions are removed + slot_map[campaign] = [] + slot_offset = 0 + for position, mission in enumerate(campaign_mission_slots[campaign]): + slot_map[campaign].append(position - slot_offset + 1) + if mission is None or mission.slot is None: + slot_offset += 1 + + def build_connection_rule(mission_names: List[str], missions_req: int) -> Callable: + player = world.player + if len(mission_names) > 1: + return lambda state: state.has_all({f"Beat {name}" for name in mission_names}, player) \ + and state.has_group("Missions", player, missions_req) + else: + return lambda state: state.has(f"Beat {mission_names[0]}", player) \ + and state.has_group("Missions", player, missions_req) + + for campaign in campaigns: + # Loop through missions to create requirements table and connect regions + for i, mission in enumerate(campaign_mission_slots[campaign]): + if mission is None or mission.slot is None: + continue + connections: List[MissionConnection] = [] + all_connections: List[SC2MissionSlot] = [] + connection: MissionConnection + for connection in mission_order[campaign][i].connect_to: + if connection.connect_to == -1: + continue + # If mission normally connects to an excluded campaign, connect to menu instead + if connection.campaign not in campaign_mission_slots: + connection.connect_to = -1 + continue + while campaign_mission_slots[connection.campaign][connection.connect_to].slot is None: + connection.connect_to -= 1 + all_connections.append(campaign_mission_slots[connection.campaign][connection.connect_to]) + for connection in mission_order[campaign][i].connect_to: + if connection.connect_to == -1: + connect(world, names, "Menu", mission.slot.mission_name) + else: + required_mission = campaign_mission_slots[connection.campaign][connection.connect_to] + if ((required_mission is None or required_mission.slot is None) + and not mission_order[campaign][i].completion_critical): # Drop non-critical null slots + continue + while required_mission is None or required_mission.slot is None: # Substituting null slot with prior slot + connection.connect_to -= 1 + required_mission = campaign_mission_slots[connection.campaign][connection.connect_to] + required_missions = [required_mission] if mission_order[campaign][i].or_requirements else all_connections + if isinstance(required_mission.slot, SC2Mission): + required_mission_name = required_mission.slot.mission_name + required_missions_names = [mission.slot.mission_name for mission in required_missions] + connect(world, names, required_mission_name, mission.slot.mission_name, + build_connection_rule(required_missions_names, mission_order[campaign][i].number)) + connections.append(MissionConnection(slot_map[connection.campaign][connection.connect_to], connection.campaign)) + + mission_req_table[campaign].update({mission.slot.mission_name: MissionInfo( + mission.slot, connections, mission_order[campaign][i].category, + number=mission_order[campaign][i].number, + completion_critical=mission_order[campaign][i].completion_critical, + or_requirements=mission_order[campaign][i].or_requirements)}) + + final_mission_id = final_mission.id + # Changing the completion condition for alternate final missions into an event + final_location = get_goal_location(final_mission) + setup_final_location(final_location, location_cache) + + return mission_req_table, final_mission_id, final_location + + +def setup_final_location(final_location, location_cache): + # Final location should be near the end of the cache + for i in range(len(location_cache) - 1, -1, -1): + if location_cache[i].name == final_location: + location_cache[i].address = None + break + + +def create_location(player: int, location_data: LocationData, region: Region, + location_cache: List[Location]) -> Location: + location = Location(player, location_data.name, location_data.code, region) + location.access_rule = location_data.rule + + location_cache.append(location) + + return location + + +def create_region(world: World, locations_per_region: Dict[str, List[LocationData]], + location_cache: List[Location], name: str) -> Region: + region = Region(name, world.player, world.multiworld) + + if name in locations_per_region: + for location_data in locations_per_region[name]: + location = create_location(world.player, location_data, region, location_cache) + region.locations.append(location) + + return region + + +def connect(world: World, used_names: Dict[str, int], source: str, target: str, + rule: Optional[Callable] = None): + source_region = world.get_region(source) + target_region = world.get_region(target) + + if target not in used_names: + used_names[target] = 1 + name = target + else: + used_names[target] += 1 + name = target + (' ' * used_names[target]) + + connection = Entrance(world.player, name, source_region) + + if rule: + connection.access_rule = rule + + source_region.exits.append(connection) + connection.connect(target_region) + + +def get_locations_per_region(locations: Tuple[LocationData, ...]) -> Dict[str, List[LocationData]]: + per_region: Dict[str, List[LocationData]] = {} + + for location in locations: + per_region.setdefault(location.region, []).append(location) + + return per_region + + +def get_factors(number: int) -> Tuple[int, int]: + """ + Simple factorization into pairs of numbers (x, y) using a sieve method. + Returns the factorization that is most square, i.e. where x + y is minimized. + Factor order is such that x <= y. + """ + assert number > 0 + for divisor in range(math.floor(math.sqrt(number)), 1, -1): + quotient = number // divisor + if quotient * divisor == number: + return divisor, quotient + return 1, number + + +def get_grid_dimensions(size: int) -> Tuple[int, int, int]: + """ + Get the dimensions of a grid mission order from the number of missions, int the format (x, y, error). + * Error will always be 0, 1, or 2, so the missions can be removed from the corners that aren't the start or end. + * Dimensions are chosen such that x <= y, as buttons in the UI are wider than they are tall. + * Dimensions are chosen to be maximally square. That is, x + y + error is minimized. + * If multiple options of the same rating are possible, the one with the larger error is chosen, + as it will appear more square. Compare 3x11 to 5x7-2 for an example of this. + """ + dimension_candidates: List[Tuple[int, int, int]] = [(*get_factors(size + x), x) for x in (2, 1, 0)] + best_dimension = min(dimension_candidates, key=sum) + return best_dimension + diff --git a/worlds/sc2/Rules.py b/worlds/sc2/Rules.py new file mode 100644 index 000000000000..8b9097ea1d78 --- /dev/null +++ b/worlds/sc2/Rules.py @@ -0,0 +1,952 @@ +from typing import Set + +from BaseClasses import CollectionState +from .Options import get_option_value, RequiredTactics, kerrigan_unit_available, AllInMap, \ + GrantStoryTech, GrantStoryLevels, TakeOverAIAllies, SpearOfAdunAutonomouslyCastAbilityPresence, \ + get_enabled_campaigns, MissionOrder +from .Items import get_basic_units, defense_ratings, zerg_defense_ratings, kerrigan_actives, air_defense_ratings, \ + kerrigan_levels, get_full_item_list +from .MissionTables import SC2Race, SC2Campaign +from . import ItemNames +from worlds.AutoWorld import World + + +class SC2Logic: + + def lock_any_item(self, state: CollectionState, items: Set[str]) -> bool: + """ + Guarantees that at least one of these items will remain in the world. Doesn't affect placement. + Needed for cases when the dynamic pool filtering could remove all the item prerequisites + :param state: + :param items: + :return: + """ + return self.is_item_placement(state) \ + or state.has_any(items, self.player) + + def is_item_placement(self, state): + """ + Tells if it's item placement or item pool filter + :param state: + :return: True for item placement, False for pool filter + """ + # has_group with count = 0 is always true for item placement and always false for SC2 item filtering + return state.has_group("Missions", self.player, 0) + + # WoL + def terran_common_unit(self, state: CollectionState) -> bool: + return state.has_any(self.basic_terran_units, self.player) + + def terran_early_tech(self, state: CollectionState): + """ + Basic combat unit that can be deployed quickly from mission start + :param state + :return: + """ + return ( + state.has_any({ItemNames.MARINE, ItemNames.FIREBAT, ItemNames.MARAUDER, ItemNames.REAPER, ItemNames.HELLION}, self.player) + or (self.advanced_tactics and state.has_any({ItemNames.GOLIATH, ItemNames.DIAMONDBACK, ItemNames.VIKING, ItemNames.BANSHEE}, self.player)) + ) + + def terran_air(self, state: CollectionState) -> bool: + """ + Air units or drops on advanced tactics + :param state: + :return: + """ + return (state.has_any({ItemNames.VIKING, ItemNames.WRAITH, ItemNames.BANSHEE, ItemNames.BATTLECRUISER}, self.player) or self.advanced_tactics + and state.has_any({ItemNames.HERCULES, ItemNames.MEDIVAC}, self.player) and self.terran_common_unit(state) + ) + + def terran_air_anti_air(self, state: CollectionState) -> bool: + """ + Air-to-air + :param state: + :return: + """ + return ( + state.has(ItemNames.VIKING, self.player) + or state.has_all({ItemNames.WRAITH, ItemNames.WRAITH_ADVANCED_LASER_TECHNOLOGY}, self.player) + or state.has_all({ItemNames.BATTLECRUISER, ItemNames.BATTLECRUISER_ATX_LASER_BATTERY}, self.player) + or self.advanced_tactics and state.has_any({ItemNames.WRAITH, ItemNames.VALKYRIE, ItemNames.BATTLECRUISER}, self.player) + ) + + def terran_competent_ground_to_air(self, state: CollectionState) -> bool: + """ + Ground-to-air + :param state: + :return: + """ + return ( + state.has(ItemNames.GOLIATH, self.player) + or state.has(ItemNames.MARINE, self.player) and self.terran_bio_heal(state) + or self.advanced_tactics and state.has(ItemNames.CYCLONE, self.player) + ) + + def terran_competent_anti_air(self, state: CollectionState) -> bool: + """ + Good AA unit + :param state: + :return: + """ + return ( + self.terran_competent_ground_to_air(state) + or self.terran_air_anti_air(state) + ) + + def welcome_to_the_jungle_requirement(self, state: CollectionState) -> bool: + """ + Welcome to the Jungle requirements - able to deal with Scouts, Void Rays, Zealots and Stalkers + :param state: + :return: + """ + return ( + self.terran_common_unit(state) + and self.terran_competent_ground_to_air(state) + ) or ( + self.advanced_tactics + and state.has_any({ItemNames.MARINE, ItemNames.VULTURE}, self.player) + and self.terran_air_anti_air(state) + ) + + def terran_basic_anti_air(self, state: CollectionState) -> bool: + """ + Basic AA to deal with few air units + :param state: + :return: + """ + return ( + state.has_any({ + ItemNames.MISSILE_TURRET, ItemNames.THOR, ItemNames.WAR_PIGS, ItemNames.SPARTAN_COMPANY, + ItemNames.HELS_ANGELS, ItemNames.BATTLECRUISER, ItemNames.MARINE, ItemNames.WRAITH, + ItemNames.VALKYRIE, ItemNames.CYCLONE, ItemNames.WINGED_NIGHTMARES, ItemNames.BRYNHILDS + }, self.player) + or self.terran_competent_anti_air(state) + or self.advanced_tactics and state.has_any({ItemNames.GHOST, ItemNames.SPECTRE, ItemNames.WIDOW_MINE, ItemNames.LIBERATOR}, self.player) + ) + + def terran_defense_rating(self, state: CollectionState, zerg_enemy: bool, air_enemy: bool = True) -> int: + """ + Ability to handle defensive missions + :param state: + :param zerg_enemy: + :param air_enemy: + :return: + """ + defense_score = sum((defense_ratings[item] for item in defense_ratings if state.has(item, self.player))) + # Manned Bunker + if state.has_any({ItemNames.MARINE, ItemNames.MARAUDER}, self.player) and state.has(ItemNames.BUNKER, self.player): + defense_score += 3 + elif zerg_enemy and state.has(ItemNames.FIREBAT, self.player) and state.has(ItemNames.BUNKER, self.player): + defense_score += 2 + # Siege Tank upgrades + if state.has_all({ItemNames.SIEGE_TANK, ItemNames.SIEGE_TANK_MAELSTROM_ROUNDS}, self.player): + defense_score += 2 + if state.has_all({ItemNames.SIEGE_TANK, ItemNames.SIEGE_TANK_GRADUATING_RANGE}, self.player): + defense_score += 1 + # Widow Mine upgrade + if state.has_all({ItemNames.WIDOW_MINE, ItemNames.WIDOW_MINE_CONCEALMENT}, self.player): + defense_score += 1 + # Viking with splash + if state.has_all({ItemNames.VIKING, ItemNames.VIKING_SHREDDER_ROUNDS}, self.player): + defense_score += 2 + + # General enemy-based rules + if zerg_enemy: + defense_score += sum((zerg_defense_ratings[item] for item in zerg_defense_ratings if state.has(item, self.player))) + if air_enemy: + defense_score += sum((air_defense_ratings[item] for item in air_defense_ratings if state.has(item, self.player))) + if air_enemy and zerg_enemy and state.has(ItemNames.VALKYRIE, self.player): + # Valkyries shred mass Mutas, most common air enemy that's massed in these cases + defense_score += 2 + # Advanced Tactics bumps defense rating requirements down by 2 + if self.advanced_tactics: + defense_score += 2 + return defense_score + + def terran_competent_comp(self, state: CollectionState) -> bool: + """ + Ability to deal with most of hard missions + :param state: + :return: + """ + return ( + ( + (state.has_any({ItemNames.MARINE, ItemNames.MARAUDER}, self.player) and self.terran_bio_heal(state)) + or state.has_any({ItemNames.THOR, ItemNames.BANSHEE, ItemNames.SIEGE_TANK}, self.player) + or state.has_all({ItemNames.LIBERATOR, ItemNames.LIBERATOR_RAID_ARTILLERY}, self.player) + ) + and self.terran_competent_anti_air(state) + ) or ( + state.has(ItemNames.BATTLECRUISER, self.player) and self.terran_common_unit(state) + ) + + def great_train_robbery_train_stopper(self, state: CollectionState) -> bool: + """ + Ability to deal with trains (moving target with a lot of HP) + :param state: + :return: + """ + return ( + state.has_any({ItemNames.SIEGE_TANK, ItemNames.DIAMONDBACK, ItemNames.MARAUDER, ItemNames.CYCLONE, ItemNames.BANSHEE}, self.player) + or self.advanced_tactics + and ( + state.has_all({ItemNames.REAPER, ItemNames.REAPER_G4_CLUSTERBOMB}, self.player) + or state.has_all({ItemNames.SPECTRE, ItemNames.SPECTRE_PSIONIC_LASH}, self.player) + or state.has_any({ItemNames.VULTURE, ItemNames.LIBERATOR}, self.player) + ) + ) + + def terran_can_rescue(self, state) -> bool: + """ + Rescuing in The Moebius Factor + :param state: + :return: + """ + return state.has_any({ItemNames.MEDIVAC, ItemNames.HERCULES, ItemNames.RAVEN, ItemNames.VIKING}, self.player) or self.advanced_tactics + + def terran_beats_protoss_deathball(self, state: CollectionState) -> bool: + """ + Ability to deal with Immortals, Colossi with some air support + :param state: + :return: + """ + return ( + ( + state.has_any({ItemNames.BANSHEE, ItemNames.BATTLECRUISER}, self.player) + or state.has_all({ItemNames.LIBERATOR, ItemNames.LIBERATOR_RAID_ARTILLERY}, self.player) + ) and self.terran_competent_anti_air(state) + or self.terran_competent_comp(state) and self.terran_air_anti_air(state) + ) + + def marine_medic_upgrade(self, state: CollectionState) -> bool: + """ + Infantry upgrade to infantry-only no-build segments + :param state: + :return: + """ + return state.has_any({ + ItemNames.MARINE_COMBAT_SHIELD, ItemNames.MARINE_MAGRAIL_MUNITIONS, ItemNames.MEDIC_STABILIZER_MEDPACKS + }, self.player) \ + or (state.count(ItemNames.MARINE_PROGRESSIVE_STIMPACK, self.player) >= 2 + and state.has_group("Missions", self.player, 1)) + + def terran_survives_rip_field(self, state: CollectionState) -> bool: + """ + Ability to deal with large areas with environment damage + :param state: + :return: + """ + return (state.has(ItemNames.BATTLECRUISER, self.player) + or self.terran_air(state) and self.terran_competent_anti_air(state) and self.terran_sustainable_mech_heal(state)) + + def terran_sustainable_mech_heal(self, state: CollectionState) -> bool: + """ + Can heal mech units without spending resources + :param state: + :return: + """ + return state.has(ItemNames.SCIENCE_VESSEL, self.player) \ + or state.has_all({ItemNames.MEDIC, ItemNames.MEDIC_ADAPTIVE_MEDPACKS}, self.player) \ + or state.count(ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL, self.player) >= 3 \ + or (self.advanced_tactics + and ( + state.has_all({ItemNames.RAVEN, ItemNames.RAVEN_BIO_MECHANICAL_REPAIR_DRONE}, self.player) + or state.count(ItemNames.PROGRESSIVE_REGENERATIVE_BIO_STEEL, self.player) >= 2) + ) + + def terran_bio_heal(self, state: CollectionState) -> bool: + """ + Ability to heal bio units + :param state: + :return: + """ + return state.has_any({ItemNames.MEDIC, ItemNames.MEDIVAC}, self.player) \ + or self.advanced_tactics and state.has_all({ItemNames.RAVEN, ItemNames.RAVEN_BIO_MECHANICAL_REPAIR_DRONE}, self.player) + + def terran_base_trasher(self, state: CollectionState) -> bool: + """ + Can attack heavily defended bases + :param state: + :return: + """ + return state.has(ItemNames.SIEGE_TANK, self.player) \ + or state.has_all({ItemNames.BATTLECRUISER, ItemNames.BATTLECRUISER_ATX_LASER_BATTERY}, self.player) \ + or state.has_all({ItemNames.LIBERATOR, ItemNames.LIBERATOR_RAID_ARTILLERY}, self.player) \ + or (self.advanced_tactics + and ((state.has_all({ItemNames.RAVEN, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, self.player) + or self.can_nuke(state)) + and ( + state.has_all({ItemNames.VIKING, ItemNames.VIKING_SHREDDER_ROUNDS}, self.player) + or state.has_all({ItemNames.BANSHEE, ItemNames.BANSHEE_SHOCKWAVE_MISSILE_BATTERY}, self.player)) + ) + ) + + def terran_mobile_detector(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.RAVEN, ItemNames.SCIENCE_VESSEL, ItemNames.PROGRESSIVE_ORBITAL_COMMAND}, self.player) + + def can_nuke(self, state: CollectionState) -> bool: + """ + Ability to launch nukes + :param state: + :return: + """ + return (self.advanced_tactics + and (state.has_any({ItemNames.GHOST, ItemNames.SPECTRE}, self.player) + or state.has_all({ItemNames.THOR, ItemNames.THOR_BUTTON_WITH_A_SKULL_ON_IT}, self.player))) + + def terran_respond_to_colony_infestations(self, state: CollectionState) -> bool: + """ + Can deal quickly with Brood Lords and Mutas in Haven's Fall and being able to progress the mission + :param state: + :return: + """ + return ( + self.terran_common_unit(state) + and self.terran_competent_anti_air(state) + and ( + self.terran_air_anti_air(state) + or state.has_any({ItemNames.BATTLECRUISER, ItemNames.VALKYRIE}, self.player) + ) + and self.terran_defense_rating(state, True) >= 3 + ) + + def engine_of_destruction_requirement(self, state: CollectionState): + return self.marine_medic_upgrade(state) \ + and ( + self.terran_competent_anti_air(state) + and self.terran_common_unit(state) or state.has(ItemNames.WRAITH, self.player) + ) + + def all_in_requirement(self, state: CollectionState): + """ + All-in + :param state: + :return: + """ + beats_kerrigan = state.has_any({ItemNames.MARINE, ItemNames.BANSHEE, ItemNames.GHOST}, self.player) or self.advanced_tactics + if get_option_value(self.world, 'all_in_map') == AllInMap.option_ground: + # Ground + defense_rating = self.terran_defense_rating(state, True, False) + if state.has_any({ItemNames.BATTLECRUISER, ItemNames.BANSHEE}, self.player): + defense_rating += 2 + return defense_rating >= 13 and beats_kerrigan + else: + # Air + defense_rating = self.terran_defense_rating(state, True, True) + return defense_rating >= 9 and beats_kerrigan \ + and state.has_any({ItemNames.VIKING, ItemNames.BATTLECRUISER, ItemNames.VALKYRIE}, self.player) \ + and state.has_any({ItemNames.HIVE_MIND_EMULATOR, ItemNames.PSI_DISRUPTER, ItemNames.MISSILE_TURRET}, self.player) + + # HotS + def zerg_common_unit(self, state: CollectionState) -> bool: + return state.has_any(self.basic_zerg_units, self.player) + + def zerg_competent_anti_air(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.HYDRALISK, ItemNames.MUTALISK, ItemNames.CORRUPTOR, ItemNames.BROOD_QUEEN}, self.player) \ + or state.has_all({ItemNames.SWARM_HOST, ItemNames.SWARM_HOST_PRESSURIZED_GLANDS}, self.player) \ + or state.has_all({ItemNames.SCOURGE, ItemNames.SCOURGE_RESOURCE_EFFICIENCY}, self.player) \ + or (self.advanced_tactics and state.has(ItemNames.INFESTOR, self.player)) + + def zerg_basic_anti_air(self, state: CollectionState) -> bool: + return self.zerg_competent_anti_air(state) or self.kerrigan_unit_available in kerrigan_unit_available or \ + state.has_any({ItemNames.SWARM_QUEEN, ItemNames.SCOURGE}, self.player) or (self.advanced_tactics and state.has(ItemNames.SPORE_CRAWLER, self.player)) + + def morph_brood_lord(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.MUTALISK, ItemNames.CORRUPTOR}, self.player) \ + and state.has(ItemNames.MUTALISK_CORRUPTOR_BROOD_LORD_ASPECT, self.player) + + def morph_viper(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.MUTALISK, ItemNames.CORRUPTOR}, self.player) \ + and state.has(ItemNames.MUTALISK_CORRUPTOR_VIPER_ASPECT, self.player) + + def morph_impaler_or_lurker(self, state: CollectionState) -> bool: + return state.has(ItemNames.HYDRALISK, self.player) and state.has_any({ItemNames.HYDRALISK_IMPALER_ASPECT, ItemNames.HYDRALISK_LURKER_ASPECT}, self.player) + + def zerg_competent_comp(self, state: CollectionState) -> bool: + advanced = self.advanced_tactics + core_unit = state.has_any({ItemNames.ROACH, ItemNames.ABERRATION, ItemNames.ZERGLING}, self.player) + support_unit = state.has_any({ItemNames.SWARM_QUEEN, ItemNames.HYDRALISK}, self.player) \ + or self.morph_brood_lord(state) \ + or advanced and (state.has_any({ItemNames.INFESTOR, ItemNames.DEFILER}, self.player) or self.morph_viper(state)) + if core_unit and support_unit: + return True + vespene_unit = state.has_any({ItemNames.ULTRALISK, ItemNames.ABERRATION}, self.player) \ + or advanced and self.morph_viper(state) + return vespene_unit and state.has_any({ItemNames.ZERGLING, ItemNames.SWARM_QUEEN}, self.player) + + def spread_creep(self, state: CollectionState) -> bool: + return self.advanced_tactics or state.has(ItemNames.SWARM_QUEEN, self.player) + + def zerg_competent_defense(self, state: CollectionState) -> bool: + return ( + self.zerg_common_unit(state) + and ( + ( + state.has(ItemNames.SWARM_HOST, self.player) + or self.morph_brood_lord(state) + or self.morph_impaler_or_lurker(state) + ) or ( + self.advanced_tactics + and (self.morph_viper(state) + or state.has(ItemNames.SPINE_CRAWLER, self.player)) + ) + ) + ) + + def basic_kerrigan(self, state: CollectionState) -> bool: + # One active ability that can be used to defeat enemies directly on Standard + if not self.advanced_tactics and \ + not state.has_any({ItemNames.KERRIGAN_KINETIC_BLAST, ItemNames.KERRIGAN_LEAPING_STRIKE, + ItemNames.KERRIGAN_CRUSHING_GRIP, ItemNames.KERRIGAN_PSIONIC_SHIFT, + ItemNames.KERRIGAN_SPAWN_BANELINGS}, self.player): + return False + # Two non-ultimate abilities + count = 0 + for item in (ItemNames.KERRIGAN_KINETIC_BLAST, ItemNames.KERRIGAN_LEAPING_STRIKE, ItemNames.KERRIGAN_HEROIC_FORTITUDE, + ItemNames.KERRIGAN_CHAIN_REACTION, ItemNames.KERRIGAN_CRUSHING_GRIP, ItemNames.KERRIGAN_PSIONIC_SHIFT, + ItemNames.KERRIGAN_SPAWN_BANELINGS, ItemNames.KERRIGAN_INFEST_BROODLINGS, ItemNames.KERRIGAN_FURY): + if state.has(item, self.player): + count += 1 + if count >= 2: + return True + return False + + def two_kerrigan_actives(self, state: CollectionState) -> bool: + count = 0 + for i in range(7): + if state.has_any(kerrigan_actives[i], self.player): + count += 1 + return count >= 2 + + def zerg_pass_vents(self, state: CollectionState) -> bool: + return self.story_tech_granted \ + or state.has_any({ItemNames.ZERGLING, ItemNames.HYDRALISK, ItemNames.ROACH}, self.player) \ + or (self.advanced_tactics and state.has(ItemNames.INFESTOR, self.player)) + + def supreme_requirement(self, state: CollectionState) -> bool: + return self.story_tech_granted \ + or not self.kerrigan_unit_available \ + or ( + state.has_all({ItemNames.KERRIGAN_LEAPING_STRIKE, ItemNames.KERRIGAN_MEND}, self.player) + and self.kerrigan_levels(state, 35) + ) + + def kerrigan_levels(self, state: CollectionState, target: int) -> bool: + if self.story_levels_granted or not self.kerrigan_unit_available: + return True # Levels are granted + if self.kerrigan_levels_per_mission_completed > 0 \ + and self.kerrigan_levels_per_mission_completed_cap > 0 \ + and not self.is_item_placement(state): + # Levels can be granted from mission completion. + # Item pool filtering isn't aware of missions beaten. Assume that missions beaten will fulfill this rule. + return True + # Levels from missions beaten + levels = self.kerrigan_levels_per_mission_completed * state.count_group("Missions", self.player) + if self.kerrigan_levels_per_mission_completed_cap != -1: + levels = min(levels, self.kerrigan_levels_per_mission_completed_cap) + # Levels from items + for kerrigan_level_item in kerrigan_levels: + level_amount = get_full_item_list()[kerrigan_level_item].number + item_count = state.count(kerrigan_level_item, self.player) + levels += item_count * level_amount + # Total level cap + if self.kerrigan_total_level_cap != -1: + levels = min(levels, self.kerrigan_total_level_cap) + + return levels >= target + + + def the_reckoning_requirement(self, state: CollectionState) -> bool: + if self.take_over_ai_allies: + return self.terran_competent_comp(state) \ + and self.zerg_competent_comp(state) \ + and (self.zerg_competent_anti_air(state) + or self.terran_competent_anti_air(state)) + else: + return self.zerg_competent_comp(state) \ + and self.zerg_competent_anti_air(state) + + # LotV + + def protoss_common_unit(self, state: CollectionState) -> bool: + return state.has_any(self.basic_protoss_units, self.player) + + def protoss_basic_anti_air(self, state: CollectionState) -> bool: + return self.protoss_competent_anti_air(state) \ + or state.has_any({ItemNames.PHOENIX, ItemNames.MIRAGE, ItemNames.CORSAIR, ItemNames.CARRIER, ItemNames.SCOUT, + ItemNames.DARK_ARCHON, ItemNames.WRATHWALKER, ItemNames.MOTHERSHIP}, self.player) \ + or state.has_all({ItemNames.WARP_PRISM, ItemNames.WARP_PRISM_PHASE_BLASTER}, self.player) \ + or self.advanced_tactics and state.has_any( + {ItemNames.HIGH_TEMPLAR, ItemNames.SIGNIFIER, ItemNames.ASCENDANT, ItemNames.DARK_TEMPLAR, + ItemNames.SENTRY, ItemNames.ENERGIZER}, self.player) + + def protoss_anti_armor_anti_air(self, state: CollectionState) -> bool: + return self.protoss_competent_anti_air(state) \ + or state.has_any({ItemNames.SCOUT, ItemNames.WRATHWALKER}, self.player) \ + or (state.has_any({ItemNames.IMMORTAL, ItemNames.ANNIHILATOR}, self.player) + and state.has(ItemNames.IMMORTAL_ANNIHILATOR_ADVANCED_TARGETING_MECHANICS, self.player)) + + def protoss_anti_light_anti_air(self, state: CollectionState) -> bool: + return self.protoss_competent_anti_air(state) \ + or state.has_any({ItemNames.PHOENIX, ItemNames.MIRAGE, ItemNames.CORSAIR, ItemNames.CARRIER}, self.player) + + def protoss_competent_anti_air(self, state: CollectionState) -> bool: + return state.has_any( + {ItemNames.STALKER, ItemNames.SLAYER, ItemNames.INSTIGATOR, ItemNames.DRAGOON, ItemNames.ADEPT, + ItemNames.VOID_RAY, ItemNames.DESTROYER, ItemNames.TEMPEST}, self.player) \ + or (state.has_any({ItemNames.PHOENIX, ItemNames.MIRAGE, ItemNames.CORSAIR, ItemNames.CARRIER}, self.player) + and state.has_any({ItemNames.SCOUT, ItemNames.WRATHWALKER}, self.player)) \ + or (self.advanced_tactics + and state.has_any({ItemNames.IMMORTAL, ItemNames.ANNIHILATOR}, self.player) + and state.has(ItemNames.IMMORTAL_ANNIHILATOR_ADVANCED_TARGETING_MECHANICS, self.player)) + + def protoss_has_blink(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.STALKER, ItemNames.INSTIGATOR, ItemNames.SLAYER}, self.player) \ + or ( + state.has(ItemNames.DARK_TEMPLAR_AVENGER_BLOOD_HUNTER_BLINK, self.player) + and state.has_any({ItemNames.DARK_TEMPLAR, ItemNames.BLOOD_HUNTER, ItemNames.AVENGER}, self.player) + ) + + def protoss_can_attack_behind_chasm(self, state: CollectionState) -> bool: + return state.has_any( + {ItemNames.SCOUT, ItemNames.TEMPEST, + ItemNames.CARRIER, ItemNames.VOID_RAY, ItemNames.DESTROYER, ItemNames.MOTHERSHIP}, self.player) \ + or self.protoss_has_blink(state) \ + or (state.has(ItemNames.WARP_PRISM, self.player) + and (self.protoss_common_unit(state) or state.has(ItemNames.WARP_PRISM_PHASE_BLASTER, self.player))) \ + or (self.advanced_tactics + and state.has_any({ItemNames.ORACLE, ItemNames.ARBITER}, self.player)) + + def protoss_fleet(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.CARRIER, ItemNames.TEMPEST, ItemNames.VOID_RAY, ItemNames.DESTROYER}, self.player) + + def templars_return_requirement(self, state: CollectionState) -> bool: + return self.story_tech_granted \ + or ( + state.has_any({ItemNames.IMMORTAL, ItemNames.ANNIHILATOR}, self.player) + and state.has_any({ItemNames.COLOSSUS, ItemNames.VANGUARD, ItemNames.REAVER, ItemNames.DARK_TEMPLAR}, self.player) + and state.has_any({ItemNames.SENTRY, ItemNames.HIGH_TEMPLAR}, self.player) + ) + + def brothers_in_arms_requirement(self, state: CollectionState) -> bool: + return ( + self.protoss_common_unit(state) + and self.protoss_anti_armor_anti_air(state) + and self.protoss_hybrid_counter(state) + ) or ( + self.take_over_ai_allies + and ( + self.terran_common_unit(state) + or self.protoss_common_unit(state) + ) + and ( + self.terran_competent_anti_air(state) + or self.protoss_anti_armor_anti_air(state) + ) + and ( + self.protoss_hybrid_counter(state) + or state.has_any({ItemNames.BATTLECRUISER, ItemNames.LIBERATOR, ItemNames.SIEGE_TANK}, self.player) + or state.has_all({ItemNames.SPECTRE, ItemNames.SPECTRE_PSIONIC_LASH}, self.player) + or (state.has(ItemNames.IMMORTAL, self.player) + and state.has_any({ItemNames.MARINE, ItemNames.MARAUDER}, self.player) + and self.terran_bio_heal(state)) + ) + ) + + def protoss_hybrid_counter(self, state: CollectionState) -> bool: + """ + Ground Hybrids + """ + return state.has_any( + {ItemNames.ANNIHILATOR, ItemNames.ASCENDANT, ItemNames.TEMPEST, ItemNames.CARRIER, ItemNames.VOID_RAY, + ItemNames.WRATHWALKER, ItemNames.VANGUARD}, self.player) \ + or (state.has(ItemNames.IMMORTAL, self.player) or self.advanced_tactics) and state.has_any( + {ItemNames.STALKER, ItemNames.DRAGOON, ItemNames.ADEPT, ItemNames.INSTIGATOR, ItemNames.SLAYER}, self.player) + + def the_infinite_cycle_requirement(self, state: CollectionState) -> bool: + return self.story_tech_granted \ + or not self.kerrigan_unit_available \ + or ( + self.two_kerrigan_actives(state) + and self.basic_kerrigan(state) + and self.kerrigan_levels(state, 70) + ) + + def protoss_basic_splash(self, state: CollectionState) -> bool: + return state.has_any( + {ItemNames.ZEALOT, ItemNames.COLOSSUS, ItemNames.VANGUARD, ItemNames.HIGH_TEMPLAR, ItemNames.SIGNIFIER, + ItemNames.DARK_TEMPLAR, ItemNames.REAVER, ItemNames.ASCENDANT}, self.player) + + def protoss_static_defense(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.PHOTON_CANNON, ItemNames.KHAYDARIN_MONOLITH}, self.player) + + def last_stand_requirement(self, state: CollectionState) -> bool: + return self.protoss_common_unit(state) \ + and self.protoss_competent_anti_air(state) \ + and self.protoss_static_defense(state) \ + and ( + self.advanced_tactics + or self.protoss_basic_splash(state) + ) + + def harbinger_of_oblivion_requirement(self, state: CollectionState) -> bool: + return self.protoss_anti_armor_anti_air(state) and ( + self.take_over_ai_allies + or ( + self.protoss_common_unit(state) + and self.protoss_hybrid_counter(state) + ) + ) + + def protoss_competent_comp(self, state: CollectionState) -> bool: + return self.protoss_common_unit(state) \ + and self.protoss_competent_anti_air(state) \ + and self.protoss_hybrid_counter(state) \ + and self.protoss_basic_splash(state) + + def protoss_stalker_upgrade(self, state: CollectionState) -> bool: + return ( + state.has_any( + { + ItemNames.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES, + ItemNames.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION + }, self.player) + and self.lock_any_item(state, {ItemNames.STALKER, ItemNames.INSTIGATOR, ItemNames.SLAYER}) + ) + + def steps_of_the_rite_requirement(self, state: CollectionState) -> bool: + return self.protoss_competent_comp(state) \ + or ( + self.protoss_common_unit(state) + and self.protoss_competent_anti_air(state) + and self.protoss_static_defense(state) + ) + + def protoss_heal(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.CARRIER, ItemNames.SENTRY, ItemNames.SHIELD_BATTERY, ItemNames.RECONSTRUCTION_BEAM}, self.player) + + def templars_charge_requirement(self, state: CollectionState) -> bool: + return self.protoss_heal(state) \ + and self.protoss_anti_armor_anti_air(state) \ + and ( + self.protoss_fleet(state) + or (self.advanced_tactics + and self.protoss_competent_comp(state) + ) + ) + + def the_host_requirement(self, state: CollectionState) -> bool: + return (self.protoss_fleet(state) + and self.protoss_static_defense(state) + ) or ( + self.protoss_competent_comp(state) + and state.has(ItemNames.SOA_TIME_STOP, self.player) + ) + + def salvation_requirement(self, state: CollectionState) -> bool: + return [ + self.protoss_competent_comp(state), + self.protoss_fleet(state), + self.protoss_static_defense(state) + ].count(True) >= 2 + + def into_the_void_requirement(self, state: CollectionState) -> bool: + return self.protoss_competent_comp(state) \ + or ( + self.take_over_ai_allies + and ( + state.has(ItemNames.BATTLECRUISER, self.player) + or ( + state.has(ItemNames.ULTRALISK, self.player) + and self.protoss_competent_anti_air(state) + ) + ) + ) + + def essence_of_eternity_requirement(self, state: CollectionState) -> bool: + defense_score = self.terran_defense_rating(state, False, True) + if self.take_over_ai_allies and self.protoss_static_defense(state): + defense_score += 2 + return defense_score >= 10 \ + and ( + self.terran_competent_anti_air(state) + or self.take_over_ai_allies + and self.protoss_competent_anti_air(state) + ) \ + and ( + state.has(ItemNames.BATTLECRUISER, self.player) + or (state.has(ItemNames.BANSHEE, self.player) and state.has_any({ItemNames.VIKING, ItemNames.VALKYRIE}, + self.player)) + or self.take_over_ai_allies and self.protoss_fleet(state) + ) \ + and state.has_any({ItemNames.SIEGE_TANK, ItemNames.LIBERATOR}, self.player) + + def amons_fall_requirement(self, state: CollectionState) -> bool: + if self.take_over_ai_allies: + return ( + ( + state.has_any({ItemNames.BATTLECRUISER, ItemNames.CARRIER}, self.player) + ) + or (state.has(ItemNames.ULTRALISK, self.player) + and self.protoss_competent_anti_air(state) + and ( + state.has_any({ItemNames.LIBERATOR, ItemNames.BANSHEE, ItemNames.VALKYRIE, ItemNames.VIKING}, self.player) + or state.has_all({ItemNames.WRAITH, ItemNames.WRAITH_ADVANCED_LASER_TECHNOLOGY}, self.player) + or self.protoss_fleet(state) + ) + and (self.terran_sustainable_mech_heal(state) + or (self.spear_of_adun_autonomously_cast_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_everywhere + and state.has(ItemNames.RECONSTRUCTION_BEAM, self.player)) + ) + ) + ) \ + and self.terran_competent_anti_air(state) \ + and self.protoss_competent_comp(state) \ + and self.zerg_competent_comp(state) + else: + return state.has(ItemNames.MUTALISK, self.player) and self.zerg_competent_comp(state) + + def nova_any_weapon(self, state: CollectionState) -> bool: + return state.has_any( + {ItemNames.NOVA_C20A_CANISTER_RIFLE, ItemNames.NOVA_HELLFIRE_SHOTGUN, ItemNames.NOVA_PLASMA_RIFLE, + ItemNames.NOVA_MONOMOLECULAR_BLADE, ItemNames.NOVA_BLAZEFIRE_GUNBLADE}, self.player) + + def nova_ranged_weapon(self, state: CollectionState) -> bool: + return state.has_any( + {ItemNames.NOVA_C20A_CANISTER_RIFLE, ItemNames.NOVA_HELLFIRE_SHOTGUN, ItemNames.NOVA_PLASMA_RIFLE}, + self.player) + + def nova_splash(self, state: CollectionState) -> bool: + return state.has_any({ + ItemNames.NOVA_HELLFIRE_SHOTGUN, ItemNames.NOVA_BLAZEFIRE_GUNBLADE, ItemNames.NOVA_PULSE_GRENADES + }, self.player) \ + or self.advanced_tactics and state.has_any( + {ItemNames.NOVA_PLASMA_RIFLE, ItemNames.NOVA_MONOMOLECULAR_BLADE}, self.player) + + def nova_dash(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.NOVA_MONOMOLECULAR_BLADE, ItemNames.NOVA_BLINK}, self.player) + + def nova_full_stealth(self, state: CollectionState) -> bool: + return state.count(ItemNames.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE, self.player) >= 2 + + def nova_heal(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.NOVA_ARMORED_SUIT_MODULE, ItemNames.NOVA_STIM_INFUSION}, self.player) + + def nova_escape_assist(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.NOVA_BLINK, ItemNames.NOVA_HOLO_DECOY, ItemNames.NOVA_IONIC_FORCE_FIELD}, self.player) + + def the_escape_stuff_granted(self) -> bool: + """ + The NCO first mission requires having too much stuff first before actually able to do anything + :return: + """ + return self.story_tech_granted \ + or (self.mission_order == MissionOrder.option_vanilla and self.enabled_campaigns == {SC2Campaign.NCO}) + + def the_escape_first_stage_requirement(self, state: CollectionState) -> bool: + return self.the_escape_stuff_granted() \ + or (self.nova_ranged_weapon(state) and (self.nova_full_stealth(state) or self.nova_heal(state))) + + def the_escape_requirement(self, state: CollectionState) -> bool: + return self.the_escape_first_stage_requirement(state) \ + and (self.the_escape_stuff_granted() or self.nova_splash(state)) + + def terran_cliffjumper(self, state: CollectionState) -> bool: + return state.has(ItemNames.REAPER, self.player) \ + or state.has_all({ItemNames.GOLIATH, ItemNames.GOLIATH_JUMP_JETS}, self.player) \ + or state.has_all({ItemNames.SIEGE_TANK, ItemNames.SIEGE_TANK_JUMP_JETS}, self.player) + + def terran_able_to_snipe_defiler(self, state: CollectionState) -> bool: + return state.has_all({ItemNames.NOVA_JUMP_SUIT_MODULE, ItemNames.NOVA_C20A_CANISTER_RIFLE}, self.player) \ + or state.has_all({ItemNames.SIEGE_TANK, ItemNames.SIEGE_TANK_MAELSTROM_ROUNDS, ItemNames.SIEGE_TANK_JUMP_JETS}, self.player) + + def sudden_strike_requirement(self, state: CollectionState) -> bool: + return self.sudden_strike_can_reach_objectives(state) \ + and self.terran_able_to_snipe_defiler(state) \ + and state.has_any({ItemNames.SIEGE_TANK, ItemNames.VULTURE}, self.player) \ + and self.nova_splash(state) \ + and (self.terran_defense_rating(state, True, False) >= 2 + or state.has(ItemNames.NOVA_JUMP_SUIT_MODULE, self.player)) + + def sudden_strike_can_reach_objectives(self, state: CollectionState) -> bool: + return self.terran_cliffjumper(state) \ + or state.has_any({ItemNames.BANSHEE, ItemNames.VIKING}, self.player) \ + or ( + self.advanced_tactics + and state.has(ItemNames.MEDIVAC, self.player) + and state.has_any({ItemNames.MARINE, ItemNames.MARAUDER, ItemNames.VULTURE, ItemNames.HELLION, + ItemNames.GOLIATH}, self.player) + ) + + def enemy_intelligence_garrisonable_unit(self, state: CollectionState) -> bool: + """ + Has unit usable as a Garrison in Enemy Intelligence + :param state: + :return: + """ + return state.has_any( + {ItemNames.MARINE, ItemNames.REAPER, ItemNames.MARAUDER, ItemNames.GHOST, ItemNames.SPECTRE, + ItemNames.HELLION, ItemNames.GOLIATH, ItemNames.WARHOUND, ItemNames.DIAMONDBACK, ItemNames.VIKING}, + self.player) + + def enemy_intelligence_cliff_garrison(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.REAPER, ItemNames.VIKING, ItemNames.MEDIVAC, ItemNames.HERCULES}, self.player) \ + or state.has_all({ItemNames.GOLIATH, ItemNames.GOLIATH_JUMP_JETS}, self.player) \ + or self.advanced_tactics and state.has_any({ItemNames.HELS_ANGELS, ItemNames.BRYNHILDS}, self.player) + + def enemy_intelligence_first_stage_requirement(self, state: CollectionState) -> bool: + return self.enemy_intelligence_garrisonable_unit(state) \ + and (self.terran_competent_comp(state) + or ( + self.terran_common_unit(state) + and self.terran_competent_anti_air(state) + and state.has(ItemNames.NOVA_NUKE, self.player) + ) + ) \ + and self.terran_defense_rating(state, True, True) >= 5 + + def enemy_intelligence_second_stage_requirement(self, state: CollectionState) -> bool: + return self.enemy_intelligence_first_stage_requirement(state) \ + and self.enemy_intelligence_cliff_garrison(state) \ + and ( + self.story_tech_granted + or ( + self.nova_any_weapon(state) + and ( + self.nova_full_stealth(state) + or (self.nova_heal(state) + and self.nova_splash(state) + and self.nova_ranged_weapon(state)) + ) + ) + ) + + def enemy_intelligence_third_stage_requirement(self, state: CollectionState) -> bool: + return self.enemy_intelligence_second_stage_requirement(state) \ + and ( + self.story_tech_granted + or ( + state.has(ItemNames.NOVA_PROGRESSIVE_STEALTH_SUIT_MODULE, self.player) + and self.nova_dash(state) + ) + ) + + def trouble_in_paradise_requirement(self, state: CollectionState) -> bool: + return self.nova_any_weapon(state) \ + and self.nova_splash(state) \ + and self.terran_beats_protoss_deathball(state) \ + and self.terran_defense_rating(state, True, True) >= 7 + + def night_terrors_requirement(self, state: CollectionState) -> bool: + return self.terran_common_unit(state) \ + and self.terran_competent_anti_air(state) \ + and ( + # These can handle the waves of infested, even volatile ones + state.has(ItemNames.SIEGE_TANK, self.player) + or state.has_all({ItemNames.VIKING, ItemNames.VIKING_SHREDDER_ROUNDS}, self.player) + or ( + ( + # Regular infesteds + state.has(ItemNames.FIREBAT, self.player) + or state.has_all({ItemNames.HELLION, ItemNames.HELLION_HELLBAT_ASPECT}, self.player) + or ( + self.advanced_tactics + and state.has_any({ItemNames.PERDITION_TURRET, ItemNames.PLANETARY_FORTRESS}, self.player) + ) + ) + and self.terran_bio_heal(state) + and ( + # Volatile infesteds + state.has(ItemNames.LIBERATOR, self.player) + or ( + self.advanced_tactics + and state.has_any({ItemNames.HERC, ItemNames.VULTURE}, self.player) + ) + ) + ) + ) + + def flashpoint_far_requirement(self, state: CollectionState) -> bool: + return self.terran_competent_comp(state) \ + and self.terran_mobile_detector(state) \ + and self.terran_defense_rating(state, True, False) >= 6 + + def enemy_shadow_tripwires_tool(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.NOVA_FLASHBANG_GRENADES, ItemNames.NOVA_BLINK, ItemNames.NOVA_DOMINATION}, + self.player) + + def enemy_shadow_door_unlocks_tool(self, state: CollectionState) -> bool: + return state.has_any({ItemNames.NOVA_DOMINATION, ItemNames.NOVA_BLINK, ItemNames.NOVA_JUMP_SUIT_MODULE}, + self.player) + + def enemy_shadow_domination(self, state: CollectionState) -> bool: + return self.story_tech_granted \ + or (self.nova_ranged_weapon(state) + and (self.nova_full_stealth(state) + or state.has(ItemNames.NOVA_JUMP_SUIT_MODULE, self.player) + or (self.nova_heal(state) and self.nova_splash(state)) + ) + ) + + def enemy_shadow_first_stage(self, state: CollectionState) -> bool: + return self.enemy_shadow_domination(state) \ + and (self.story_tech_granted + or ((self.nova_full_stealth(state) and self.enemy_shadow_tripwires_tool(state)) + or (self.nova_heal(state) and self.nova_splash(state)) + ) + ) + + def enemy_shadow_second_stage(self, state: CollectionState) -> bool: + return self.enemy_shadow_first_stage(state) \ + and (self.story_tech_granted + or self.nova_splash(state) + or self.nova_heal(state) + or self.nova_escape_assist(state) + ) + + def enemy_shadow_door_controls(self, state: CollectionState) -> bool: + return self.enemy_shadow_second_stage(state) \ + and (self.story_tech_granted or self.enemy_shadow_door_unlocks_tool(state)) + + def enemy_shadow_victory(self, state: CollectionState) -> bool: + return self.enemy_shadow_door_controls(state) \ + and (self.story_tech_granted or self.nova_heal(state)) + + def dark_skies_requirement(self, state: CollectionState) -> bool: + return self.terran_common_unit(state) \ + and self.terran_beats_protoss_deathball(state) \ + and self.terran_defense_rating(state, False, True) >= 8 + + def end_game_requirement(self, state: CollectionState) -> bool: + return self.terran_competent_comp(state) \ + and self.terran_mobile_detector(state) \ + and ( + state.has_any({ItemNames.BATTLECRUISER, ItemNames.LIBERATOR, ItemNames.BANSHEE}, self.player) + or state.has_all({ItemNames.WRAITH, ItemNames.WRAITH_ADVANCED_LASER_TECHNOLOGY}, self.player) + ) \ + and (state.has_any({ItemNames.BATTLECRUISER, ItemNames.VIKING, ItemNames.LIBERATOR}, self.player) + or (self.advanced_tactics + and state.has_all({ItemNames.RAVEN, ItemNames.RAVEN_HUNTER_SEEKER_WEAPON}, self.player) + ) + ) + + def __init__(self, world: World): + self.world: World = world + self.player = None if world is None else world.player + self.logic_level = get_option_value(world, 'required_tactics') + self.advanced_tactics = self.logic_level != RequiredTactics.option_standard + self.take_over_ai_allies = get_option_value(world, "take_over_ai_allies") == TakeOverAIAllies.option_true + self.kerrigan_unit_available = get_option_value(world, 'kerrigan_presence') in kerrigan_unit_available \ + and SC2Campaign.HOTS in get_enabled_campaigns(world) + self.kerrigan_levels_per_mission_completed = get_option_value(world, "kerrigan_levels_per_mission_completed") + self.kerrigan_levels_per_mission_completed_cap = get_option_value(world, "kerrigan_levels_per_mission_completed_cap") + self.kerrigan_total_level_cap = get_option_value(world, "kerrigan_total_level_cap") + self.story_tech_granted = get_option_value(world, "grant_story_tech") == GrantStoryTech.option_true + self.story_levels_granted = get_option_value(world, "grant_story_levels") != GrantStoryLevels.option_disabled + self.basic_terran_units = get_basic_units(world, SC2Race.TERRAN) + self.basic_zerg_units = get_basic_units(world, SC2Race.ZERG) + self.basic_protoss_units = get_basic_units(world, SC2Race.PROTOSS) + self.spear_of_adun_autonomously_cast_presence = get_option_value(world, "spear_of_adun_autonomously_cast_ability_presence") + self.enabled_campaigns = get_enabled_campaigns(world) + self.mission_order = get_option_value(world, "mission_order") diff --git a/worlds/sc2/Starcraft2.kv b/worlds/sc2/Starcraft2.kv new file mode 100644 index 000000000000..6b112c2f00a6 --- /dev/null +++ b/worlds/sc2/Starcraft2.kv @@ -0,0 +1,28 @@ + + scroll_type: ["content", "bars"] + bar_width: dp(12) + effect_cls: "ScrollEffect" + + + cols: 1 + size_hint_y: None + height: self.minimum_height + 15 + padding: [5,0,dp(12),0] + +: + cols: 1 + +: + rows: 1 + +: + cols: 1 + spacing: [0,5] + +: + text_size: self.size + markup: True + halign: 'center' + valign: 'middle' + padding: [5,0,5,0] + outline_width: 1 diff --git a/worlds/sc2/__init__.py b/worlds/sc2/__init__.py new file mode 100644 index 000000000000..fffa618d2694 --- /dev/null +++ b/worlds/sc2/__init__.py @@ -0,0 +1,482 @@ +import typing +from dataclasses import fields + +from typing import List, Set, Iterable, Sequence, Dict, Callable, Union +from math import floor, ceil +from BaseClasses import Item, MultiWorld, Location, Tutorial, ItemClassification +from worlds.AutoWorld import WebWorld, World +from . import ItemNames +from .Items import StarcraftItem, filler_items, get_item_table, get_full_item_list, \ + get_basic_units, ItemData, upgrade_included_names, progressive_if_nco, kerrigan_actives, kerrigan_passives, \ + kerrigan_only_passives, progressive_if_ext, not_balanced_starting_units, spear_of_adun_calldowns, \ + spear_of_adun_castable_passives, nova_equipment +from .ItemGroups import item_name_groups +from .Locations import get_locations, LocationType, get_location_types, get_plando_locations +from .Regions import create_regions +from .Options import get_option_value, LocationInclusion, KerriganLevelItemDistribution, \ + KerriganPresence, KerriganPrimalStatus, RequiredTactics, kerrigan_unit_available, StarterUnit, SpearOfAdunPresence, \ + get_enabled_campaigns, SpearOfAdunAutonomouslyCastAbilityPresence, Starcraft2Options +from .PoolFilter import filter_items, get_item_upgrades, UPGRADABLE_ITEMS, missions_in_mission_table, get_used_races +from .MissionTables import MissionInfo, SC2Campaign, lookup_name_to_mission, SC2Mission, \ + SC2Race + + +class Starcraft2WebWorld(WebWorld): + setup = Tutorial( + "Multiworld Setup Guide", + "A guide to setting up the Starcraft 2 randomizer connected to an Archipelago Multiworld", + "English", + "setup_en.md", + "setup/en", + ["TheCondor", "Phaneros"] + ) + + tutorials = [setup] + + +class SC2World(World): + """ + StarCraft II is a science fiction real-time strategy video game developed and published by Blizzard Entertainment. + Play as one of three factions across four campaigns in a battle for supremacy of the Koprulu Sector. + """ + + game = "Starcraft 2" + web = Starcraft2WebWorld() + data_version = 6 + + item_name_to_id = {name: data.code for name, data in get_full_item_list().items()} + location_name_to_id = {location.name: location.code for location in get_locations(None)} + options_dataclass = Starcraft2Options + options: Starcraft2Options + + item_name_groups = item_name_groups + locked_locations: typing.List[str] + location_cache: typing.List[Location] + mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]] = {} + final_mission_id: int + victory_item: str + required_client_version = 0, 4, 5 + + def __init__(self, multiworld: MultiWorld, player: int): + super(SC2World, self).__init__(multiworld, player) + self.location_cache = [] + self.locked_locations = [] + + def create_item(self, name: str) -> Item: + data = get_full_item_list()[name] + return StarcraftItem(name, data.classification, data.code, self.player) + + def create_regions(self): + self.mission_req_table, self.final_mission_id, self.victory_item = create_regions( + self, get_locations(self), self.location_cache + ) + + def create_items(self): + setup_events(self.player, self.locked_locations, self.location_cache) + + excluded_items = get_excluded_items(self) + + starter_items = assign_starter_items(self, excluded_items, self.locked_locations, self.location_cache) + + fill_resource_locations(self, self.locked_locations, self.location_cache) + + pool = get_item_pool(self, self.mission_req_table, starter_items, excluded_items, self.location_cache) + + fill_item_pool_with_dummy_items(self, self.locked_locations, self.location_cache, pool) + + self.multiworld.itempool += pool + + def set_rules(self): + self.multiworld.completion_condition[self.player] = lambda state: state.has(self.victory_item, self.player) + + def get_filler_item_name(self) -> str: + return self.random.choice(filler_items) + + def fill_slot_data(self): + slot_data = {} + for option_name in [field.name for field in fields(Starcraft2Options)]: + option = get_option_value(self, option_name) + if type(option) in {str, int}: + slot_data[option_name] = int(option) + slot_req_table = {} + + # Serialize data + for campaign in self.mission_req_table: + slot_req_table[campaign.id] = {} + for mission in self.mission_req_table[campaign]: + slot_req_table[campaign.id][mission] = self.mission_req_table[campaign][mission]._asdict() + # Replace mission objects with mission IDs + slot_req_table[campaign.id][mission]["mission"] = slot_req_table[campaign.id][mission]["mission"].id + + for index in range(len(slot_req_table[campaign.id][mission]["required_world"])): + # TODO this is a band-aid, sometimes the mission_req_table already contains dicts + # as far as I can tell it's related to having multiple vanilla mission orders + if not isinstance(slot_req_table[campaign.id][mission]["required_world"][index], dict): + slot_req_table[campaign.id][mission]["required_world"][index] = slot_req_table[campaign.id][mission]["required_world"][index]._asdict() + + enabled_campaigns = get_enabled_campaigns(self) + slot_data["plando_locations"] = get_plando_locations(self) + slot_data["nova_covert_ops_only"] = (enabled_campaigns == {SC2Campaign.NCO}) + slot_data["mission_req"] = slot_req_table + slot_data["final_mission"] = self.final_mission_id + slot_data["version"] = 3 + + if SC2Campaign.HOTS not in enabled_campaigns: + slot_data["kerrigan_presence"] = KerriganPresence.option_not_present + return slot_data + + +def setup_events(player: int, locked_locations: typing.List[str], location_cache: typing.List[Location]): + for location in location_cache: + if location.address is None: + item = Item(location.name, ItemClassification.progression, None, player) + + locked_locations.append(location.name) + + location.place_locked_item(item) + + +def get_excluded_items(world: World) -> Set[str]: + excluded_items: Set[str] = set(get_option_value(world, 'excluded_items')) + for item in world.multiworld.precollected_items[world.player]: + excluded_items.add(item.name) + locked_items: Set[str] = set(get_option_value(world, 'locked_items')) + # Starter items are also excluded items + starter_items: Set[str] = set(get_option_value(world, 'start_inventory')) + item_table = get_full_item_list() + soa_presence = get_option_value(world, "spear_of_adun_presence") + soa_autocast_presence = get_option_value(world, "spear_of_adun_autonomously_cast_ability_presence") + enabled_campaigns = get_enabled_campaigns(world) + + # Ensure no item is both guaranteed and excluded + invalid_items = excluded_items.intersection(locked_items) + invalid_count = len(invalid_items) + # Don't count starter items that can appear multiple times + invalid_count -= len([item for item in starter_items.intersection(locked_items) if item_table[item].quantity != 1]) + if invalid_count > 0: + raise Exception(f"{invalid_count} item{'s are' if invalid_count > 1 else ' is'} both locked and excluded from generation. Please adjust your excluded items and locked items.") + + def smart_exclude(item_choices: Set[str], choices_to_keep: int): + expected_choices = len(item_choices) + if expected_choices == 0: + return + item_choices = set(item_choices) + starter_choices = item_choices.intersection(starter_items) + excluded_choices = item_choices.intersection(excluded_items) + item_choices.difference_update(excluded_choices) + item_choices.difference_update(locked_items) + candidates = sorted(item_choices) + exclude_amount = min(expected_choices - choices_to_keep - len(excluded_choices) + len(starter_choices), len(candidates)) + if exclude_amount > 0: + excluded_items.update(world.random.sample(candidates, exclude_amount)) + + # Nova gear exclusion if NCO not in campaigns + if SC2Campaign.NCO not in enabled_campaigns: + excluded_items = excluded_items.union(nova_equipment) + + kerrigan_presence = get_option_value(world, "kerrigan_presence") + # Exclude Primal Form item if option is not set or Kerrigan is unavailable + if get_option_value(world, "kerrigan_primal_status") != KerriganPrimalStatus.option_item or \ + (kerrigan_presence in {KerriganPresence.option_not_present, KerriganPresence.option_not_present_and_no_passives}): + excluded_items.add(ItemNames.KERRIGAN_PRIMAL_FORM) + + # no Kerrigan & remove all passives => remove all abilities + if kerrigan_presence == KerriganPresence.option_not_present_and_no_passives: + for tier in range(7): + smart_exclude(kerrigan_actives[tier].union(kerrigan_passives[tier]), 0) + else: + # no Kerrigan, but keep non-Kerrigan passives + if kerrigan_presence == KerriganPresence.option_not_present: + smart_exclude(kerrigan_only_passives, 0) + for tier in range(7): + smart_exclude(kerrigan_actives[tier], 0) + + # SOA exclusion, other cases are handled by generic race logic + if (soa_presence == SpearOfAdunPresence.option_lotv_protoss and SC2Campaign.LOTV not in enabled_campaigns) \ + or soa_presence == SpearOfAdunPresence.option_not_present: + excluded_items.update(spear_of_adun_calldowns) + if (soa_autocast_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_lotv_protoss \ + and SC2Campaign.LOTV not in enabled_campaigns) \ + or soa_autocast_presence == SpearOfAdunAutonomouslyCastAbilityPresence.option_not_present: + excluded_items.update(spear_of_adun_castable_passives) + + return excluded_items + + +def assign_starter_items(world: World, excluded_items: Set[str], locked_locations: List[str], location_cache: typing.List[Location]) -> List[Item]: + starter_items: List[Item] = [] + non_local_items = get_option_value(world, "non_local_items") + starter_unit = get_option_value(world, "starter_unit") + enabled_campaigns = get_enabled_campaigns(world) + first_mission = get_first_mission(world.mission_req_table) + # Ensuring that first mission is completable + if starter_unit == StarterUnit.option_off: + starter_mission_locations = [location.name for location in location_cache + if location.parent_region.name == first_mission + and location.access_rule == Location.access_rule] + if not starter_mission_locations: + # Force early unit if first mission is impossible without one + starter_unit = StarterUnit.option_any_starter_unit + + if starter_unit != StarterUnit.option_off: + first_race = lookup_name_to_mission[first_mission].race + + if first_race == SC2Race.ANY: + # If the first mission is a logic-less no-build + mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]] = world.mission_req_table + races = get_used_races(mission_req_table, world) + races.remove(SC2Race.ANY) + if lookup_name_to_mission[first_mission].race in races: + # The campaign's race is in (At least one mission that's not logic-less no-build exists) + first_race = lookup_name_to_mission[first_mission].campaign.race + elif len(races) > 0: + # The campaign only has logic-less no-build missions. Find any other valid race + first_race = world.random.choice(list(races)) + + if first_race != SC2Race.ANY: + # The race of the early unit has been chosen + basic_units = get_basic_units(world, first_race) + if starter_unit == StarterUnit.option_balanced: + basic_units = basic_units.difference(not_balanced_starting_units) + if first_mission == SC2Mission.DARK_WHISPERS.mission_name: + # Special case - you don't have a logicless location but need an AA + basic_units = basic_units.difference( + {ItemNames.ZEALOT, ItemNames.CENTURION, ItemNames.SENTINEL, ItemNames.BLOOD_HUNTER, + ItemNames.AVENGER, ItemNames.IMMORTAL, ItemNames.ANNIHILATOR, ItemNames.VANGUARD}) + if first_mission == SC2Mission.SUDDEN_STRIKE.mission_name: + # Special case - cliffjumpers + basic_units = {ItemNames.REAPER, ItemNames.GOLIATH, ItemNames.SIEGE_TANK, ItemNames.VIKING, ItemNames.BANSHEE} + local_basic_unit = sorted(item for item in basic_units if item not in non_local_items and item not in excluded_items) + if not local_basic_unit: + # Drop non_local_items constraint + local_basic_unit = sorted(item for item in basic_units if item not in excluded_items) + if not local_basic_unit: + raise Exception("Early Unit: At least one basic unit must be included") + + unit: Item = add_starter_item(world, excluded_items, local_basic_unit) + starter_items.append(unit) + + # NCO-only specific rules + if first_mission == SC2Mission.SUDDEN_STRIKE.mission_name: + support_item: Union[str, None] = None + if unit.name == ItemNames.REAPER: + support_item = ItemNames.REAPER_SPIDER_MINES + elif unit.name == ItemNames.GOLIATH: + support_item = ItemNames.GOLIATH_JUMP_JETS + elif unit.name == ItemNames.SIEGE_TANK: + support_item = ItemNames.SIEGE_TANK_JUMP_JETS + elif unit.name == ItemNames.VIKING: + support_item = ItemNames.VIKING_SMART_SERVOS + if support_item is not None: + starter_items.append(add_starter_item(world, excluded_items, [support_item])) + starter_items.append(add_starter_item(world, excluded_items, [ItemNames.NOVA_JUMP_SUIT_MODULE])) + starter_items.append( + add_starter_item(world, excluded_items, + [ + ItemNames.NOVA_HELLFIRE_SHOTGUN, + ItemNames.NOVA_PLASMA_RIFLE, + ItemNames.NOVA_PULSE_GRENADES + ])) + if enabled_campaigns == {SC2Campaign.NCO}: + starter_items.append(add_starter_item(world, excluded_items, [ItemNames.LIBERATOR_RAID_ARTILLERY])) + + starter_abilities = get_option_value(world, 'start_primary_abilities') + assert isinstance(starter_abilities, int) + if starter_abilities: + ability_count = starter_abilities + ability_tiers = [0, 1, 3] + world.random.shuffle(ability_tiers) + if ability_count > 3: + ability_tiers.append(6) + for tier in ability_tiers: + abilities = kerrigan_actives[tier].union(kerrigan_passives[tier]).difference(excluded_items, non_local_items) + if not abilities: + abilities = kerrigan_actives[tier].union(kerrigan_passives[tier]).difference(excluded_items) + if abilities: + ability_count -= 1 + starter_items.append(add_starter_item(world, excluded_items, list(abilities))) + if ability_count == 0: + break + + return starter_items + + +def get_first_mission(mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]]) -> str: + # The first world should also be the starting world + campaigns = mission_req_table.keys() + lowest_id = min([campaign.id for campaign in campaigns]) + first_campaign = [campaign for campaign in campaigns if campaign.id == lowest_id][0] + first_mission = list(mission_req_table[first_campaign])[0] + return first_mission + + +def add_starter_item(world: World, excluded_items: Set[str], item_list: Sequence[str]) -> Item: + + item_name = world.random.choice(sorted(item_list)) + + excluded_items.add(item_name) + + item = create_item_with_correct_settings(world.player, item_name) + + world.multiworld.push_precollected(item) + + return item + + +def get_item_pool(world: World, mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]], + starter_items: List[Item], excluded_items: Set[str], location_cache: List[Location]) -> List[Item]: + pool: List[Item] = [] + + # For the future: goal items like Artifact Shards go here + locked_items = [] + + # YAML items + yaml_locked_items = get_option_value(world, 'locked_items') + assert not isinstance(yaml_locked_items, int) + + # Adjust generic upgrade availability based on options + include_upgrades = get_option_value(world, 'generic_upgrade_missions') == 0 + upgrade_items = get_option_value(world, 'generic_upgrade_items') + assert isinstance(upgrade_items, int) + + # Include items from outside main campaigns + item_sets = {'wol', 'hots', 'lotv'} + if get_option_value(world, 'nco_items') \ + or SC2Campaign.NCO in get_enabled_campaigns(world): + item_sets.add('nco') + if get_option_value(world, 'bw_items'): + item_sets.add('bw') + if get_option_value(world, 'ext_items'): + item_sets.add('ext') + + def allowed_quantity(name: str, data: ItemData) -> int: + if name in excluded_items \ + or data.type == "Upgrade" and (not include_upgrades or name not in upgrade_included_names[upgrade_items]) \ + or not data.origin.intersection(item_sets): + return 0 + elif name in progressive_if_nco and 'nco' not in item_sets: + return 1 + elif name in progressive_if_ext and 'ext' not in item_sets: + return 1 + else: + return data.quantity + + for name, data in get_item_table().items(): + for _ in range(allowed_quantity(name, data)): + item = create_item_with_correct_settings(world.player, name) + if name in yaml_locked_items: + locked_items.append(item) + else: + pool.append(item) + + existing_items = starter_items + [item for item in world.multiworld.precollected_items[world.player] if item not in starter_items] + existing_names = [item.name for item in existing_items] + + # Check the parent item integrity, exclude items + pool[:] = [item for item in pool if pool_contains_parent(item, pool + locked_items + existing_items)] + + # Removing upgrades for excluded items + for item_name in excluded_items: + if item_name in existing_names: + continue + invalid_upgrades = get_item_upgrades(pool, item_name) + for invalid_upgrade in invalid_upgrades: + pool.remove(invalid_upgrade) + + fill_pool_with_kerrigan_levels(world, pool) + filtered_pool = filter_items(world, mission_req_table, location_cache, pool, existing_items, locked_items) + return filtered_pool + + +def fill_item_pool_with_dummy_items(self: SC2World, locked_locations: List[str], + location_cache: List[Location], pool: List[Item]): + for _ in range(len(location_cache) - len(locked_locations) - len(pool)): + item = create_item_with_correct_settings(self.player, self.get_filler_item_name()) + pool.append(item) + + +def create_item_with_correct_settings(player: int, name: str) -> Item: + data = get_full_item_list()[name] + + item = Item(name, data.classification, data.code, player) + + return item + + +def pool_contains_parent(item: Item, pool: Iterable[Item]): + item_data = get_full_item_list().get(item.name) + if item_data.parent_item is None: + # The item has not associated parent, the item is valid + return True + parent_item = item_data.parent_item + # Check if the pool contains the parent item + return parent_item in [pool_item.name for pool_item in pool] + + +def fill_resource_locations(world: World, locked_locations: List[str], location_cache: List[Location]): + """ + Filters the locations in the world using a trash or Nothing item + :param multiworld: + :param player: + :param locked_locations: + :param location_cache: + :return: + """ + open_locations = [location for location in location_cache if location.item is None] + plando_locations = get_plando_locations(world) + resource_location_types = get_location_types(world, LocationInclusion.option_resources) + location_data = {sc2_location.name: sc2_location for sc2_location in get_locations(world)} + for location in open_locations: + # Go through the locations that aren't locked yet (early unit, etc) + if location.name not in plando_locations: + # The location is not plando'd + sc2_location = location_data[location.name] + if sc2_location.type in resource_location_types: + item_name = world.random.choice(filler_items) + item = create_item_with_correct_settings(world.player, item_name) + location.place_locked_item(item) + locked_locations.append(location.name) + + +def place_exclusion_item(item_name, location, locked_locations, player): + item = create_item_with_correct_settings(player, item_name) + location.place_locked_item(item) + locked_locations.append(location.name) + + +def fill_pool_with_kerrigan_levels(world: World, item_pool: List[Item]): + total_levels = get_option_value(world, "kerrigan_level_item_sum") + if get_option_value(world, "kerrigan_presence") not in kerrigan_unit_available \ + or total_levels == 0 \ + or SC2Campaign.HOTS not in get_enabled_campaigns(world): + return + + def add_kerrigan_level_items(level_amount: int, item_amount: int): + name = f"{level_amount} Kerrigan Level" + if level_amount > 1: + name += "s" + for _ in range(item_amount): + item_pool.append(create_item_with_correct_settings(world.player, name)) + + sizes = [70, 35, 14, 10, 7, 5, 2, 1] + option = get_option_value(world, "kerrigan_level_item_distribution") + + assert isinstance(option, int) + assert isinstance(total_levels, int) + + if option in (KerriganLevelItemDistribution.option_vanilla, KerriganLevelItemDistribution.option_smooth): + distribution = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + if option == KerriganLevelItemDistribution.option_vanilla: + distribution = [32, 0, 0, 1, 3, 0, 0, 0, 1, 1] + else: # Smooth + distribution = [0, 0, 0, 1, 1, 2, 2, 2, 1, 1] + for tier in range(len(distribution)): + add_kerrigan_level_items(tier + 1, distribution[tier]) + else: + size = sizes[option - 2] + round_func: Callable[[float], int] = round + if total_levels > 70: + round_func = floor + else: + round_func = ceil + add_kerrigan_level_items(size, round_func(float(total_levels) / size)) diff --git a/worlds/sc2/docs/contributors.md b/worlds/sc2/docs/contributors.md new file mode 100644 index 000000000000..5b62466d7e45 --- /dev/null +++ b/worlds/sc2/docs/contributors.md @@ -0,0 +1,42 @@ +# Contributors +Contibutors are listed with preferred or Discord names first, with github usernames prepended with an `@` + +## Update 2024.0 +### Code Changes +* Ziktofel (@Ziktofel) +* Salzkorn (@Salzkorn) +* EnvyDragon (@EnvyDragon) +* Phanerus (@MatthewMarinets) +* Madi Sylveon (@MadiMadsen) +* Magnemania (@Magnemania) +* Subsourian (@Subsourian) +* Hopop (@hopop201) +* Alice Voltaire (@AliceVoltaire) +* Genderdruid (@ArchonofFail) +* CrazedCollie (@FoxOfWar) + +### Additional Beta testing and bug reports +* Varcklen (@Varcklen) +* BicolourSnake (@Bicoloursnake) +* @NobleXenon +* Severencir (@Severencir) +* neocerber (@neocerber) +* Mati (@Matiya-star) +* Ixzine +* sweetox +* 8thDaughterOfFrost +* The M8 +* Berserker (@Berserker66) +* KaitoKid +* Sheen +* ProfBytes +* IncoherentOrange +* eudaimonistic +* Figment + +## Older versions +Not all contributors to older versions of Archipelago Starcraft 2 are known. + +TheCondor (@TheCondor07) is the original maintainer of the project. Other known contributors include: +* soldieroforder +* Berserker (@Berserker66) diff --git a/worlds/sc2/docs/en_Starcraft 2.md b/worlds/sc2/docs/en_Starcraft 2.md new file mode 100644 index 000000000000..43a7da89f24f --- /dev/null +++ b/worlds/sc2/docs/en_Starcraft 2.md @@ -0,0 +1,64 @@ +# Starcraft 2 Wings of Liberty + +## What does randomization do to this game? + +The following unlocks are randomized as items: +1. Your ability to build any non-worker unit. +2. Unit specific upgrades including some combinations not available in the vanilla campaigns, such as both strain choices simultaneously for Zerg and every Spear of Adun upgrade simultaneously for Protoss! +3. Your ability to get the generic unit upgrades, such as attack and armour upgrades. +4. Other miscellaneous upgrades such as laboratory upgrades and mercenaries for Terran, Kerrigan levels and upgrades for Zerg, and Spear of Adun upgrades for Protoss. +5. Small boosts to your starting mineral, vespene gas, and supply totals on each mission. + +You find items by making progress in these categories: +* Completing missions +* Completing bonus objectives (like by gathering lab research material in Wings of Liberty) +* Reaching milestones in the mission, such as completing part of a main objective +* Completing challenges based on achievements in the base game, such as clearing all Zerg on Devil's Playground + +Except for mission completion, these categories can be disabled in the game's settings. For instance, you can disable getting items for reaching required milestones. + +When you receive items, they will immediately become available, even during a mission, and you will be +notified via a text box in the top-right corner of the game screen. Item unlocks are also logged in the Archipelago client. + +Missions are launched through the Starcraft 2 Archipelago client, through the Starcraft 2 Launcher tab. The between mission segments on the Hyperion, the Leviathan, and the Spear of Adun are not included. Additionally, metaprogression currencies such as credits and Solarite are not used. + +## What is the goal of this game when randomized? + +The goal is to beat the final mission in the mission order. The yaml configuration file controls the mission order and how missions are shuffled. + +## What non-randomized changes are there from vanilla Starcraft 2? + +1. Some missions have more vespene geysers available to allow a wider variety of units. +2. Many new units and upgrades have been added as items, coming from co-op, melee, later campaigns, later expansions, brood war, and original ideas. +3. Higher-tech production structures, including Factories, Starports, Robotics Facilities, and Stargates, no longer have tech requirements. +4. Zerg missions have been adjusted to give the player a starting Lair where they would only have Hatcheries. +5. Upgrades with a downside have had the downside removed, such as automated refineries costing more or tech reactors taking longer to build. +6. Unit collision within the vents in Enemy Within has been adjusted to allow larger units to travel through them without getting stuck in odd places. +7. Several vanilla bugs have been fixed. + +## Which of my items can be in another player's world? + +By default, any of StarCraft 2's items (specified above) can be in another player's world. See the +[Advanced YAML Guide](https://archipelago.gg/tutorial/Archipelago/advanced_settings/en) +for more information on how to change this. + +## Unique Local Commands + +The following commands are only available when using the Starcraft 2 Client to play with Archipelago. You can list them any time in the client with `/help`. + +* `/download_data` Download the most recent release of the necessary files for playing SC2 with Archipelago. Will overwrite existing files +* `/difficulty [difficulty]` Overrides the difficulty set for the world. + * Options: casual, normal, hard, brutal +* `/game_speed [game_speed]` Overrides the game speed for the world + * Options: default, slower, slow, normal, fast, faster +* `/color [faction] [color]` Changes your color for one of your playable factions. + * Faction options: raynor, kerrigan, primal, protoss, nova + * Color options: white, red, blue, teal, purple, yellow, orange, green, lightpink, violet, lightgrey, darkgreen, brown, lightgreen, darkgrey, pink, rainbow, random, default +* `/option [option_name] [option_value]` Sets an option normally controlled by your yaml after generation. + * Run without arguments to list all options. + * Options pertain to automatic cutscene skipping, Kerrigan presence, Spear of Adun presence, starting resource amounts, controlling AI allies, etc. +* `/disable_mission_check` Disables the check to see if a mission is available to play. Meant for co-op runs where one player can play the next mission in a chain the other player is doing. +* `/play [mission_id]` Starts a Starcraft 2 mission based off of the mission_id provided +* `/available` Get what missions are currently available to play +* `/unfinished` Get what missions are currently available to play and have not had all locations checked +* `/set_path [path]` Manually set the SC2 install directory (if the automatic detection fails) diff --git a/worlds/sc2wol/docs/setup_en.md b/worlds/sc2/docs/setup_en.md similarity index 50% rename from worlds/sc2wol/docs/setup_en.md rename to worlds/sc2/docs/setup_en.md index 9bfeb3d235bc..10881e149c43 100644 --- a/worlds/sc2wol/docs/setup_en.md +++ b/worlds/sc2/docs/setup_en.md @@ -7,12 +7,10 @@ to obtain a config file for StarCraft 2. - [StarCraft 2](https://starcraft2.com/en-us/) - [The most recent Archipelago release](https://github.com/ArchipelagoMW/Archipelago/releases) -- [StarCraft 2 AP Maps and Data](https://github.com/Ziktofel/Archipelago-SC2-data/releases) ## How do I install this randomizer? -1. Install StarCraft 2 and Archipelago using the first two links above. (The StarCraft 2 client for Archipelago is - included by default.) +1. Install StarCraft 2 and Archipelago using the links above. The StarCraft 2 Archipelago client is downloaded by the Archipelago installer. - Linux users should also follow the instructions found at the bottom of this page (["Running in Linux"](#running-in-linux)). 2. Run ArchipelagoStarcraft2Client.exe. @@ -21,25 +19,66 @@ to obtain a config file for StarCraft 2. ## Where do I get a config file (aka "YAML") for this game? -The [Player Settings](https://archipelago.gg/games/Starcraft%202%20Wings%20of%20Liberty/player-settings) page on this -website allows you to choose your personal settings for the randomizer and download them into a config file. Remember -the name you type in the `Player Name` box; that's the "slot name" the client will ask you for when you attempt to -connect! +Yaml files are configuration files that tell Archipelago how you'd like your game to be randomized, even if you're only using default options. +When you're setting up a multiworld, every world needs its own yaml file. -### And why do I need a config file? +There are three basic ways to get a yaml: +* You can go to the [Player Options](https://archipelago.gg/games/Starcraft%202/player-options) page, set your options in the GUI, and export the yaml. +* You can generate a template, either by downloading it from the [Player Options](https://archipelago.gg/games/Starcraft%202/player-options) page or by generating it from the Launcher (ArchipelagoLauncher.exe). The template includes descriptions of each option, you just have to edit it in your text editor of choice. +* You can ask someone else to share their yaml to use it for yourself or adjust it as you wish. -Config files tell Archipelago how you'd like your game to be randomized, even if you're only using default settings. -When you're setting up a multiworld, every world needs its own config file. -Check out [Creating a YAML](https://archipelago.gg/tutorial/Archipelago/setup/en#creating-a-yaml) for more information. +Remember the name you enter in the options page or in the yaml file, you'll need it to connect later! + +Note that the basic Player Options page doesn't allow you to change all advanced options, such as excluding particular units or upgrades. Go through the [Weighted Options](https://archipelago.gg/weighted-options) page for that. + +Check out [Creating a YAML](https://archipelago.gg/tutorial/Archipelago/setup/en#creating-a-yaml) for more game-agnostic information. + +### Common yaml questions +#### How do I know I set my yaml up correctly? + +The simplest way to check is to test it out. Save your yaml to the Players/ folder within your Archipelago installation and run ArchipelagoGenerate.exe. You should see a new .zip file within the output/ folder of your Archipelago installation if things worked correctly. It's advisable to run ArchipelagoGenerate through a terminal so that you can see the printout, which will include any errors and the precise output file name if it's successful. If you don't like terminals, you can also check the log file in the logs/ folder. + +#### What does Progression Balancing do? + +For Starcraft 2, not much. It's an Archipelago-wide option meant to shift required items earlier in the playthrough, but Starcraft 2 tends to be much more open in what items you can use. As such, this adjustment isn't very noticeable. It can also increase generation times, so we generally recommend turning it off. + +#### How do I specify items in a list, like in excluded items? + +You can look up the syntax for yaml collections in the [YAML specification](https://yaml.org/spec/1.2.2/#21-collections). For lists, every item goes on its own line, started with a hyphen: + +```yaml +excluded_items: + - Battlecruiser + - Drop-Pods (Kerrigan Tier 7) +``` + +An empty list is just a matching pair of square brackets: `[]`. That's the default value in the template, which should let you know to use this syntax. + +#### How do I specify items for the starting inventory? + +The starting inventory is a YAML mapping rather than a list, which associates an item with the amount you start with. The syntax looks like the item name, followed by a colon, then a whitespace character, and then the value: + +```yaml +start_inventory: + Micro-Filtering: 1 + Additional Starting Vespene: 5 +``` + +An empty mapping is just a matching pair of curly braces: `{}`. That's the default value in the template, which should let you know to use this syntax. + +#### How do I know the exact names of items? + +You can look up a complete list if item names in the [Icon Repository](https://matthewmarinets.github.io/ap_sc2_icons/). ## How do I join a MultiWorld game? 1. Run ArchipelagoStarcraft2Client.exe. - macOS users should instead follow the instructions found at ["Running in macOS"](#running-in-macos) for this step only. 2. Type `/connect [server ip]`. -3. Type your slot name and the server's password when prompted. -4. Once connected, switch to the 'StarCraft 2 Launcher' tab in the client. There, you can see every mission. By default, - only 'Liberation Day' will be available at the beginning. Just click on a mission to start it! + - If you're running through the website, the server IP should be displayed near the top of the room page. +3. Type your slot name from your YAML when prompted. +4. If the server has a password, enter that when prompted. +5. Once connected, switch to the 'StarCraft 2 Launcher' tab in the client. There, you can see all the missions in your world. Unreachable missions will have greyed-out text. Just click on an available mission to start it! ## The game isn't launching when I try to start a mission. diff --git a/worlds/sc2wol/requirements.txt b/worlds/sc2/requirements.txt similarity index 100% rename from worlds/sc2wol/requirements.txt rename to worlds/sc2/requirements.txt diff --git a/worlds/sc2/test/__init__.py b/worlds/sc2/test/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/worlds/sc2/test/test_Regions.py b/worlds/sc2/test/test_Regions.py new file mode 100644 index 000000000000..c268b65da9a8 --- /dev/null +++ b/worlds/sc2/test/test_Regions.py @@ -0,0 +1,41 @@ +import unittest +from .test_base import Sc2TestBase +from .. import Regions +from .. import Options, MissionTables + +class TestGridsizes(unittest.TestCase): + def test_grid_sizes_meet_specs(self): + self.assertTupleEqual((1, 2, 0), Regions.get_grid_dimensions(2)) + self.assertTupleEqual((1, 3, 0), Regions.get_grid_dimensions(3)) + self.assertTupleEqual((2, 2, 0), Regions.get_grid_dimensions(4)) + self.assertTupleEqual((2, 3, 1), Regions.get_grid_dimensions(5)) + self.assertTupleEqual((2, 4, 1), Regions.get_grid_dimensions(7)) + self.assertTupleEqual((2, 4, 0), Regions.get_grid_dimensions(8)) + self.assertTupleEqual((3, 3, 0), Regions.get_grid_dimensions(9)) + self.assertTupleEqual((2, 5, 0), Regions.get_grid_dimensions(10)) + self.assertTupleEqual((3, 4, 1), Regions.get_grid_dimensions(11)) + self.assertTupleEqual((3, 4, 0), Regions.get_grid_dimensions(12)) + self.assertTupleEqual((3, 5, 0), Regions.get_grid_dimensions(15)) + self.assertTupleEqual((4, 4, 0), Regions.get_grid_dimensions(16)) + self.assertTupleEqual((4, 6, 0), Regions.get_grid_dimensions(24)) + self.assertTupleEqual((5, 5, 0), Regions.get_grid_dimensions(25)) + self.assertTupleEqual((5, 6, 1), Regions.get_grid_dimensions(29)) + self.assertTupleEqual((5, 7, 2), Regions.get_grid_dimensions(33)) + + +class TestGridGeneration(Sc2TestBase): + options = { + "mission_order": Options.MissionOrder.option_grid, + "excluded_missions": [MissionTables.SC2Mission.ZERO_HOUR.mission_name,], + "enable_hots_missions": False, + "enable_prophecy_missions": True, + "enable_lotv_prologue_missions": False, + "enable_lotv_missions": False, + "enable_epilogue_missions": False, + "enable_nco_missions": False + } + + def test_size_matches_exclusions(self): + self.assertNotIn(MissionTables.SC2Mission.ZERO_HOUR.mission_name, self.multiworld.regions) + # WoL has 29 missions. -1 for Zero Hour being excluded, +1 for the automatically-added menu location + self.assertEqual(len(self.multiworld.regions), 29) diff --git a/worlds/sc2/test/test_base.py b/worlds/sc2/test/test_base.py new file mode 100644 index 000000000000..28529e37edd5 --- /dev/null +++ b/worlds/sc2/test/test_base.py @@ -0,0 +1,11 @@ +from typing import * + +from test.TestBase import WorldTestBase +from .. import SC2World +from .. import Client + +class Sc2TestBase(WorldTestBase): + game = Client.SC2Context.game + world: SC2World + player: ClassVar[int] = 1 + skip_long_tests: bool = True diff --git a/worlds/sc2/test/test_options.py b/worlds/sc2/test/test_options.py new file mode 100644 index 000000000000..30d21f39697e --- /dev/null +++ b/worlds/sc2/test/test_options.py @@ -0,0 +1,7 @@ +import unittest +from .test_base import Sc2TestBase +from .. import Options, MissionTables + +class TestOptions(unittest.TestCase): + def test_campaign_size_option_max_matches_number_of_missions(self): + self.assertEqual(Options.MaximumCampaignSize.range_end, len(MissionTables.SC2Mission)) diff --git a/worlds/sc2wol/Client.py b/worlds/sc2wol/Client.py deleted file mode 100644 index 83b7b62d2977..000000000000 --- a/worlds/sc2wol/Client.py +++ /dev/null @@ -1,1222 +0,0 @@ -from __future__ import annotations - -import asyncio -import copy -import ctypes -import logging -import multiprocessing -import os.path -import re -import sys -import tempfile -import typing -import queue -import zipfile -import io -import random -import concurrent.futures -from pathlib import Path - -# CommonClient import first to trigger ModuleUpdater -from CommonClient import CommonContext, server_loop, ClientCommandProcessor, gui_enabled, get_base_parser -from Utils import init_logging, is_windows - -if __name__ == "__main__": - init_logging("SC2Client", exception_logger="Client") - -logger = logging.getLogger("Client") -sc2_logger = logging.getLogger("Starcraft2") - -import nest_asyncio -from worlds._sc2common import bot -from worlds._sc2common.bot.data import Race -from worlds._sc2common.bot.main import run_game -from worlds._sc2common.bot.player import Bot -from worlds.sc2wol import SC2WoLWorld -from worlds.sc2wol.Items import lookup_id_to_name, get_full_item_list, ItemData, type_flaggroups, upgrade_numbers -from worlds.sc2wol.Locations import SC2WOL_LOC_ID_OFFSET -from worlds.sc2wol.MissionTables import lookup_id_to_mission -from worlds.sc2wol.Regions import MissionInfo - -import colorama -from NetUtils import ClientStatus, NetworkItem, RawJSONtoTextParser, JSONtoTextParser, JSONMessagePart -from MultiServer import mark_raw - -pool = concurrent.futures.ThreadPoolExecutor(1) -loop = asyncio.get_event_loop_policy().new_event_loop() -nest_asyncio.apply(loop) -max_bonus: int = 13 -victory_modulo: int = 100 - -# GitHub repo where the Map/mod data is hosted for /download_data command -DATA_REPO_OWNER = "Ziktofel" -DATA_REPO_NAME = "Archipelago-SC2-data" -DATA_API_VERSION = "API2" - - -# Data version file path. -# This file is used to tell if the downloaded data are outdated -# Associated with /download_data command -def get_metadata_file(): - return os.environ["SC2PATH"] + os.sep + "ArchipelagoSC2Metadata.txt" - - -class StarcraftClientProcessor(ClientCommandProcessor): - ctx: SC2Context - - def _cmd_difficulty(self, difficulty: str = "") -> bool: - """Overrides the current difficulty set for the world. Takes the argument casual, normal, hard, or brutal""" - options = difficulty.split() - num_options = len(options) - - if num_options > 0: - difficulty_choice = options[0].lower() - if difficulty_choice == "casual": - self.ctx.difficulty_override = 0 - elif difficulty_choice == "normal": - self.ctx.difficulty_override = 1 - elif difficulty_choice == "hard": - self.ctx.difficulty_override = 2 - elif difficulty_choice == "brutal": - self.ctx.difficulty_override = 3 - else: - self.output("Unable to parse difficulty '" + options[0] + "'") - return False - - self.output("Difficulty set to " + options[0]) - return True - - else: - if self.ctx.difficulty == -1: - self.output("Please connect to a seed before checking difficulty.") - else: - current_difficulty = self.ctx.difficulty - if self.ctx.difficulty_override >= 0: - current_difficulty = self.ctx.difficulty_override - self.output("Current difficulty: " + ["Casual", "Normal", "Hard", "Brutal"][current_difficulty]) - self.output("To change the difficulty, add the name of the difficulty after the command.") - return False - - - def _cmd_game_speed(self, game_speed: str = "") -> bool: - """Overrides the current game speed for the world. - Takes the arguments default, slower, slow, normal, fast, faster""" - options = game_speed.split() - num_options = len(options) - - if num_options > 0: - speed_choice = options[0].lower() - if speed_choice == "default": - self.ctx.game_speed_override = 0 - elif speed_choice == "slower": - self.ctx.game_speed_override = 1 - elif speed_choice == "slow": - self.ctx.game_speed_override = 2 - elif speed_choice == "normal": - self.ctx.game_speed_override = 3 - elif speed_choice == "fast": - self.ctx.game_speed_override = 4 - elif speed_choice == "faster": - self.ctx.game_speed_override = 5 - else: - self.output("Unable to parse game speed '" + options[0] + "'") - return False - - self.output("Game speed set to " + options[0]) - return True - - else: - if self.ctx.game_speed == -1: - self.output("Please connect to a seed before checking game speed.") - else: - current_speed = self.ctx.game_speed - if self.ctx.game_speed_override >= 0: - current_speed = self.ctx.game_speed_override - self.output("Current game speed: " - + ["Default", "Slower", "Slow", "Normal", "Fast", "Faster"][current_speed]) - self.output("To change the game speed, add the name of the speed after the command," - " or Default to select based on difficulty.") - return False - - def _cmd_color(self, color: str = "") -> bool: - player_colors = [ - "White", "Red", "Blue", "Teal", - "Purple", "Yellow", "Orange", "Green", - "LightPink", "Violet", "LightGrey", "DarkGreen", - "Brown", "LightGreen", "DarkGrey", "Pink", - "Rainbow", "Random", "Default" - ] - match_colors = [player_color.lower() for player_color in player_colors] - if color: - if color.lower() not in match_colors: - self.output(color + " is not a valid color. Available colors: " + ', '.join(player_colors)) - return False - if color.lower() == "random": - color = random.choice(player_colors[:16]) - self.ctx.player_color = match_colors.index(color.lower()) - self.output("Color set to " + player_colors[self.ctx.player_color]) - else: - self.output("Current player color: " + player_colors[self.ctx.player_color]) - self.output("To change your colors, add the name of the color after the command.") - self.output("Available colors: " + ', '.join(player_colors)) - - def _cmd_disable_mission_check(self) -> bool: - """Disables the check to see if a mission is available to play. Meant for co-op runs where one player can play - the next mission in a chain the other player is doing.""" - self.ctx.missions_unlocked = True - sc2_logger.info("Mission check has been disabled") - return True - - def _cmd_play(self, mission_id: str = "") -> bool: - """Start a Starcraft 2 mission""" - - options = mission_id.split() - num_options = len(options) - - if num_options > 0: - mission_number = int(options[0]) - - self.ctx.play_mission(mission_number) - - else: - sc2_logger.info( - "Mission ID needs to be specified. Use /unfinished or /available to view ids for available missions.") - return False - - return True - - def _cmd_available(self) -> bool: - """Get what missions are currently available to play""" - - request_available_missions(self.ctx) - return True - - def _cmd_unfinished(self) -> bool: - """Get what missions are currently available to play and have not had all locations checked""" - - request_unfinished_missions(self.ctx) - return True - - @mark_raw - def _cmd_set_path(self, path: str = '') -> bool: - """Manually set the SC2 install directory (if the automatic detection fails).""" - if path: - os.environ["SC2PATH"] = path - is_mod_installed_correctly() - return True - else: - sc2_logger.warning("When using set_path, you must type the path to your SC2 install directory.") - return False - - def _cmd_download_data(self) -> bool: - """Download the most recent release of the necessary files for playing SC2 with - Archipelago. Will overwrite existing files.""" - pool.submit(self._download_data) - return True - - @staticmethod - def _download_data() -> bool: - if "SC2PATH" not in os.environ: - check_game_install_path() - - if os.path.exists(get_metadata_file()): - with open(get_metadata_file(), "r") as f: - metadata = f.read() - else: - metadata = None - - tempzip, metadata = download_latest_release_zip(DATA_REPO_OWNER, DATA_REPO_NAME, DATA_API_VERSION, - metadata=metadata, force_download=True) - - if tempzip != '': - try: - zipfile.ZipFile(tempzip).extractall(path=os.environ["SC2PATH"]) - sc2_logger.info(f"Download complete. Package installed.") - with open(get_metadata_file(), "w") as f: - f.write(metadata) - finally: - os.remove(tempzip) - else: - sc2_logger.warning("Download aborted/failed. Read the log for more information.") - return False - return True - - -class SC2JSONtoTextParser(JSONtoTextParser): - def __init__(self, ctx): - self.handlers = { - "ItemSend": self._handle_color, - "ItemCheat": self._handle_color, - "Hint": self._handle_color, - } - super().__init__(ctx) - - def _handle_color(self, node: JSONMessagePart): - codes = node["color"].split(";") - buffer = "".join(self.color_code(code) for code in codes if code in self.color_codes) - return buffer + self._handle_text(node) + '' - - def color_code(self, code: str): - return '' - - -class SC2Context(CommonContext): - command_processor = StarcraftClientProcessor - game = "Starcraft 2 Wings of Liberty" - items_handling = 0b111 - difficulty = -1 - game_speed = -1 - all_in_choice = 0 - mission_order = 0 - player_color = 2 - mission_req_table: typing.Dict[str, MissionInfo] = {} - final_mission: int = 29 - announcements = queue.Queue() - sc2_run_task: typing.Optional[asyncio.Task] = None - missions_unlocked: bool = False # allow launching missions ignoring requirements - generic_upgrade_missions = 0 - generic_upgrade_research = 0 - generic_upgrade_items = 0 - current_tooltip = None - last_loc_list = None - difficulty_override = -1 - game_speed_override = -1 - mission_id_to_location_ids: typing.Dict[int, typing.List[int]] = {} - last_bot: typing.Optional[ArchipelagoBot] = None - - def __init__(self, *args, **kwargs): - super(SC2Context, self).__init__(*args, **kwargs) - self.raw_text_parser = SC2JSONtoTextParser(self) - - async def server_auth(self, password_requested: bool = False): - if password_requested and not self.password: - await super(SC2Context, self).server_auth(password_requested) - await self.get_username() - await self.send_connect() - if self.ui: - self.ui.first_check = True - - def on_package(self, cmd: str, args: dict): - if cmd in {"Connected"}: - self.difficulty = args["slot_data"]["game_difficulty"] - if "game_speed" in args["slot_data"]: - self.game_speed = args["slot_data"]["game_speed"] - else: - self.game_speed = 0 - self.all_in_choice = args["slot_data"]["all_in_map"] - slot_req_table = args["slot_data"]["mission_req"] - # Maintaining backwards compatibility with older slot data - self.mission_req_table = { - mission: MissionInfo( - **{field: value for field, value in mission_info.items() if field in MissionInfo._fields} - ) - for mission, mission_info in slot_req_table.items() - } - self.mission_order = args["slot_data"].get("mission_order", 0) - self.final_mission = args["slot_data"].get("final_mission", 29) - self.player_color = args["slot_data"].get("player_color", 2) - self.generic_upgrade_missions = args["slot_data"].get("generic_upgrade_missions", 0) - self.generic_upgrade_items = args["slot_data"].get("generic_upgrade_items", 0) - self.generic_upgrade_research = args["slot_data"].get("generic_upgrade_research", 0) - - self.build_location_to_mission_mapping() - - # Looks for the required maps and mods for SC2. Runs check_game_install_path. - maps_present = is_mod_installed_correctly() - if os.path.exists(get_metadata_file()): - with open(get_metadata_file(), "r") as f: - current_ver = f.read() - sc2_logger.debug(f"Current version: {current_ver}") - if is_mod_update_available(DATA_REPO_OWNER, DATA_REPO_NAME, DATA_API_VERSION, current_ver): - sc2_logger.info("NOTICE: Update for required files found. Run /download_data to install.") - elif maps_present: - sc2_logger.warning("NOTICE: Your map files may be outdated (version number not found). " - "Run /download_data to update them.") - - - def on_print_json(self, args: dict): - # goes to this world - if "receiving" in args and self.slot_concerns_self(args["receiving"]): - relevant = True - # found in this world - elif "item" in args and self.slot_concerns_self(args["item"].player): - relevant = True - # not related - else: - relevant = False - - if relevant: - self.announcements.put(self.raw_text_parser(copy.deepcopy(args["data"]))) - - super(SC2Context, self).on_print_json(args) - - def run_gui(self): - from kvui import GameManager, HoverBehavior, ServerToolTip - from kivy.app import App - from kivy.clock import Clock - from kivy.uix.tabbedpanel import TabbedPanelItem - from kivy.uix.gridlayout import GridLayout - from kivy.lang import Builder - from kivy.uix.label import Label - from kivy.uix.button import Button - from kivy.uix.floatlayout import FloatLayout - from kivy.properties import StringProperty - - class HoverableButton(HoverBehavior, Button): - pass - - class MissionButton(HoverableButton): - tooltip_text = StringProperty("Test") - ctx: SC2Context - - def __init__(self, *args, **kwargs): - super(HoverableButton, self).__init__(*args, **kwargs) - self.layout = FloatLayout() - self.popuplabel = ServerToolTip(text=self.text) - self.layout.add_widget(self.popuplabel) - - def on_enter(self): - self.popuplabel.text = self.tooltip_text - - if self.ctx.current_tooltip: - App.get_running_app().root.remove_widget(self.ctx.current_tooltip) - - if self.tooltip_text == "": - self.ctx.current_tooltip = None - else: - App.get_running_app().root.add_widget(self.layout) - self.ctx.current_tooltip = self.layout - - def on_leave(self): - self.ctx.ui.clear_tooltip() - - @property - def ctx(self) -> CommonContext: - return App.get_running_app().ctx - - class MissionLayout(GridLayout): - pass - - class MissionCategory(GridLayout): - pass - - class SC2Manager(GameManager): - logging_pairs = [ - ("Client", "Archipelago"), - ("Starcraft2", "Starcraft2"), - ] - base_title = "Archipelago Starcraft 2 Client" - - mission_panel = None - last_checked_locations = {} - mission_id_to_button = {} - launching: typing.Union[bool, int] = False # if int -> mission ID - refresh_from_launching = True - first_check = True - ctx: SC2Context - - def __init__(self, ctx): - super().__init__(ctx) - - def clear_tooltip(self): - if self.ctx.current_tooltip: - App.get_running_app().root.remove_widget(self.ctx.current_tooltip) - - self.ctx.current_tooltip = None - - def build(self): - container = super().build() - - panel = TabbedPanelItem(text="Starcraft 2 Launcher") - self.mission_panel = panel.content = MissionLayout() - - self.tabs.add_widget(panel) - - Clock.schedule_interval(self.build_mission_table, 0.5) - - return container - - def build_mission_table(self, dt): - if (not self.launching and (not self.last_checked_locations == self.ctx.checked_locations or - not self.refresh_from_launching)) or self.first_check: - self.refresh_from_launching = True - - self.mission_panel.clear_widgets() - if self.ctx.mission_req_table: - self.last_checked_locations = self.ctx.checked_locations.copy() - self.first_check = False - - self.mission_id_to_button = {} - categories = {} - available_missions, unfinished_missions = calc_unfinished_missions(self.ctx) - - # separate missions into categories - for mission in self.ctx.mission_req_table: - if not self.ctx.mission_req_table[mission].category in categories: - categories[self.ctx.mission_req_table[mission].category] = [] - - categories[self.ctx.mission_req_table[mission].category].append(mission) - - for category in categories: - category_panel = MissionCategory() - if category.startswith('_'): - category_display_name = '' - else: - category_display_name = category - category_panel.add_widget( - Label(text=category_display_name, size_hint_y=None, height=50, outline_width=1)) - - for mission in categories[category]: - text: str = mission - tooltip: str = "" - mission_id: int = self.ctx.mission_req_table[mission].id - # Map has uncollected locations - if mission in unfinished_missions: - text = f"[color=6495ED]{text}[/color]" - elif mission in available_missions: - text = f"[color=FFFFFF]{text}[/color]" - # Map requirements not met - else: - text = f"[color=a9a9a9]{text}[/color]" - tooltip = f"Requires: " - if self.ctx.mission_req_table[mission].required_world: - tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission - 1] for - req_mission in - self.ctx.mission_req_table[mission].required_world) - - if self.ctx.mission_req_table[mission].number: - tooltip += " and " - if self.ctx.mission_req_table[mission].number: - tooltip += f"{self.ctx.mission_req_table[mission].number} missions completed" - remaining_location_names: typing.List[str] = [ - self.ctx.location_names[loc] for loc in self.ctx.locations_for_mission(mission) - if loc in self.ctx.missing_locations] - - if mission_id == self.ctx.final_mission: - if mission in available_missions: - text = f"[color=FFBC95]{mission}[/color]" - else: - text = f"[color=D0C0BE]{mission}[/color]" - if tooltip: - tooltip += "\n" - tooltip += "Final Mission" - - if remaining_location_names: - if tooltip: - tooltip += "\n" - tooltip += f"Uncollected locations:\n" - tooltip += "\n".join(remaining_location_names) - - mission_button = MissionButton(text=text, size_hint_y=None, height=50) - mission_button.tooltip_text = tooltip - mission_button.bind(on_press=self.mission_callback) - self.mission_id_to_button[mission_id] = mission_button - category_panel.add_widget(mission_button) - - category_panel.add_widget(Label(text="")) - self.mission_panel.add_widget(category_panel) - - elif self.launching: - self.refresh_from_launching = False - - self.mission_panel.clear_widgets() - self.mission_panel.add_widget(Label(text="Launching Mission: " + - lookup_id_to_mission[self.launching])) - if self.ctx.ui: - self.ctx.ui.clear_tooltip() - - def mission_callback(self, button): - if not self.launching: - mission_id: int = next(k for k, v in self.mission_id_to_button.items() if v == button) - if self.ctx.play_mission(mission_id): - self.launching = mission_id - Clock.schedule_once(self.finish_launching, 10) - - def finish_launching(self, dt): - self.launching = False - - self.ui = SC2Manager(self) - self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI") - import pkgutil - data = pkgutil.get_data(SC2WoLWorld.__module__, "Starcraft2.kv").decode() - Builder.load_string(data) - - async def shutdown(self): - await super(SC2Context, self).shutdown() - if self.last_bot: - self.last_bot.want_close = True - if self.sc2_run_task: - self.sc2_run_task.cancel() - - def play_mission(self, mission_id: int) -> bool: - if self.missions_unlocked or \ - is_mission_available(self, mission_id): - if self.sc2_run_task: - if not self.sc2_run_task.done(): - sc2_logger.warning("Starcraft 2 Client is still running!") - self.sc2_run_task.cancel() # doesn't actually close the game, just stops the python task - if self.slot is None: - sc2_logger.warning("Launching Mission without Archipelago authentication, " - "checks will not be registered to server.") - self.sc2_run_task = asyncio.create_task(starcraft_launch(self, mission_id), - name="Starcraft 2 Launch") - return True - else: - sc2_logger.info( - f"{lookup_id_to_mission[mission_id]} is not currently unlocked. " - f"Use /unfinished or /available to see what is available.") - return False - - def build_location_to_mission_mapping(self): - mission_id_to_location_ids: typing.Dict[int, typing.Set[int]] = { - mission_info.id: set() for mission_info in self.mission_req_table.values() - } - - for loc in self.server_locations: - mission_id, objective = divmod(loc - SC2WOL_LOC_ID_OFFSET, victory_modulo) - mission_id_to_location_ids[mission_id].add(objective) - self.mission_id_to_location_ids = {mission_id: sorted(objectives) for mission_id, objectives in - mission_id_to_location_ids.items()} - - def locations_for_mission(self, mission: str): - mission_id: int = self.mission_req_table[mission].id - objectives = self.mission_id_to_location_ids[self.mission_req_table[mission].id] - for objective in objectives: - yield SC2WOL_LOC_ID_OFFSET + mission_id * 100 + objective - - -async def main(): - multiprocessing.freeze_support() - parser = get_base_parser() - parser.add_argument('--name', default=None, help="Slot Name to connect as.") - args = parser.parse_args() - - ctx = SC2Context(args.connect, args.password) - ctx.auth = args.name - if ctx.server_task is None: - ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop") - - if gui_enabled: - ctx.run_gui() - ctx.run_cli() - - await ctx.exit_event.wait() - - await ctx.shutdown() - - -maps_table = [ - "ap_liberation_day", "ap_the_outlaws", "ap_zero_hour", - "ap_evacuation", "ap_outbreak", "ap_safe_haven", "ap_havens_fall", - "ap_smash_and_grab", "ap_the_dig", "ap_the_moebius_factor", "ap_supernova", "ap_maw_of_the_void", - "ap_devils_playground", "ap_welcome_to_the_jungle", "ap_breakout", "ap_ghost_of_a_chance", - "ap_the_great_train_robbery", "ap_cutthroat", "ap_engine_of_destruction", "ap_media_blitz", "ap_piercing_the_shroud", - "ap_whispers_of_doom", "ap_a_sinister_turn", "ap_echoes_of_the_future", "ap_in_utter_darkness", - "ap_gates_of_hell", "ap_belly_of_the_beast", "ap_shatter_the_sky", "ap_all_in" -] - -wol_default_categories = [ - "Mar Sara", "Mar Sara", "Mar Sara", "Colonist", "Colonist", "Colonist", "Colonist", - "Artifact", "Artifact", "Artifact", "Artifact", "Artifact", "Covert", "Covert", "Covert", "Covert", - "Rebellion", "Rebellion", "Rebellion", "Rebellion", "Rebellion", "Prophecy", "Prophecy", "Prophecy", "Prophecy", - "Char", "Char", "Char", "Char" -] -wol_default_category_names = [ - "Mar Sara", "Colonist", "Artifact", "Covert", "Rebellion", "Prophecy", "Char" -] - - -def calculate_items(ctx: SC2Context) -> typing.List[int]: - items = ctx.items_received - network_item: NetworkItem - accumulators: typing.List[int] = [0 for _ in type_flaggroups] - - for network_item in items: - name: str = lookup_id_to_name[network_item.item] - item_data: ItemData = get_full_item_list()[name] - - # exists exactly once - if item_data.quantity == 1: - accumulators[type_flaggroups[item_data.type]] |= 1 << item_data.number - - # exists multiple times - elif item_data.type == "Upgrade" or item_data.type == "Progressive Upgrade": - flaggroup = type_flaggroups[item_data.type] - - # Generic upgrades apply only to Weapon / Armor upgrades - if item_data.type != "Upgrade" or ctx.generic_upgrade_items == 0: - accumulators[flaggroup] += 1 << item_data.number - else: - for bundled_number in upgrade_numbers[item_data.number]: - accumulators[flaggroup] += 1 << bundled_number - - # sum - else: - accumulators[type_flaggroups[item_data.type]] += item_data.number - - # Upgrades from completed missions - if ctx.generic_upgrade_missions > 0: - upgrade_flaggroup = type_flaggroups["Upgrade"] - num_missions = ctx.generic_upgrade_missions * len(ctx.mission_req_table) - amounts = [ - num_missions // 100, - 2 * num_missions // 100, - 3 * num_missions // 100 - ] - upgrade_count = 0 - completed = len([id for id in ctx.mission_id_to_location_ids if SC2WOL_LOC_ID_OFFSET + victory_modulo * id in ctx.checked_locations]) - for amount in amounts: - if completed >= amount: - upgrade_count += 1 - # Equivalent to "Progressive Weapon/Armor Upgrade" item - for bundled_number in upgrade_numbers[5]: - accumulators[upgrade_flaggroup] += upgrade_count << bundled_number - - return accumulators - - -def calc_difficulty(difficulty): - if difficulty == 0: - return 'C' - elif difficulty == 1: - return 'N' - elif difficulty == 2: - return 'H' - elif difficulty == 3: - return 'B' - - return 'X' - - -async def starcraft_launch(ctx: SC2Context, mission_id: int): - sc2_logger.info(f"Launching {lookup_id_to_mission[mission_id]}. If game does not launch check log file for errors.") - - with DllDirectory(None): - run_game(bot.maps.get(maps_table[mission_id - 1]), [Bot(Race.Terran, ArchipelagoBot(ctx, mission_id), - name="Archipelago", fullscreen=True)], realtime=True) - - -class ArchipelagoBot(bot.bot_ai.BotAI): - game_running: bool = False - mission_completed: bool = False - boni: typing.List[bool] - setup_done: bool - ctx: SC2Context - mission_id: int - want_close: bool = False - can_read_game = False - last_received_update: int = 0 - - def __init__(self, ctx: SC2Context, mission_id): - self.setup_done = False - self.ctx = ctx - self.ctx.last_bot = self - self.mission_id = mission_id - self.boni = [False for _ in range(max_bonus)] - - super(ArchipelagoBot, self).__init__() - - async def on_step(self, iteration: int): - if self.want_close: - self.want_close = False - await self._client.leave() - return - game_state = 0 - if not self.setup_done: - self.setup_done = True - start_items = calculate_items(self.ctx) - if self.ctx.difficulty_override >= 0: - difficulty = calc_difficulty(self.ctx.difficulty_override) - else: - difficulty = calc_difficulty(self.ctx.difficulty) - if self.ctx.game_speed_override >= 0: - game_speed = self.ctx.game_speed_override - else: - game_speed = self.ctx.game_speed - await self.chat_send("?SetOptions {} {} {} {}".format( - difficulty, - self.ctx.generic_upgrade_research, - self.ctx.all_in_choice, - game_speed - )) - await self.chat_send("?GiveResources {} {} {}".format( - start_items[8], - start_items[9], - start_items[10] - )) - await self.chat_send("?GiveTerranTech {} {} {} {} {} {} {} {} {} {}".format( - start_items[0], start_items[1], start_items[2], start_items[3], start_items[4], - start_items[5], start_items[6], start_items[12], start_items[13], start_items[14])) - await self.chat_send("?GiveProtossTech {}".format(start_items[7])) - await self.chat_send("?SetColor rr " + str(self.ctx.player_color)) # TODO: Add faction color options - await self.chat_send("?LoadFinished") - self.last_received_update = len(self.ctx.items_received) - - else: - if not self.ctx.announcements.empty(): - message = self.ctx.announcements.get(timeout=1) - await self.chat_send("?SendMessage " + message) - self.ctx.announcements.task_done() - - # Archipelago reads the health - for unit in self.all_own_units(): - if unit.health_max == 38281: - game_state = int(38281 - unit.health) - self.can_read_game = True - - if iteration == 160 and not game_state & 1: - await self.chat_send("?SendMessage Warning: Archipelago unable to connect or has lost connection to " + - "Starcraft 2 (This is likely a map issue)") - - if self.last_received_update < len(self.ctx.items_received): - current_items = calculate_items(self.ctx) - await self.chat_send("?GiveTerranTech {} {} {} {} {} {} {} {} {} {}".format( - current_items[0], current_items[1], current_items[2], current_items[3], current_items[4], - current_items[5], current_items[6], current_items[12], current_items[13], current_items[14])) - await self.chat_send("?GiveProtossTech {}".format(current_items[7])) - self.last_received_update = len(self.ctx.items_received) - - if game_state & 1: - if not self.game_running: - print("Archipelago Connected") - self.game_running = True - - if self.can_read_game: - if game_state & (1 << 1) and not self.mission_completed: - if self.mission_id != self.ctx.final_mission: - print("Mission Completed") - await self.ctx.send_msgs( - [{"cmd": 'LocationChecks', - "locations": [SC2WOL_LOC_ID_OFFSET + victory_modulo * self.mission_id]}]) - self.mission_completed = True - else: - print("Game Complete") - await self.ctx.send_msgs([{"cmd": 'StatusUpdate', "status": ClientStatus.CLIENT_GOAL}]) - self.mission_completed = True - - for x, completed in enumerate(self.boni): - if not completed and game_state & (1 << (x + 2)): - await self.ctx.send_msgs( - [{"cmd": 'LocationChecks', - "locations": [SC2WOL_LOC_ID_OFFSET + victory_modulo * self.mission_id + x + 1]}]) - self.boni[x] = True - - else: - await self.chat_send("?SendMessage LostConnection - Lost connection to game.") - - -def request_unfinished_missions(ctx: SC2Context): - if ctx.mission_req_table: - message = "Unfinished Missions: " - unlocks = initialize_blank_mission_dict(ctx.mission_req_table) - unfinished_locations = initialize_blank_mission_dict(ctx.mission_req_table) - - _, unfinished_missions = calc_unfinished_missions(ctx, unlocks=unlocks) - - # Removing All-In from location pool - final_mission = lookup_id_to_mission[ctx.final_mission] - if final_mission in unfinished_missions.keys(): - message = f"Final Mission Available: {final_mission}[{ctx.final_mission}]\n" + message - if unfinished_missions[final_mission] == -1: - unfinished_missions.pop(final_mission) - - message += ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}[{ctx.mission_req_table[mission].id}] " + - mark_up_objectives( - f"[{len(unfinished_missions[mission])}/" - f"{sum(1 for _ in ctx.locations_for_mission(mission))}]", - ctx, unfinished_locations, mission) - for mission in unfinished_missions) - - if ctx.ui: - ctx.ui.log_panels['All'].on_message_markup(message) - ctx.ui.log_panels['Starcraft2'].on_message_markup(message) - else: - sc2_logger.info(message) - else: - sc2_logger.warning("No mission table found, you are likely not connected to a server.") - - -def calc_unfinished_missions(ctx: SC2Context, unlocks=None): - unfinished_missions = [] - locations_completed = [] - - if not unlocks: - unlocks = initialize_blank_mission_dict(ctx.mission_req_table) - - available_missions = calc_available_missions(ctx, unlocks) - - for name in available_missions: - objectives = set(ctx.locations_for_mission(name)) - if objectives: - objectives_completed = ctx.checked_locations & objectives - if len(objectives_completed) < len(objectives): - unfinished_missions.append(name) - locations_completed.append(objectives_completed) - - else: # infer that this is the final mission as it has no objectives - unfinished_missions.append(name) - locations_completed.append(-1) - - return available_missions, dict(zip(unfinished_missions, locations_completed)) - - -def is_mission_available(ctx: SC2Context, mission_id_to_check): - unfinished_missions = calc_available_missions(ctx) - - return any(mission_id_to_check == ctx.mission_req_table[mission].id for mission in unfinished_missions) - - -def mark_up_mission_name(ctx: SC2Context, mission, unlock_table): - """Checks if the mission is required for game completion and adds '*' to the name to mark that.""" - - if ctx.mission_req_table[mission].completion_critical: - if ctx.ui: - message = "[color=AF99EF]" + mission + "[/color]" - else: - message = "*" + mission + "*" - else: - message = mission - - if ctx.ui: - unlocks = unlock_table[mission] - - if len(unlocks) > 0: - pre_message = f"[ref={list(ctx.mission_req_table).index(mission)}|Unlocks: " - pre_message += ", ".join(f"{unlock}({ctx.mission_req_table[unlock].id})" for unlock in unlocks) - pre_message += f"]" - message = pre_message + message + "[/ref]" - - return message - - -def mark_up_objectives(message, ctx, unfinished_locations, mission): - formatted_message = message - - if ctx.ui: - locations = unfinished_locations[mission] - - pre_message = f"[ref={list(ctx.mission_req_table).index(mission) + 30}|" - pre_message += "
".join(location for location in locations) - pre_message += f"]" - formatted_message = pre_message + message + "[/ref]" - - return formatted_message - - -def request_available_missions(ctx: SC2Context): - if ctx.mission_req_table: - message = "Available Missions: " - - # Initialize mission unlock table - unlocks = initialize_blank_mission_dict(ctx.mission_req_table) - - missions = calc_available_missions(ctx, unlocks) - message += \ - ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}" - f"[{ctx.mission_req_table[mission].id}]" - for mission in missions) - - if ctx.ui: - ctx.ui.log_panels['All'].on_message_markup(message) - ctx.ui.log_panels['Starcraft2'].on_message_markup(message) - else: - sc2_logger.info(message) - else: - sc2_logger.warning("No mission table found, you are likely not connected to a server.") - - -def calc_available_missions(ctx: SC2Context, unlocks=None): - available_missions = [] - missions_complete = 0 - - # Get number of missions completed - for loc in ctx.checked_locations: - if loc % victory_modulo == 0: - missions_complete += 1 - - for name in ctx.mission_req_table: - # Go through the required missions for each mission and fill up unlock table used later for hover-over tooltips - if unlocks: - for unlock in ctx.mission_req_table[name].required_world: - unlocks[list(ctx.mission_req_table)[unlock - 1]].append(name) - - if mission_reqs_completed(ctx, name, missions_complete): - available_missions.append(name) - - return available_missions - - -def mission_reqs_completed(ctx: SC2Context, mission_name: str, missions_complete: int): - """Returns a bool signifying if the mission has all requirements complete and can be done - - Arguments: - ctx -- instance of SC2Context - locations_to_check -- the mission string name to check - missions_complete -- an int of how many missions have been completed - mission_path -- a list of missions that have already been checked -""" - if len(ctx.mission_req_table[mission_name].required_world) >= 1: - # A check for when the requirements are being or'd - or_success = False - - # Loop through required missions - for req_mission in ctx.mission_req_table[mission_name].required_world: - req_success = True - - # Check if required mission has been completed - if not (ctx.mission_req_table[list(ctx.mission_req_table)[req_mission - 1]].id * - victory_modulo + SC2WOL_LOC_ID_OFFSET) in ctx.checked_locations: - if not ctx.mission_req_table[mission_name].or_requirements: - return False - else: - req_success = False - - # Grid-specific logic (to avoid long path checks and infinite recursion) - if ctx.mission_order in (3, 4): - if req_success: - return True - else: - if req_mission is ctx.mission_req_table[mission_name].required_world[-1]: - return False - else: - continue - - # Recursively check required mission to see if it's requirements are met, in case !collect has been done - # Skipping recursive check on Grid settings to speed up checks and avoid infinite recursion - if not mission_reqs_completed(ctx, list(ctx.mission_req_table)[req_mission - 1], missions_complete): - if not ctx.mission_req_table[mission_name].or_requirements: - return False - else: - req_success = False - - # If requirement check succeeded mark or as satisfied - if ctx.mission_req_table[mission_name].or_requirements and req_success: - or_success = True - - if ctx.mission_req_table[mission_name].or_requirements: - # Return false if or requirements not met - if not or_success: - return False - - # Check number of missions - if missions_complete >= ctx.mission_req_table[mission_name].number: - return True - else: - return False - else: - return True - - -def initialize_blank_mission_dict(location_table): - unlocks = {} - - for mission in list(location_table): - unlocks[mission] = [] - - return unlocks - - -def check_game_install_path() -> bool: - # First thing: go to the default location for ExecuteInfo. - # An exception for Windows is included because it's very difficult to find ~\Documents if the user moved it. - if is_windows: - # The next five lines of utterly inscrutable code are brought to you by copy-paste from Stack Overflow. - # https://stackoverflow.com/questions/6227590/finding-the-users-my-documents-path/30924555# - import ctypes.wintypes - CSIDL_PERSONAL = 5 # My Documents - SHGFP_TYPE_CURRENT = 0 # Get current, not default value - - buf = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH) - ctypes.windll.shell32.SHGetFolderPathW(None, CSIDL_PERSONAL, None, SHGFP_TYPE_CURRENT, buf) - documentspath = buf.value - einfo = str(documentspath / Path("StarCraft II\\ExecuteInfo.txt")) - else: - einfo = str(bot.paths.get_home() / Path(bot.paths.USERPATH[bot.paths.PF])) - - # Check if the file exists. - if os.path.isfile(einfo): - - # Open the file and read it, picking out the latest executable's path. - with open(einfo) as f: - content = f.read() - if content: - try: - base = re.search(r" = (.*)Versions", content).group(1) - except AttributeError: - sc2_logger.warning(f"Found {einfo}, but it was empty. Run SC2 through the Blizzard launcher, then " - f"try again.") - return False - if os.path.exists(base): - executable = bot.paths.latest_executeble(Path(base).expanduser() / "Versions") - - # Finally, check the path for an actual executable. - # If we find one, great. Set up the SC2PATH. - if os.path.isfile(executable): - sc2_logger.info(f"Found an SC2 install at {base}!") - sc2_logger.debug(f"Latest executable at {executable}.") - os.environ["SC2PATH"] = base - sc2_logger.debug(f"SC2PATH set to {base}.") - return True - else: - sc2_logger.warning(f"We may have found an SC2 install at {base}, but couldn't find {executable}.") - else: - sc2_logger.warning(f"{einfo} pointed to {base}, but we could not find an SC2 install there.") - else: - sc2_logger.warning(f"Couldn't find {einfo}. Run SC2 through the Blizzard launcher, then try again. " - f"If that fails, please run /set_path with your SC2 install directory.") - return False - - -def is_mod_installed_correctly() -> bool: - """Searches for all required files.""" - if "SC2PATH" not in os.environ: - check_game_install_path() - - mapdir = os.environ['SC2PATH'] / Path('Maps/ArchipelagoCampaign') - mods = ["ArchipelagoCore", "ArchipelagoPlayer", "ArchipelagoPlayerWoL", "ArchipelagoTriggers"] - modfiles = [os.environ["SC2PATH"] / Path("Mods/" + mod + ".SC2Mod") for mod in mods] - wol_required_maps = ["WoL" + os.sep + map_name + ".SC2Map" for map_name in maps_table] - needs_files = False - - # Check for maps. - missing_maps = [] - for mapfile in wol_required_maps: - if not os.path.isfile(mapdir / mapfile): - missing_maps.append(mapfile) - if len(missing_maps) >= 19: - sc2_logger.warning(f"All map files missing from {mapdir}.") - needs_files = True - elif len(missing_maps) > 0: - for map in missing_maps: - sc2_logger.debug(f"Missing {map} from {mapdir}.") - sc2_logger.warning(f"Missing {len(missing_maps)} map files.") - needs_files = True - else: # Must be no maps missing - sc2_logger.info(f"All maps found in {mapdir}.") - - # Check for mods. - for modfile in modfiles: - if os.path.isfile(modfile) or os.path.isdir(modfile): - sc2_logger.info(f"Archipelago mod found at {modfile}.") - else: - sc2_logger.warning(f"Archipelago mod could not be found at {modfile}.") - needs_files = True - - # Final verdict. - if needs_files: - sc2_logger.warning(f"Required files are missing. Run /download_data to acquire them.") - return False - else: - sc2_logger.debug(f"All map/mod files are properly installed.") - return True - - -class DllDirectory: - # Credit to Black Sliver for this code. - # More info: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setdlldirectoryw - _old: typing.Optional[str] = None - _new: typing.Optional[str] = None - - def __init__(self, new: typing.Optional[str]): - self._new = new - - def __enter__(self): - old = self.get() - if self.set(self._new): - self._old = old - - def __exit__(self, *args): - if self._old is not None: - self.set(self._old) - - @staticmethod - def get() -> typing.Optional[str]: - if sys.platform == "win32": - n = ctypes.windll.kernel32.GetDllDirectoryW(0, None) - buf = ctypes.create_unicode_buffer(n) - ctypes.windll.kernel32.GetDllDirectoryW(n, buf) - return buf.value - # NOTE: other OS may support os.environ["LD_LIBRARY_PATH"], but this fix is windows-specific - return None - - @staticmethod - def set(s: typing.Optional[str]) -> bool: - if sys.platform == "win32": - return ctypes.windll.kernel32.SetDllDirectoryW(s) != 0 - # NOTE: other OS may support os.environ["LD_LIBRARY_PATH"], but this fix is windows-specific - return False - - -def download_latest_release_zip(owner: str, repo: str, api_version: str, metadata: str = None, force_download=False) -> (str, str): - """Downloads the latest release of a GitHub repo to the current directory as a .zip file.""" - import requests - - headers = {"Accept": 'application/vnd.github.v3+json'} - url = f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{api_version}" - - r1 = requests.get(url, headers=headers) - if r1.status_code == 200: - latest_metadata = r1.json() - cleanup_downloaded_metadata(latest_metadata) - latest_metadata = str(latest_metadata) - # sc2_logger.info(f"Latest version: {latest_metadata}.") - else: - sc2_logger.warning(f"Status code: {r1.status_code}") - sc2_logger.warning(f"Failed to reach GitHub. Could not find download link.") - sc2_logger.warning(f"text: {r1.text}") - return "", metadata - - if (force_download is False) and (metadata == latest_metadata): - sc2_logger.info("Latest version already installed.") - return "", metadata - - sc2_logger.info(f"Attempting to download latest version of API version {api_version} of {repo}.") - download_url = r1.json()["assets"][0]["browser_download_url"] - - r2 = requests.get(download_url, headers=headers) - if r2.status_code == 200 and zipfile.is_zipfile(io.BytesIO(r2.content)): - tempdir = tempfile.gettempdir() - file = tempdir + os.sep + f"{repo}.zip" - with open(file, "wb") as fh: - fh.write(r2.content) - sc2_logger.info(f"Successfully downloaded {repo}.zip.") - return file, latest_metadata - else: - sc2_logger.warning(f"Status code: {r2.status_code}") - sc2_logger.warning("Download failed.") - sc2_logger.warning(f"text: {r2.text}") - return "", metadata - - -def cleanup_downloaded_metadata(medatada_json): - for asset in medatada_json['assets']: - del asset['download_count'] - - -def is_mod_update_available(owner: str, repo: str, api_version: str, metadata: str) -> bool: - import requests - - headers = {"Accept": 'application/vnd.github.v3+json'} - url = f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{api_version}" - - r1 = requests.get(url, headers=headers) - if r1.status_code == 200: - latest_metadata = r1.json() - cleanup_downloaded_metadata(latest_metadata) - latest_metadata = str(latest_metadata) - if metadata != latest_metadata: - return True - else: - return False - - else: - sc2_logger.warning(f"Failed to reach GitHub while checking for updates.") - sc2_logger.warning(f"Status code: {r1.status_code}") - sc2_logger.warning(f"text: {r1.text}") - return False - - -def launch(): - colorama.init() - asyncio.run(main()) - colorama.deinit() diff --git a/worlds/sc2wol/Items.py b/worlds/sc2wol/Items.py deleted file mode 100644 index 971a75375fe4..000000000000 --- a/worlds/sc2wol/Items.py +++ /dev/null @@ -1,421 +0,0 @@ -from BaseClasses import Item, ItemClassification, MultiWorld -import typing - -from .Options import get_option_value -from .MissionTables import vanilla_mission_req_table - - -class ItemData(typing.NamedTuple): - code: typing.Optional[int] - type: typing.Optional[str] - number: typing.Optional[int] - classification: ItemClassification = ItemClassification.useful - quantity: int = 1 - parent_item: str = None - origin: typing.Set[str] = {"wol"} - - -class StarcraftWoLItem(Item): - game: str = "Starcraft 2 Wings of Liberty" - - -def get_full_item_list(): - return item_table - - -SC2WOL_ITEM_ID_OFFSET = 1000 - -item_table = { - "Marine": ItemData(0 + SC2WOL_ITEM_ID_OFFSET, "Unit", 0, classification=ItemClassification.progression), - "Medic": ItemData(1 + SC2WOL_ITEM_ID_OFFSET, "Unit", 1, classification=ItemClassification.progression), - "Firebat": ItemData(2 + SC2WOL_ITEM_ID_OFFSET, "Unit", 2, classification=ItemClassification.progression), - "Marauder": ItemData(3 + SC2WOL_ITEM_ID_OFFSET, "Unit", 3, classification=ItemClassification.progression), - "Reaper": ItemData(4 + SC2WOL_ITEM_ID_OFFSET, "Unit", 4, classification=ItemClassification.progression), - "Hellion": ItemData(5 + SC2WOL_ITEM_ID_OFFSET, "Unit", 5, classification=ItemClassification.progression), - "Vulture": ItemData(6 + SC2WOL_ITEM_ID_OFFSET, "Unit", 6, classification=ItemClassification.progression), - "Goliath": ItemData(7 + SC2WOL_ITEM_ID_OFFSET, "Unit", 7, classification=ItemClassification.progression), - "Diamondback": ItemData(8 + SC2WOL_ITEM_ID_OFFSET, "Unit", 8, classification=ItemClassification.progression), - "Siege Tank": ItemData(9 + SC2WOL_ITEM_ID_OFFSET, "Unit", 9, classification=ItemClassification.progression), - "Medivac": ItemData(10 + SC2WOL_ITEM_ID_OFFSET, "Unit", 10, classification=ItemClassification.progression), - "Wraith": ItemData(11 + SC2WOL_ITEM_ID_OFFSET, "Unit", 11, classification=ItemClassification.progression), - "Viking": ItemData(12 + SC2WOL_ITEM_ID_OFFSET, "Unit", 12, classification=ItemClassification.progression), - "Banshee": ItemData(13 + SC2WOL_ITEM_ID_OFFSET, "Unit", 13, classification=ItemClassification.progression), - "Battlecruiser": ItemData(14 + SC2WOL_ITEM_ID_OFFSET, "Unit", 14, classification=ItemClassification.progression), - "Ghost": ItemData(15 + SC2WOL_ITEM_ID_OFFSET, "Unit", 15, classification=ItemClassification.progression), - "Spectre": ItemData(16 + SC2WOL_ITEM_ID_OFFSET, "Unit", 16, classification=ItemClassification.progression), - "Thor": ItemData(17 + SC2WOL_ITEM_ID_OFFSET, "Unit", 17, classification=ItemClassification.progression), - # EE units - "Liberator": ItemData(18 + SC2WOL_ITEM_ID_OFFSET, "Unit", 18, classification=ItemClassification.progression, origin={"nco", "ext"}), - "Valkyrie": ItemData(19 + SC2WOL_ITEM_ID_OFFSET, "Unit", 19, classification=ItemClassification.progression, origin={"bw"}), - "Widow Mine": ItemData(20 + SC2WOL_ITEM_ID_OFFSET, "Unit", 20, classification=ItemClassification.progression, origin={"ext"}), - "Cyclone": ItemData(21 + SC2WOL_ITEM_ID_OFFSET, "Unit", 21, classification=ItemClassification.progression, origin={"ext"}), - - # Some other items are moved to Upgrade group because of the way how the bot message is parsed - "Progressive Infantry Weapon": ItemData(100 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 0, quantity=3), - "Progressive Infantry Armor": ItemData(102 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 2, quantity=3), - "Progressive Vehicle Weapon": ItemData(103 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 4, quantity=3), - "Progressive Vehicle Armor": ItemData(104 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 6, quantity=3), - "Progressive Ship Weapon": ItemData(105 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 8, quantity=3), - "Progressive Ship Armor": ItemData(106 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 10, quantity=3), - # Upgrade bundle 'number' values are used as indices to get affected 'number's - "Progressive Weapon Upgrade": ItemData(107 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 0, quantity=3), - "Progressive Armor Upgrade": ItemData(108 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 1, quantity=3), - "Progressive Infantry Upgrade": ItemData(109 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 2, quantity=3), - "Progressive Vehicle Upgrade": ItemData(110 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 3, quantity=3), - "Progressive Ship Upgrade": ItemData(111 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 4, quantity=3), - "Progressive Weapon/Armor Upgrade": ItemData(112 + SC2WOL_ITEM_ID_OFFSET, "Upgrade", 5, quantity=3), - - "Projectile Accelerator (Bunker)": ItemData(200 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 0, parent_item="Bunker"), - "Neosteel Bunker (Bunker)": ItemData(201 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 1, parent_item="Bunker"), - "Titanium Housing (Missile Turret)": ItemData(202 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 2, classification=ItemClassification.filler, parent_item="Missile Turret"), - "Hellstorm Batteries (Missile Turret)": ItemData(203 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 3, parent_item="Missile Turret"), - "Advanced Construction (SCV)": ItemData(204 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 4), - "Dual-Fusion Welders (SCV)": ItemData(205 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 5), - "Fire-Suppression System (Building)": ItemData(206 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 6), - "Orbital Command (Building)": ItemData(207 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 7), - "Progressive Stimpack (Marine)": ItemData(208 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 0, parent_item="Marine", quantity=2), - "Combat Shield (Marine)": ItemData(209 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 9, classification=ItemClassification.progression, parent_item="Marine"), - "Advanced Medic Facilities (Medic)": ItemData(210 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 10, classification=ItemClassification.filler, parent_item="Medic"), - "Stabilizer Medpacks (Medic)": ItemData(211 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 11, classification=ItemClassification.progression, parent_item="Medic"), - "Incinerator Gauntlets (Firebat)": ItemData(212 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 12, classification=ItemClassification.filler, parent_item="Firebat"), - "Juggernaut Plating (Firebat)": ItemData(213 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 13, parent_item="Firebat"), - "Concussive Shells (Marauder)": ItemData(214 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 14, parent_item="Marauder"), - "Kinetic Foam (Marauder)": ItemData(215 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 15, parent_item="Marauder"), - "U-238 Rounds (Reaper)": ItemData(216 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 16, parent_item="Reaper"), - "G-4 Clusterbomb (Reaper)": ItemData(217 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 17, classification=ItemClassification.progression, parent_item="Reaper"), - # Items from EE - "Mag-Field Accelerators (Cyclone)": ItemData(218 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 18, parent_item="Cyclone", origin={"ext"}), - "Mag-Field Launchers (Cyclone)": ItemData(219 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 19, parent_item="Cyclone", origin={"ext"}), - # Items from new mod - "Laser Targeting System (Marine)": ItemData(220 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 8, classification=ItemClassification.filler, parent_item="Marine", origin={"nco"}), # Freed slot from Stimpack - "Magrail Munitions (Marine)": ItemData(221 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 20, parent_item="Marine", origin={"nco"}), - "Optimized Logistics (Marine)": ItemData(222 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 21, classification=ItemClassification.filler, parent_item="Marine", origin={"nco"}), - "Restoration (Medic)": ItemData(223 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 22, classification=ItemClassification.filler, parent_item="Medic", origin={"bw"}), - "Optical Flare (Medic)": ItemData(224 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 23, classification=ItemClassification.filler, parent_item="Medic", origin={"bw"}), - "Optimized Logistics (Medic)": ItemData(225 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 24, classification=ItemClassification.filler, parent_item="Medic", origin={"bw"}), - "Progressive Stimpack (Firebat)": ItemData(226 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 6, parent_item="Firebat", quantity=2, origin={"bw"}), - "Optimized Logistics (Firebat)": ItemData(227 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 25, parent_item="Firebat", origin={"bw"}), - "Progressive Stimpack (Marauder)": ItemData(228 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 8, parent_item="Marauder", quantity=2, origin={"nco"}), - "Laser Targeting System (Marauder)": ItemData(229 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 26, classification=ItemClassification.filler, parent_item="Marauder", origin={"nco"}), - "Magrail Munitions (Marauder)": ItemData(230 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 27, classification=ItemClassification.filler, parent_item="Marauder", origin={"nco"}), - "Internal Tech Module (Marauder)": ItemData(231 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 28, classification=ItemClassification.filler, parent_item="Marauder", origin={"nco"}), - - # Items from new mod - "Progressive Stimpack (Reaper)": ItemData(250 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 10, parent_item="Reaper", quantity=2, origin={"nco"}), - "Laser Targeting System (Reaper)": ItemData(251 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 0, classification=ItemClassification.filler, parent_item="Reaper", origin={"nco"}), - "Advanced Cloaking Field (Reaper)": ItemData(252 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 1, parent_item="Reaper", origin={"nco"}), - "Spider Mines (Reaper)": ItemData(253 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 2, classification=ItemClassification.filler, parent_item="Reaper", origin={"nco"}), - "Combat Drugs (Reaper)": ItemData(254 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 3, classification=ItemClassification.filler, parent_item="Reaper", origin={"ext"}), - "Hellbat Aspect (Hellion)": ItemData(255 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 4, parent_item="Hellion", origin={"nco"}), - "Smart Servos (Hellion)": ItemData(256 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 5, parent_item="Hellion", origin={"nco"}), - "Optimized Logistics (Hellion)": ItemData(257 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 6, classification=ItemClassification.filler, parent_item="Hellion", origin={"nco"}), - "Jump Jets (Hellion)": ItemData(258 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 7, classification=ItemClassification.filler, parent_item="Hellion", origin={"nco"}), - "Progressive Stimpack (Hellion)": ItemData(259 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 12, parent_item="Hellion", quantity=2, origin={"nco"}), - "Ion Thrusters (Vulture)": ItemData(260 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 8, classification=ItemClassification.filler, parent_item="Vulture", origin={"bw"}), - "Auto Launchers (Vulture)": ItemData(261 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 9, parent_item="Vulture", origin={"bw"}), - "High Explosive Munition (Spider Mine)": ItemData(262 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 10, origin={"bw"}), - "Jump Jets (Goliath)": ItemData(263 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 11, classification=ItemClassification.filler, parent_item="Goliath", origin={"nco"}), - "Optimized Logistics (Goliath)": ItemData(264 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 12, classification=ItemClassification.filler, parent_item="Goliath", origin={"nco"}), - "Hyperfluxor (Diamondback)": ItemData(265 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 13, parent_item="Diamondback", origin={"ext"}), - "Burst Capacitors (Diamondback)": ItemData(266 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 14, classification=ItemClassification.filler, parent_item="Diamondback", origin={"ext"}), - "Optimized Logistics (Diamondback)": ItemData(267 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 15, parent_item="Diamondback", origin={"ext"}), - "Jump Jets (Siege Tank)": ItemData(268 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 16, parent_item="Siege Tank", origin={"nco"}), - "Spider Mines (Siege Tank)": ItemData(269 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 17, classification=ItemClassification.filler, parent_item="Siege Tank", origin={"nco"}), - "Smart Servos (Siege Tank)": ItemData(270 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 18, classification=ItemClassification.filler, parent_item="Siege Tank", origin={"nco"}), - "Graduating Range (Siege Tank)": ItemData(271 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 19, classification=ItemClassification.progression, parent_item="Siege Tank", origin={"ext"}), - "Laser Targeting System (Siege Tank)": ItemData(272 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 20, parent_item="Siege Tank", origin={"nco"}), - "Advanced Siege Tech (Siege Tank)": ItemData(273 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 21, parent_item="Siege Tank", origin={"ext"}), - "Internal Tech Module (Siege Tank)": ItemData(274 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 22, classification=ItemClassification.filler, parent_item="Siege Tank", origin={"nco"}), - "Optimized Logistics (Predator)": ItemData(275 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 23, classification=ItemClassification.filler, parent_item="Predator", origin={"ext"}), - "Expanded Hull (Medivac)": ItemData(276 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 24, classification=ItemClassification.filler, parent_item="Medivac", origin={"ext"}), - "Afterburners (Medivac)": ItemData(277 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 25, classification=ItemClassification.filler, parent_item="Medivac", origin={"ext"}), - "Advanced Laser Technology (Wraith)": ItemData(278 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 26, classification=ItemClassification.progression, parent_item="Wraith", origin={"ext"}), - "Smart Servos (Viking)": ItemData(279 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 27, parent_item="Viking", origin={"ext"}), - "Magrail Munitions (Viking)": ItemData(280 + SC2WOL_ITEM_ID_OFFSET, "Armory 3", 28, parent_item="Viking", origin={"ext"}), - - "Twin-Linked Flamethrower (Hellion)": ItemData(300 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 0, classification=ItemClassification.filler, parent_item="Hellion"), - "Thermite Filaments (Hellion)": ItemData(301 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 1, parent_item="Hellion"), - "Cerberus Mine (Spider Mine)": ItemData(302 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 2, classification=ItemClassification.filler), - "Replenishable Magazine (Vulture)": ItemData(303 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 3, classification=ItemClassification.filler, parent_item="Vulture"), - "Multi-Lock Weapons System (Goliath)": ItemData(304 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 4, parent_item="Goliath"), - "Ares-Class Targeting System (Goliath)": ItemData(305 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 5, parent_item="Goliath"), - "Tri-Lithium Power Cell (Diamondback)": ItemData(306 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 6, classification=ItemClassification.filler, parent_item="Diamondback"), - "Shaped Hull (Diamondback)": ItemData(307 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 7, classification=ItemClassification.filler, parent_item="Diamondback"), - "Maelstrom Rounds (Siege Tank)": ItemData(308 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 8, classification=ItemClassification.progression, parent_item="Siege Tank"), - "Shaped Blast (Siege Tank)": ItemData(309 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 9, parent_item="Siege Tank"), - "Rapid Deployment Tube (Medivac)": ItemData(310 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 10, classification=ItemClassification.filler, parent_item="Medivac"), - "Advanced Healing AI (Medivac)": ItemData(311 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 11, classification=ItemClassification.filler, parent_item="Medivac"), - "Tomahawk Power Cells (Wraith)": ItemData(312 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 12, classification=ItemClassification.filler, parent_item="Wraith"), - "Displacement Field (Wraith)": ItemData(313 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 13, classification=ItemClassification.filler, parent_item="Wraith"), - "Ripwave Missiles (Viking)": ItemData(314 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 14, parent_item="Viking"), - "Phobos-Class Weapons System (Viking)": ItemData(315 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 15, parent_item="Viking"), - "Progressive Cross-Spectrum Dampeners (Banshee)": ItemData(316 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 2, classification=ItemClassification.filler, parent_item="Banshee", quantity=2), - "Shockwave Missile Battery (Banshee)": ItemData(317 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 17, parent_item="Banshee"), - "Missile Pods (Battlecruiser)": ItemData(318 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 18, classification=ItemClassification.filler, parent_item="Battlecruiser"), - "Defensive Matrix (Battlecruiser)": ItemData(319 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 19, classification=ItemClassification.filler, parent_item="Battlecruiser"), - "Ocular Implants (Ghost)": ItemData(320 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 20, parent_item="Ghost"), - "Crius Suit (Ghost)": ItemData(321 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 21, parent_item="Ghost"), - "Psionic Lash (Spectre)": ItemData(322 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 22, classification=ItemClassification.progression, parent_item="Spectre"), - "Nyx-Class Cloaking Module (Spectre)": ItemData(323 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 23, parent_item="Spectre"), - "330mm Barrage Cannon (Thor)": ItemData(324 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 24, classification=ItemClassification.filler, parent_item="Thor"), - "Immortality Protocol (Thor)": ItemData(325 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 25, classification=ItemClassification.filler, parent_item="Thor"), - # Items from EE - "Advanced Ballistics (Liberator)": ItemData(326 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 26, parent_item="Liberator", origin={"ext"}), - "Raid Artillery (Liberator)": ItemData(327 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 27, classification=ItemClassification.progression, parent_item="Liberator", origin={"nco"}), - "Drilling Claws (Widow Mine)": ItemData(328 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 28, classification=ItemClassification.filler, parent_item="Widow Mine", origin={"ext"}), - "Concealment (Widow Mine)": ItemData(329 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 29, classification=ItemClassification.progression, parent_item="Widow Mine", origin={"ext"}), - - #Items from new mod - "Hyperflight Rotors (Banshee)": ItemData(350 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 0, classification=ItemClassification.filler, parent_item="Banshee", origin={"ext"}), - "Laser Targeting System (Banshee)": ItemData(351 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 1, classification=ItemClassification.filler, parent_item="Banshee", origin={"nco"}), - "Internal Tech Module (Banshee)": ItemData(352 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 2, classification=ItemClassification.filler, parent_item="Banshee", origin={"nco"}), - "Tactical Jump (Battlecruiser)": ItemData(353 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 3, parent_item="Battlecruiser", origin={"nco", "ext"}), - "Cloak (Battlecruiser)": ItemData(354 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 4, parent_item="Battlecruiser", origin={"nco"}), - "ATX Laser Battery (Battlecruiser)": ItemData(355 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 5, classification=ItemClassification.progression, parent_item="Battlecruiser", origin={"nco"}), - "Optimized Logistics (Battlecruiser)": ItemData(356 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 6, classification=ItemClassification.filler, parent_item="Battlecruiser", origin={"ext"}), - "Internal Tech Module (Battlecruiser)": ItemData(357 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 7, classification=ItemClassification.filler, parent_item="Battlecruiser", origin={"nco"}), - "EMP Rounds (Ghost)": ItemData(358 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 8, parent_item="Ghost", origin={"ext"}), - "Lockdown (Ghost)": ItemData(359 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 9, parent_item="Ghost", origin={"bw"}), - "Impaler Rounds (Spectre)": ItemData(360 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 10, parent_item="Spectre", origin={"ext"}), - "Progressive High Impact Payload (Thor)": ItemData(361 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 14, parent_item="Thor", quantity=2, origin={"ext"}), # L2 is Smart Servos - "Bio Mechanical Repair Drone (Raven)": ItemData(363 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 13, parent_item="Raven", origin={"nco"}), - "Spider Mines (Raven)": ItemData(364 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 14, parent_item="Raven", origin={"nco"}), - "Railgun Turret (Raven)": ItemData(365 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 15, parent_item="Raven", origin={"nco"}), - "Hunter-Seeker Weapon (Raven)": ItemData(366 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 16, parent_item="Raven", origin={"nco"}), - "Interference Matrix (Raven)": ItemData(367 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 17, parent_item="Raven", origin={"ext"}), - "Anti-Armor Missile (Raven)": ItemData(368 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 18, classification=ItemClassification.filler, parent_item="Raven", origin={"ext"}), - "Internal Tech Module (Raven)": ItemData(369 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 19, classification=ItemClassification.filler, parent_item="Raven", origin={"nco"}), - "EMP Shockwave (Science Vessel)": ItemData(370 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 20, parent_item="Science Vessel", origin={"bw"}), - "Defensive Matrix (Science Vessel)": ItemData(371 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 21, parent_item="Science Vessel", origin={"bw"}), - "Targeting Optics (Cyclone)": ItemData(372 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 22, parent_item="Cyclone", origin={"ext"}), - "Rapid Fire Launchers (Cyclone)": ItemData(373 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 23, parent_item="Cyclone", origin={"ext"}), - "Cloak (Liberator)": ItemData(374 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 24, classification=ItemClassification.filler, parent_item="Liberator", origin={"nco"}), - "Laser Targeting System (Liberator)": ItemData(375 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 25, classification=ItemClassification.filler, parent_item="Liberator", origin={"ext"}), - "Optimized Logistics (Liberator)": ItemData(376 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 26, classification=ItemClassification.filler, parent_item="Liberator", origin={"nco"}), - "Black Market Launchers (Widow Mine)": ItemData(377 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 27, classification=ItemClassification.filler, parent_item="Widow Mine", origin={"ext"}), - "Executioner Missiles (Widow Mine)": ItemData(378 + SC2WOL_ITEM_ID_OFFSET, "Armory 4", 28, parent_item="Widow Mine", origin={"ext"}), - - # Just lazy to create a new group for one unit - "Enhanced Cluster Launchers (Valkyrie)": ItemData(379 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 17, parent_item="Valkyrie", origin={"ext"}), - "Shaped Hull (Valkyrie)": ItemData(380 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 20, classification=ItemClassification.filler, parent_item="Valkyrie", origin={"ext"}), - "Burst Lasers (Valkyrie)": ItemData(381 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 21, parent_item="Valkyrie", origin={"ext"}), - "Afterburners (Valkyrie)": ItemData(382 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 22, classification=ItemClassification.filler, parent_item="Valkyrie", origin={"ext"}), - - "Bunker": ItemData(400 + SC2WOL_ITEM_ID_OFFSET, "Building", 0, classification=ItemClassification.progression), - "Missile Turret": ItemData(401 + SC2WOL_ITEM_ID_OFFSET, "Building", 1, classification=ItemClassification.progression), - "Sensor Tower": ItemData(402 + SC2WOL_ITEM_ID_OFFSET, "Building", 2), - - "War Pigs": ItemData(500 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 0, classification=ItemClassification.progression), - "Devil Dogs": ItemData(501 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 1, classification=ItemClassification.filler), - "Hammer Securities": ItemData(502 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 2), - "Spartan Company": ItemData(503 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 3, classification=ItemClassification.progression), - "Siege Breakers": ItemData(504 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 4), - "Hel's Angel": ItemData(505 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 5, classification=ItemClassification.progression), - "Dusk Wings": ItemData(506 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 6), - "Jackson's Revenge": ItemData(507 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 7), - - "Ultra-Capacitors": ItemData(600 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 0), - "Vanadium Plating": ItemData(601 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 1), - "Orbital Depots": ItemData(602 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 2), - "Micro-Filtering": ItemData(603 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 3), - "Automated Refinery": ItemData(604 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 4), - "Command Center Reactor": ItemData(605 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 5), - "Raven": ItemData(606 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 6), - "Science Vessel": ItemData(607 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 7, classification=ItemClassification.progression), - "Tech Reactor": ItemData(608 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 8), - "Orbital Strike": ItemData(609 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 9), - "Shrike Turret (Bunker)": ItemData(610 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 10, parent_item="Bunker"), - "Fortified Bunker (Bunker)": ItemData(611 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 11, parent_item="Bunker"), - "Planetary Fortress": ItemData(612 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 12, classification=ItemClassification.progression), - "Perdition Turret": ItemData(613 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 13, classification=ItemClassification.progression), - "Predator": ItemData(614 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 14, classification=ItemClassification.filler), - "Hercules": ItemData(615 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 15, classification=ItemClassification.progression), - "Cellular Reactor": ItemData(616 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 16), - "Progressive Regenerative Bio-Steel": ItemData(617 + SC2WOL_ITEM_ID_OFFSET, "Progressive Upgrade", 4, quantity=2), - "Hive Mind Emulator": ItemData(618 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 18, ItemClassification.progression), - "Psi Disrupter": ItemData(619 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 19, classification=ItemClassification.progression), - - "Zealot": ItemData(700 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 0, classification=ItemClassification.progression), - "Stalker": ItemData(701 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 1, classification=ItemClassification.progression), - "High Templar": ItemData(702 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 2, classification=ItemClassification.progression), - "Dark Templar": ItemData(703 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 3, classification=ItemClassification.progression), - "Immortal": ItemData(704 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 4, classification=ItemClassification.progression), - "Colossus": ItemData(705 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 5), - "Phoenix": ItemData(706 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 6, classification=ItemClassification.filler), - "Void Ray": ItemData(707 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 7, classification=ItemClassification.progression), - "Carrier": ItemData(708 + SC2WOL_ITEM_ID_OFFSET, "Protoss", 8, classification=ItemClassification.progression), - - # Filler items to fill remaining spots - "+15 Starting Minerals": ItemData(800 + SC2WOL_ITEM_ID_OFFSET, "Minerals", 15, quantity=0, classification=ItemClassification.filler), - "+15 Starting Vespene": ItemData(801 + SC2WOL_ITEM_ID_OFFSET, "Vespene", 15, quantity=0, classification=ItemClassification.filler), - # This Filler item isn't placed by the generator yet unless plando'd - "+2 Starting Supply": ItemData(802 + SC2WOL_ITEM_ID_OFFSET, "Supply", 2, quantity=0, classification=ItemClassification.filler), - # This item is used to "remove" location from the game. Never placed unless plando'd - "Nothing": ItemData(803 + SC2WOL_ITEM_ID_OFFSET, "Nothing Group", 2, quantity=0, classification=ItemClassification.trap), - - # "Keystone Piece": ItemData(850 + SC2WOL_ITEM_ID_OFFSET, "Goal", 0, quantity=0, classification=ItemClassification.progression_skip_balancing) -} - -def get_item_table(multiworld: MultiWorld, player: int): - return item_table - -basic_units = { - 'Marine', - 'Marauder', - 'Goliath', - 'Hellion', - 'Vulture' -} - -advanced_basic_units = basic_units.union({ - 'Reaper', - 'Diamondback', - 'Viking' -}) - - -def get_basic_units(multiworld: MultiWorld, player: int) -> typing.Set[str]: - if get_option_value(multiworld, player, 'required_tactics') > 0: - return advanced_basic_units - else: - return basic_units - - -item_name_groups = {} -for item, data in get_full_item_list().items(): - item_name_groups.setdefault(data.type, []).append(item) - if data.type in ("Armory 1", "Armory 2") and '(' in item: - short_name = item[:item.find(' (')] - item_name_groups[short_name] = [item] -item_name_groups["Missions"] = ["Beat " + mission_name for mission_name in vanilla_mission_req_table] - - -# Items that can be placed before resources if not already in -# General upgrades and Mercs -second_pass_placeable_items: typing.Tuple[str, ...] = ( - # Buildings without upgrades - "Sensor Tower", - "Hive Mind Emulator", - "Psi Disrupter", - "Perdition Turret", - # General upgrades without any dependencies - "Advanced Construction (SCV)", - "Dual-Fusion Welders (SCV)", - "Fire-Suppression System (Building)", - "Orbital Command (Building)", - "Ultra-Capacitors", - "Vanadium Plating", - "Orbital Depots", - "Micro-Filtering", - "Automated Refinery", - "Command Center Reactor", - "Tech Reactor", - "Planetary Fortress", - "Cellular Reactor", - "Progressive Regenerative Bio-Steel", # Place only L1 - # Mercenaries - "War Pigs", - "Devil Dogs", - "Hammer Securities", - "Spartan Company", - "Siege Breakers", - "Hel's Angel", - "Dusk Wings", - "Jackson's Revenge" -) - - -filler_items: typing.Tuple[str, ...] = ( - '+15 Starting Minerals', - '+15 Starting Vespene' -) - -# Defense rating table -# Commented defense ratings are handled in LogicMixin -defense_ratings = { - "Siege Tank": 5, - # "Maelstrom Rounds": 2, - "Planetary Fortress": 3, - # Bunker w/ Marine/Marauder: 3, - "Perdition Turret": 2, - "Missile Turret": 2, - "Vulture": 2, - "Liberator": 2, - "Widow Mine": 2 - # "Concealment (Widow Mine)": 1 -} -zerg_defense_ratings = { - "Perdition Turret": 2, - # Bunker w/ Firebat: 2, - "Hive Mind Emulator": 3, - "Psi Disruptor": 3 -} - -spider_mine_sources = { - "Vulture", - "Spider Mines (Reaper)", - "Spider Mines (Siege Tank)", - "Spider Mines (Raven)" -} - -progressive_if_nco = { - "Progressive Stimpack (Marine)", - "Progressive Stimpack (Firebat)", - "Progressive Cross-Spectrum Dampeners (Banshee)", - "Progressive Regenerative Bio-Steel" -} - -# 'number' values of upgrades for upgrade bundle items -upgrade_numbers = [ - {0, 4, 8}, # Weapon - {2, 6, 10}, # Armor - {0, 2}, # Infantry - {4, 6}, # Vehicle - {8, 10}, # Starship - {0, 2, 4, 6, 8, 10} # All -] -# Names of upgrades to be included for different options -upgrade_included_names = [ - { # Individual Items - "Progressive Infantry Weapon", - "Progressive Infantry Armor", - "Progressive Vehicle Weapon", - "Progressive Vehicle Armor", - "Progressive Ship Weapon", - "Progressive Ship Armor" - }, - { # Bundle Weapon And Armor - "Progressive Weapon Upgrade", - "Progressive Armor Upgrade" - }, - { # Bundle Unit Class - "Progressive Infantry Upgrade", - "Progressive Vehicle Upgrade", - "Progressive Starship Upgrade" - }, - { # Bundle All - "Progressive Weapon/Armor Upgrade" - } -] - -lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in get_full_item_list().items() if - data.code} -# Map type to expected int -type_flaggroups: typing.Dict[str, int] = { - "Unit": 0, - "Upgrade": 1, # Weapon / Armor upgrades - "Armory 1": 2, # Unit upgrades - "Armory 2": 3, # Unit upgrades - "Building": 4, - "Mercenary": 5, - "Laboratory": 6, - "Protoss": 7, - "Minerals": 8, - "Vespene": 9, - "Supply": 10, - "Goal": 11, - "Armory 3": 12, # Unit upgrades - "Armory 4": 13, # Unit upgrades - "Progressive Upgrade": 14, # Unit upgrades that exist multiple times (Stimpack / Super Stimpack) - "Nothing Group": 15 -} diff --git a/worlds/sc2wol/Locations.py b/worlds/sc2wol/Locations.py deleted file mode 100644 index fba7051337df..000000000000 --- a/worlds/sc2wol/Locations.py +++ /dev/null @@ -1,516 +0,0 @@ -from enum import IntEnum -from typing import List, Tuple, Optional, Callable, NamedTuple -from BaseClasses import MultiWorld -from .Options import get_option_value - -from BaseClasses import Location - -SC2WOL_LOC_ID_OFFSET = 1000 - - -class SC2WoLLocation(Location): - game: str = "Starcraft2WoL" - - -class LocationType(IntEnum): - VICTORY = 0 # Winning a mission - MISSION_PROGRESS = 1 # All tasks done for progressing the mission normally towards victory. All cleaning of expansion bases falls here - BONUS = 2 # Bonus objective, getting a campaign or mission bonus in vanilla (credits, research, bonus units or resources) - CHALLENGE = 3 # Challenging objectives, often harder than just completing a mission - OPTIONAL_BOSS = 4 # Any boss that's not required to win the mission. All Brutalisks, Loki, etc. - -class LocationData(NamedTuple): - region: str - name: str - code: Optional[int] - type: LocationType - rule: Callable = lambda state: True - - -def get_locations(multiworld: Optional[MultiWorld], player: Optional[int]) -> Tuple[LocationData, ...]: - # Note: rules which are ended with or True are rules identified as needed later when restricted units is an option - logic_level = get_option_value(multiworld, player, 'required_tactics') - location_table: List[LocationData] = [ - LocationData("Liberation Day", "Liberation Day: Victory", SC2WOL_LOC_ID_OFFSET + 100, LocationType.VICTORY), - LocationData("Liberation Day", "Liberation Day: First Statue", SC2WOL_LOC_ID_OFFSET + 101, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Second Statue", SC2WOL_LOC_ID_OFFSET + 102, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Third Statue", SC2WOL_LOC_ID_OFFSET + 103, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Fourth Statue", SC2WOL_LOC_ID_OFFSET + 104, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Fifth Statue", SC2WOL_LOC_ID_OFFSET + 105, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Sixth Statue", SC2WOL_LOC_ID_OFFSET + 106, LocationType.BONUS), - LocationData("Liberation Day", "Liberation Day: Special Delivery", SC2WOL_LOC_ID_OFFSET + 107, LocationType.MISSION_PROGRESS), - LocationData("The Outlaws", "The Outlaws: Victory", SC2WOL_LOC_ID_OFFSET + 200, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("The Outlaws", "The Outlaws: Rebel Base", SC2WOL_LOC_ID_OFFSET + 201, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("The Outlaws", "The Outlaws: North Resource Pickups", SC2WOL_LOC_ID_OFFSET + 202, LocationType.BONUS), - LocationData("The Outlaws", "The Outlaws: Bunker", SC2WOL_LOC_ID_OFFSET + 203, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Zero Hour", "Zero Hour: Victory", SC2WOL_LOC_ID_OFFSET + 300, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 2 and - (logic_level > 0 or state._sc2wol_has_anti_air(multiworld, player))), - LocationData("Zero Hour", "Zero Hour: First Group Rescued", SC2WOL_LOC_ID_OFFSET + 301, LocationType.BONUS), - LocationData("Zero Hour", "Zero Hour: Second Group Rescued", SC2WOL_LOC_ID_OFFSET + 302, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Zero Hour", "Zero Hour: Third Group Rescued", SC2WOL_LOC_ID_OFFSET + 303, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 2), - LocationData("Zero Hour", "Zero Hour: First Hatchery", SC2WOL_LOC_ID_OFFSET + 304, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Zero Hour", "Zero Hour: Second Hatchery", SC2WOL_LOC_ID_OFFSET + 305, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Zero Hour", "Zero Hour: Third Hatchery", SC2WOL_LOC_ID_OFFSET + 306, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Zero Hour", "Zero Hour: Fourth Hatchery", SC2WOL_LOC_ID_OFFSET + 307, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Evacuation", "Evacuation: Victory", SC2WOL_LOC_ID_OFFSET + 400, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Evacuation", "Evacuation: North Chrysalis", SC2WOL_LOC_ID_OFFSET + 401, LocationType.BONUS), - LocationData("Evacuation", "Evacuation: West Chrysalis", SC2WOL_LOC_ID_OFFSET + 402, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Evacuation", "Evacuation: East Chrysalis", SC2WOL_LOC_ID_OFFSET + 403, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Evacuation", "Evacuation: Reach Hanson", SC2WOL_LOC_ID_OFFSET + 404, LocationType.MISSION_PROGRESS), - LocationData("Evacuation", "Evacuation: Secret Resource Stash", SC2WOL_LOC_ID_OFFSET + 405, LocationType.BONUS), - LocationData("Evacuation", "Evacuation: Flawless", SC2WOL_LOC_ID_OFFSET + 406, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Outbreak", "Outbreak: Victory", SC2WOL_LOC_ID_OFFSET + 500, LocationType.VICTORY, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 4 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: Left Infestor", SC2WOL_LOC_ID_OFFSET + 501, LocationType.BONUS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: Right Infestor", SC2WOL_LOC_ID_OFFSET + 502, LocationType.BONUS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: North Infested Command Center", SC2WOL_LOC_ID_OFFSET + 503, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: South Infested Command Center", SC2WOL_LOC_ID_OFFSET + 504, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: Northwest Bar", SC2WOL_LOC_ID_OFFSET + 505, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: North Bar", SC2WOL_LOC_ID_OFFSET + 506, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Outbreak", "Outbreak: South Bar", SC2WOL_LOC_ID_OFFSET + 507, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_defense_rating(multiworld, player, True, False) >= 2 and - (state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Safe Haven", "Safe Haven: Victory", SC2WOL_LOC_ID_OFFSET + 600, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: North Nexus", SC2WOL_LOC_ID_OFFSET + 601, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: East Nexus", SC2WOL_LOC_ID_OFFSET + 602, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: South Nexus", SC2WOL_LOC_ID_OFFSET + 603, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: First Terror Fleet", SC2WOL_LOC_ID_OFFSET + 604, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: Second Terror Fleet", SC2WOL_LOC_ID_OFFSET + 605, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Safe Haven", "Safe Haven: Third Terror Fleet", SC2WOL_LOC_ID_OFFSET + 606, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player)), - LocationData("Haven's Fall", "Haven's Fall: Victory", SC2WOL_LOC_ID_OFFSET + 700, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 3), - LocationData("Haven's Fall", "Haven's Fall: North Hive", SC2WOL_LOC_ID_OFFSET + 701, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 3), - LocationData("Haven's Fall", "Haven's Fall: East Hive", SC2WOL_LOC_ID_OFFSET + 702, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 3), - LocationData("Haven's Fall", "Haven's Fall: South Hive", SC2WOL_LOC_ID_OFFSET + 703, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) >= 3), - LocationData("Haven's Fall", "Haven's Fall: Northeast Colony Base", SC2WOL_LOC_ID_OFFSET + 704, LocationType.CHALLENGE, - lambda state: state._sc2wol_can_respond_to_colony_infestations), - LocationData("Haven's Fall", "Haven's Fall: East Colony Base", SC2WOL_LOC_ID_OFFSET + 705, LocationType.CHALLENGE, - lambda state: state._sc2wol_can_respond_to_colony_infestations), - LocationData("Haven's Fall", "Haven's Fall: Middle Colony Base", SC2WOL_LOC_ID_OFFSET + 706, LocationType.CHALLENGE, - lambda state: state._sc2wol_can_respond_to_colony_infestations), - LocationData("Haven's Fall", "Haven's Fall: Southeast Colony Base", SC2WOL_LOC_ID_OFFSET + 707, LocationType.CHALLENGE, - lambda state: state._sc2wol_can_respond_to_colony_infestations), - LocationData("Haven's Fall", "Haven's Fall: Southwest Colony Base", SC2WOL_LOC_ID_OFFSET + 708, LocationType.CHALLENGE, - lambda state: state._sc2wol_can_respond_to_colony_infestations), - LocationData("Smash and Grab", "Smash and Grab: Victory", SC2WOL_LOC_ID_OFFSET + 800, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Smash and Grab", "Smash and Grab: First Relic", SC2WOL_LOC_ID_OFFSET + 801, LocationType.BONUS), - LocationData("Smash and Grab", "Smash and Grab: Second Relic", SC2WOL_LOC_ID_OFFSET + 802, LocationType.BONUS), - LocationData("Smash and Grab", "Smash and Grab: Third Relic", SC2WOL_LOC_ID_OFFSET + 803, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Smash and Grab", "Smash and Grab: Fourth Relic", SC2WOL_LOC_ID_OFFSET + 804, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Smash and Grab", "Smash and Grab: First Forcefield Area Busted", SC2WOL_LOC_ID_OFFSET + 805, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("Smash and Grab", "Smash and Grab: Second Forcefield Area Busted", SC2WOL_LOC_ID_OFFSET + 806, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player) - or state._sc2wol_has_competent_anti_air(multiworld, player))), - LocationData("The Dig", "The Dig: Victory", SC2WOL_LOC_ID_OFFSET + 900, LocationType.VICTORY, - lambda state: state._sc2wol_has_anti_air(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, False) >= 7), - LocationData("The Dig", "The Dig: Left Relic", SC2WOL_LOC_ID_OFFSET + 901, LocationType.BONUS, - lambda state: state._sc2wol_defense_rating(multiworld, player, False) >= 5), - LocationData("The Dig", "The Dig: Right Ground Relic", SC2WOL_LOC_ID_OFFSET + 902, LocationType.BONUS, - lambda state: state._sc2wol_defense_rating(multiworld, player, False) >= 5), - LocationData("The Dig", "The Dig: Right Cliff Relic", SC2WOL_LOC_ID_OFFSET + 903, LocationType.BONUS, - lambda state: state._sc2wol_defense_rating(multiworld, player, False) >= 5), - LocationData("The Dig", "The Dig: Moebius Base", SC2WOL_LOC_ID_OFFSET + 904, LocationType.MISSION_PROGRESS), - LocationData("The Moebius Factor", "The Moebius Factor: Victory", SC2WOL_LOC_ID_OFFSET + 1000, LocationType.VICTORY, - lambda state: state._sc2wol_has_anti_air(multiworld, player) and - (state._sc2wol_has_air(multiworld, player) - or state.has_any({'Medivac', 'Hercules'}, player) - and state._sc2wol_has_common_unit(multiworld, player))), - LocationData("The Moebius Factor", "The Moebius Factor: 1st Data Core", SC2WOL_LOC_ID_OFFSET + 1001, LocationType.MISSION_PROGRESS), - LocationData("The Moebius Factor", "The Moebius Factor: 2nd Data Core", SC2WOL_LOC_ID_OFFSET + 1002, LocationType.MISSION_PROGRESS, - lambda state: (state._sc2wol_has_air(multiworld, player) - or state.has_any({'Medivac', 'Hercules'}, player) - and state._sc2wol_has_common_unit(multiworld, player))), - LocationData("The Moebius Factor", "The Moebius Factor: South Rescue", SC2WOL_LOC_ID_OFFSET + 1003, LocationType.BONUS, - lambda state: state._sc2wol_able_to_rescue(multiworld, player)), - LocationData("The Moebius Factor", "The Moebius Factor: Wall Rescue", SC2WOL_LOC_ID_OFFSET + 1004, LocationType.BONUS, - lambda state: state._sc2wol_able_to_rescue(multiworld, player)), - LocationData("The Moebius Factor", "The Moebius Factor: Mid Rescue", SC2WOL_LOC_ID_OFFSET + 1005, LocationType.BONUS, - lambda state: state._sc2wol_able_to_rescue(multiworld, player)), - LocationData("The Moebius Factor", "The Moebius Factor: Nydus Roof Rescue", SC2WOL_LOC_ID_OFFSET + 1006, LocationType.BONUS, - lambda state: state._sc2wol_able_to_rescue(multiworld, player)), - LocationData("The Moebius Factor", "The Moebius Factor: Alive Inside Rescue", SC2WOL_LOC_ID_OFFSET + 1007, LocationType.BONUS, - lambda state: state._sc2wol_able_to_rescue(multiworld, player)), - LocationData("The Moebius Factor", "The Moebius Factor: Brutalisk", SC2WOL_LOC_ID_OFFSET + 1008, LocationType.OPTIONAL_BOSS, - lambda state: state._sc2wol_has_anti_air(multiworld, player) and - (state._sc2wol_has_air(multiworld, player) - or state.has_any({'Medivac', 'Hercules'}, player) - and state._sc2wol_has_common_unit(multiworld, player))), - LocationData("The Moebius Factor", "The Moebius Factor: 3rd Data Core", SC2WOL_LOC_ID_OFFSET + 1009, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_anti_air(multiworld, player) and - (state._sc2wol_has_air(multiworld, player) - or state.has_any({'Medivac', 'Hercules'}, player) - and state._sc2wol_has_common_unit(multiworld, player))), - LocationData("Supernova", "Supernova: Victory", SC2WOL_LOC_ID_OFFSET + 1100, LocationType.VICTORY, - lambda state: state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Supernova", "Supernova: West Relic", SC2WOL_LOC_ID_OFFSET + 1101, LocationType.BONUS), - LocationData("Supernova", "Supernova: North Relic", SC2WOL_LOC_ID_OFFSET + 1102, LocationType.BONUS), - LocationData("Supernova", "Supernova: South Relic", SC2WOL_LOC_ID_OFFSET + 1103, LocationType.BONUS, - lambda state: state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Supernova", "Supernova: East Relic", SC2WOL_LOC_ID_OFFSET + 1104, LocationType.BONUS, - lambda state: state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Supernova", "Supernova: Landing Zone Cleared", SC2WOL_LOC_ID_OFFSET + 1105, LocationType.MISSION_PROGRESS), - LocationData("Supernova", "Supernova: Middle Base", SC2WOL_LOC_ID_OFFSET + 1106, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Supernova", "Supernova: Southeast Base", SC2WOL_LOC_ID_OFFSET + 1107, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Victory", SC2WOL_LOC_ID_OFFSET + 1200, LocationType.VICTORY, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Landing Zone Cleared", SC2WOL_LOC_ID_OFFSET + 1201, LocationType.MISSION_PROGRESS), - LocationData("Maw of the Void", "Maw of the Void: Expansion Prisoners", SC2WOL_LOC_ID_OFFSET + 1202, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: South Close Prisoners", SC2WOL_LOC_ID_OFFSET + 1203, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: South Far Prisoners", SC2WOL_LOC_ID_OFFSET + 1204, LocationType.BONUS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: North Prisoners", SC2WOL_LOC_ID_OFFSET + 1205, LocationType.BONUS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Mothership", SC2WOL_LOC_ID_OFFSET + 1206, LocationType.OPTIONAL_BOSS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Expansion Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1207, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Middle Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1208, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Southeast Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1209, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Stargate Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1210, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Northwest Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1211, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: West Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1212, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Maw of the Void", "Maw of the Void: Southwest Rip Field Generator", SC2WOL_LOC_ID_OFFSET + 1213, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_survives_rip_field(multiworld, player)), - LocationData("Devil's Playground", "Devil's Playground: Victory", SC2WOL_LOC_ID_OFFSET + 1300, LocationType.VICTORY, - lambda state: logic_level > 0 or - state._sc2wol_has_anti_air(multiworld, player) and ( - state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Devil's Playground", "Devil's Playground: Tosh's Miners", SC2WOL_LOC_ID_OFFSET + 1301, LocationType.BONUS), - LocationData("Devil's Playground", "Devil's Playground: Brutalisk", SC2WOL_LOC_ID_OFFSET + 1302, LocationType.OPTIONAL_BOSS, - lambda state: logic_level > 0 or state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player)), - LocationData("Devil's Playground", "Devil's Playground: North Reapers", SC2WOL_LOC_ID_OFFSET + 1303, LocationType.BONUS), - LocationData("Devil's Playground", "Devil's Playground: Middle Reapers", SC2WOL_LOC_ID_OFFSET + 1304, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player)), - LocationData("Devil's Playground", "Devil's Playground: Southwest Reapers", SC2WOL_LOC_ID_OFFSET + 1305, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player)), - LocationData("Devil's Playground", "Devil's Playground: Southeast Reapers", SC2WOL_LOC_ID_OFFSET + 1306, LocationType.BONUS, - lambda state: logic_level > 0 or - state._sc2wol_has_anti_air(multiworld, player) and ( - state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Devil's Playground", "Devil's Playground: East Reapers", SC2WOL_LOC_ID_OFFSET + 1307, LocationType.BONUS, - lambda state: state._sc2wol_has_anti_air(multiworld, player) and - (logic_level > 0 or - state._sc2wol_has_common_unit(multiworld, player) or state.has("Reaper", player))), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Victory", SC2WOL_LOC_ID_OFFSET + 1400, LocationType.VICTORY, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Close Relic", SC2WOL_LOC_ID_OFFSET + 1401, LocationType.BONUS), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: West Relic", SC2WOL_LOC_ID_OFFSET + 1402, LocationType.BONUS, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: North-East Relic", SC2WOL_LOC_ID_OFFSET + 1403, LocationType.BONUS, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Middle Base", SC2WOL_LOC_ID_OFFSET + 1404, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Main Base", SC2WOL_LOC_ID_OFFSET + 1405, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player) - and state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: No Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1406, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player) - and state._sc2wol_has_competent_ground_to_air(multiworld, player) - and state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 1 Terrazine Node Sealed", SC2WOL_LOC_ID_OFFSET + 1407, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player) - and state._sc2wol_has_competent_ground_to_air(multiworld, player) - and state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 2 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1408, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player) - and state._sc2wol_beats_protoss_deathball(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 3 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1409, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player) - and state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 4 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1410, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Welcome to the Jungle", "Welcome to the Jungle: Up to 5 Terrazine Nodes Sealed", SC2WOL_LOC_ID_OFFSET + 1411, LocationType.CHALLENGE, - lambda state: state._sc2wol_welcome_to_the_jungle_requirement(multiworld, player)), - LocationData("Breakout", "Breakout: Victory", SC2WOL_LOC_ID_OFFSET + 1500, LocationType.VICTORY), - LocationData("Breakout", "Breakout: Diamondback Prison", SC2WOL_LOC_ID_OFFSET + 1501, LocationType.BONUS), - LocationData("Breakout", "Breakout: Siege Tank Prison", SC2WOL_LOC_ID_OFFSET + 1502, LocationType.BONUS), - LocationData("Breakout", "Breakout: First Checkpoint", SC2WOL_LOC_ID_OFFSET + 1503, LocationType.MISSION_PROGRESS), - LocationData("Breakout", "Breakout: Second Checkpoint", SC2WOL_LOC_ID_OFFSET + 1504, LocationType.MISSION_PROGRESS), - LocationData("Ghost of a Chance", "Ghost of a Chance: Victory", SC2WOL_LOC_ID_OFFSET + 1600, LocationType.VICTORY), - LocationData("Ghost of a Chance", "Ghost of a Chance: Terrazine Tank", SC2WOL_LOC_ID_OFFSET + 1601, LocationType.MISSION_PROGRESS), - LocationData("Ghost of a Chance", "Ghost of a Chance: Jorium Stockpile", SC2WOL_LOC_ID_OFFSET + 1602, LocationType.MISSION_PROGRESS), - LocationData("Ghost of a Chance", "Ghost of a Chance: First Island Spectres", SC2WOL_LOC_ID_OFFSET + 1603, LocationType.BONUS), - LocationData("Ghost of a Chance", "Ghost of a Chance: Second Island Spectres", SC2WOL_LOC_ID_OFFSET + 1604, LocationType.BONUS), - LocationData("Ghost of a Chance", "Ghost of a Chance: Third Island Spectres", SC2WOL_LOC_ID_OFFSET + 1605, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Victory", SC2WOL_LOC_ID_OFFSET + 1700, LocationType.VICTORY, - lambda state: state._sc2wol_has_train_killers(multiworld, player) and - state._sc2wol_has_anti_air(multiworld, player)), - LocationData("The Great Train Robbery", "The Great Train Robbery: North Defiler", SC2WOL_LOC_ID_OFFSET + 1701, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Mid Defiler", SC2WOL_LOC_ID_OFFSET + 1702, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: South Defiler", SC2WOL_LOC_ID_OFFSET + 1703, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Close Diamondback", SC2WOL_LOC_ID_OFFSET + 1704, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Northwest Diamondback", SC2WOL_LOC_ID_OFFSET + 1705, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: North Diamondback", SC2WOL_LOC_ID_OFFSET + 1706, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Northeast Diamondback", SC2WOL_LOC_ID_OFFSET + 1707, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Southwest Diamondback", SC2WOL_LOC_ID_OFFSET + 1708, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Southeast Diamondback", SC2WOL_LOC_ID_OFFSET + 1709, LocationType.BONUS), - LocationData("The Great Train Robbery", "The Great Train Robbery: Kill Team", SC2WOL_LOC_ID_OFFSET + 1710, LocationType.CHALLENGE, - lambda state: (logic_level > 0 or state._sc2wol_has_common_unit(multiworld, player)) and - state._sc2wol_has_train_killers(multiworld, player) and - state._sc2wol_has_anti_air(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: Victory", SC2WOL_LOC_ID_OFFSET + 1800, LocationType.VICTORY, - lambda state: state._sc2wol_has_common_unit(multiworld, player) and - (logic_level > 0 or state._sc2wol_has_anti_air)), - LocationData("Cutthroat", "Cutthroat: Mira Han", SC2WOL_LOC_ID_OFFSET + 1801, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: North Relic", SC2WOL_LOC_ID_OFFSET + 1802, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: Mid Relic", SC2WOL_LOC_ID_OFFSET + 1803, LocationType.BONUS), - LocationData("Cutthroat", "Cutthroat: Southwest Relic", SC2WOL_LOC_ID_OFFSET + 1804, LocationType.BONUS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: North Command Center", SC2WOL_LOC_ID_OFFSET + 1805, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: South Command Center", SC2WOL_LOC_ID_OFFSET + 1806, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Cutthroat", "Cutthroat: West Command Center", SC2WOL_LOC_ID_OFFSET + 1807, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_common_unit(multiworld, player)), - LocationData("Engine of Destruction", "Engine of Destruction: Victory", SC2WOL_LOC_ID_OFFSET + 1900, LocationType.VICTORY, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Odin", SC2WOL_LOC_ID_OFFSET + 1901, LocationType.MISSION_PROGRESS), - LocationData("Engine of Destruction", "Engine of Destruction: Loki", SC2WOL_LOC_ID_OFFSET + 1902, LocationType.OPTIONAL_BOSS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Lab Devourer", SC2WOL_LOC_ID_OFFSET + 1903, LocationType.BONUS), - LocationData("Engine of Destruction", "Engine of Destruction: North Devourer", SC2WOL_LOC_ID_OFFSET + 1904, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Southeast Devourer", SC2WOL_LOC_ID_OFFSET + 1905, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: West Base", SC2WOL_LOC_ID_OFFSET + 1906, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Northwest Base", SC2WOL_LOC_ID_OFFSET + 1907, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Northeast Base", SC2WOL_LOC_ID_OFFSET + 1908, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Engine of Destruction", "Engine of Destruction: Southeast Base", SC2WOL_LOC_ID_OFFSET + 1909, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_anti_air(multiworld, player) and - state._sc2wol_has_common_unit(multiworld, player) or state.has('Wraith', player)), - LocationData("Media Blitz", "Media Blitz: Victory", SC2WOL_LOC_ID_OFFSET + 2000, LocationType.VICTORY, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: Tower 1", SC2WOL_LOC_ID_OFFSET + 2001, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: Tower 2", SC2WOL_LOC_ID_OFFSET + 2002, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: Tower 3", SC2WOL_LOC_ID_OFFSET + 2003, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: Science Facility", SC2WOL_LOC_ID_OFFSET + 2004, LocationType.BONUS), - LocationData("Media Blitz", "Media Blitz: All Barracks", SC2WOL_LOC_ID_OFFSET + 2005, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: All Factories", SC2WOL_LOC_ID_OFFSET + 2006, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: All Starports", SC2WOL_LOC_ID_OFFSET + 2007, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Media Blitz", "Media Blitz: Odin Not Trashed", SC2WOL_LOC_ID_OFFSET + 2008, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: Victory", SC2WOL_LOC_ID_OFFSET + 2100, LocationType.VICTORY, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: Holding Cell Relic", SC2WOL_LOC_ID_OFFSET + 2101, LocationType.BONUS), - LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk Relic", SC2WOL_LOC_ID_OFFSET + 2102, LocationType.BONUS, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: First Escape Relic", SC2WOL_LOC_ID_OFFSET + 2103,LocationType.BONUS, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: Second Escape Relic", SC2WOL_LOC_ID_OFFSET + 2104, LocationType.BONUS, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk", SC2WOL_LOC_ID_OFFSET + 2105, LocationType.OPTIONAL_BOSS, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Piercing the Shroud", "Piercing the Shroud: Fusion Reactor", SC2WOL_LOC_ID_OFFSET + 2106, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_mm_upgrade(multiworld, player)), - LocationData("Whispers of Doom", "Whispers of Doom: Victory", SC2WOL_LOC_ID_OFFSET + 2200, LocationType.VICTORY), - LocationData("Whispers of Doom", "Whispers of Doom: First Hatchery", SC2WOL_LOC_ID_OFFSET + 2201, LocationType.BONUS), - LocationData("Whispers of Doom", "Whispers of Doom: Second Hatchery", SC2WOL_LOC_ID_OFFSET + 2202, LocationType.BONUS), - LocationData("Whispers of Doom", "Whispers of Doom: Third Hatchery", SC2WOL_LOC_ID_OFFSET + 2203, LocationType.BONUS), - LocationData("Whispers of Doom", "Whispers of Doom: First Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2204, LocationType.MISSION_PROGRESS), - LocationData("Whispers of Doom", "Whispers of Doom: Second Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2205, LocationType.MISSION_PROGRESS), - LocationData("Whispers of Doom", "Whispers of Doom: Third Prophecy Fragment", SC2WOL_LOC_ID_OFFSET + 2206, LocationType.MISSION_PROGRESS), - LocationData("A Sinister Turn", "A Sinister Turn: Victory", SC2WOL_LOC_ID_OFFSET + 2300, LocationType.VICTORY, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Robotics Facility", SC2WOL_LOC_ID_OFFSET + 2301, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Dark Shrine", SC2WOL_LOC_ID_OFFSET + 2302, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Templar Archives", SC2WOL_LOC_ID_OFFSET + 2303, LocationType.BONUS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Northeast Base", SC2WOL_LOC_ID_OFFSET + 2304, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Southwest Base", SC2WOL_LOC_ID_OFFSET + 2305, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Maar", SC2WOL_LOC_ID_OFFSET + 2306, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Northwest Preserver", SC2WOL_LOC_ID_OFFSET + 2307, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: Southwest Preserver", SC2WOL_LOC_ID_OFFSET + 2308, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("A Sinister Turn", "A Sinister Turn: East Preserver", SC2WOL_LOC_ID_OFFSET + 2309, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("Echoes of the Future", "Echoes of the Future: Victory", SC2WOL_LOC_ID_OFFSET + 2400, LocationType.VICTORY, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("Echoes of the Future", "Echoes of the Future: Close Obelisk", SC2WOL_LOC_ID_OFFSET + 2401, LocationType.BONUS), - LocationData("Echoes of the Future", "Echoes of the Future: West Obelisk", SC2WOL_LOC_ID_OFFSET + 2402, LocationType.BONUS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("Echoes of the Future", "Echoes of the Future: Base", SC2WOL_LOC_ID_OFFSET + 2403, LocationType.MISSION_PROGRESS), - LocationData("Echoes of the Future", "Echoes of the Future: Southwest Tendril", SC2WOL_LOC_ID_OFFSET + 2404, LocationType.MISSION_PROGRESS), - LocationData("Echoes of the Future", "Echoes of the Future: Southeast Tendril", SC2WOL_LOC_ID_OFFSET + 2405, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("Echoes of the Future", "Echoes of the Future: Northeast Tendril", SC2WOL_LOC_ID_OFFSET + 2406, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("Echoes of the Future", "Echoes of the Future: Northwest Tendril", SC2WOL_LOC_ID_OFFSET + 2407, LocationType.MISSION_PROGRESS, - lambda state: logic_level > 0 or state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("In Utter Darkness", "In Utter Darkness: Defeat", SC2WOL_LOC_ID_OFFSET + 2500, LocationType.VICTORY), - LocationData("In Utter Darkness", "In Utter Darkness: Protoss Archive", SC2WOL_LOC_ID_OFFSET + 2501, LocationType.BONUS, - lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)), - LocationData("In Utter Darkness", "In Utter Darkness: Kills", SC2WOL_LOC_ID_OFFSET + 2502, LocationType.CHALLENGE, - lambda state: state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("In Utter Darkness", "In Utter Darkness: Urun", SC2WOL_LOC_ID_OFFSET + 2503, LocationType.MISSION_PROGRESS), - LocationData("In Utter Darkness", "In Utter Darkness: Mohandar", SC2WOL_LOC_ID_OFFSET + 2504, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("In Utter Darkness", "In Utter Darkness: Selendis", SC2WOL_LOC_ID_OFFSET + 2505, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("In Utter Darkness", "In Utter Darkness: Artanis", SC2WOL_LOC_ID_OFFSET + 2506, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_protoss_common_units(multiworld, player)), - LocationData("Gates of Hell", "Gates of Hell: Victory", SC2WOL_LOC_ID_OFFSET + 2600, LocationType.VICTORY, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Gates of Hell", "Gates of Hell: Large Army", SC2WOL_LOC_ID_OFFSET + 2601, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Gates of Hell", "Gates of Hell: 2 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2602, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Gates of Hell", "Gates of Hell: 4 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2603, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Gates of Hell", "Gates of Hell: 6 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2604, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Gates of Hell", "Gates of Hell: 8 Drop Pods", SC2WOL_LOC_ID_OFFSET + 2605, LocationType.BONUS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player) and - state._sc2wol_defense_rating(multiworld, player, True) > 6), - LocationData("Belly of the Beast", "Belly of the Beast: Victory", SC2WOL_LOC_ID_OFFSET + 2700, LocationType.VICTORY), - LocationData("Belly of the Beast", "Belly of the Beast: First Charge", SC2WOL_LOC_ID_OFFSET + 2701, LocationType.MISSION_PROGRESS), - LocationData("Belly of the Beast", "Belly of the Beast: Second Charge", SC2WOL_LOC_ID_OFFSET + 2702, LocationType.MISSION_PROGRESS), - LocationData("Belly of the Beast", "Belly of the Beast: Third Charge", SC2WOL_LOC_ID_OFFSET + 2703, LocationType.MISSION_PROGRESS), - LocationData("Belly of the Beast", "Belly of the Beast: First Group Rescued", SC2WOL_LOC_ID_OFFSET + 2704, LocationType.BONUS), - LocationData("Belly of the Beast", "Belly of the Beast: Second Group Rescued", SC2WOL_LOC_ID_OFFSET + 2705, LocationType.BONUS), - LocationData("Belly of the Beast", "Belly of the Beast: Third Group Rescued", SC2WOL_LOC_ID_OFFSET + 2706, LocationType.BONUS), - LocationData("Shatter the Sky", "Shatter the Sky: Victory", SC2WOL_LOC_ID_OFFSET + 2800, LocationType.VICTORY, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Close Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2801, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Northwest Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2802, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Southeast Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2803, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Southwest Coolant Tower", SC2WOL_LOC_ID_OFFSET + 2804, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Leviathan", SC2WOL_LOC_ID_OFFSET + 2805, LocationType.OPTIONAL_BOSS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: East Hatchery", SC2WOL_LOC_ID_OFFSET + 2806, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: North Hatchery", SC2WOL_LOC_ID_OFFSET + 2807, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("Shatter the Sky", "Shatter the Sky: Mid Hatchery", SC2WOL_LOC_ID_OFFSET + 2808, LocationType.MISSION_PROGRESS, - lambda state: state._sc2wol_has_competent_comp(multiworld, player)), - LocationData("All-In", "All-In: Victory", None, LocationType.VICTORY, - lambda state: state._sc2wol_final_mission_requirements(multiworld, player)) - ] - - beat_events = [] - - for i, location_data in enumerate(location_table): - # Removing all item-based logic on No Logic - if logic_level == 2: - location_data = location_data._replace(rule=Location.access_rule) - location_table[i] = location_data - # Generating Beat event locations - if location_data.name.endswith((": Victory", ": Defeat")): - beat_events.append( - location_data._replace(name="Beat " + location_data.name.rsplit(": ", 1)[0], code=None) - ) - return tuple(location_table + beat_events) diff --git a/worlds/sc2wol/LogicMixin.py b/worlds/sc2wol/LogicMixin.py deleted file mode 100644 index 112302beb207..000000000000 --- a/worlds/sc2wol/LogicMixin.py +++ /dev/null @@ -1,148 +0,0 @@ -from BaseClasses import MultiWorld -from worlds.AutoWorld import LogicMixin -from .Options import get_option_value -from .Items import get_basic_units, defense_ratings, zerg_defense_ratings - - -class SC2WoLLogic(LogicMixin): - def _sc2wol_has_common_unit(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any(get_basic_units(multiworld, player), player) - - def _sc2wol_has_air(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any({'Viking', 'Wraith', 'Banshee', 'Battlecruiser'}, player) or get_option_value(multiworld, player, 'required_tactics') > 0 \ - and self.has_any({'Hercules', 'Medivac'}, player) and self._sc2wol_has_common_unit(multiworld, player) - - def _sc2wol_has_air_anti_air(self, multiworld: MultiWorld, player: int) -> bool: - return self.has('Viking', player) \ - or self.has_all({'Wraith', 'Advanced Laser Technology (Wraith)'}, player) \ - or self.has_all({'Battlecruiser', 'ATX Laser Battery (Battlecruiser)'}, player) \ - or get_option_value(multiworld, player, 'required_tactics') > 0 and self.has_any({'Wraith', 'Valkyrie', 'Battlecruiser'}, player) - - def _sc2wol_has_competent_ground_to_air(self, multiworld: MultiWorld, player: int) -> bool: - return self.has('Goliath', player) \ - or self.has('Marine', player) and self.has_any({'Medic', 'Medivac'}, player) \ - or get_option_value(multiworld, player, 'required_tactics') > 0 and self.has('Cyclone', player) - - def _sc2wol_has_competent_anti_air(self, multiworld: MultiWorld, player: int) -> bool: - return self._sc2wol_has_competent_ground_to_air(multiworld, player) \ - or self._sc2wol_has_air_anti_air(multiworld, player) - - def _sc2wol_welcome_to_the_jungle_requirement(self, multiworld: MultiWorld, player: int) -> bool: - return ( - self._sc2wol_has_common_unit(multiworld, player) - and self._sc2wol_has_competent_ground_to_air(multiworld, player) - ) or ( - get_option_value(multiworld, player, 'required_tactics') > 0 - and self.has_any({'Marine', 'Vulture'}, player) - and self._sc2wol_has_air_anti_air(multiworld, player) - ) - - def _sc2wol_has_anti_air(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any({'Missile Turret', 'Thor', 'War Pigs', 'Spartan Company', "Hel's Angel", 'Battlecruiser', 'Marine', 'Wraith', 'Valkyrie', 'Cyclone'}, player) \ - or self._sc2wol_has_competent_anti_air(multiworld, player) \ - or get_option_value(multiworld, player, 'required_tactics') > 0 and self.has_any({'Ghost', 'Spectre', 'Widow Mine', 'Liberator'}, player) - - def _sc2wol_defense_rating(self, multiworld: MultiWorld, player: int, zerg_enemy: bool, air_enemy: bool = True) -> bool: - defense_score = sum((defense_ratings[item] for item in defense_ratings if self.has(item, player))) - if self.has_any({'Marine', 'Marauder'}, player) and self.has('Bunker', player): - defense_score += 3 - if self.has_all({'Siege Tank', 'Maelstrom Rounds (Siege Tank)'}, player): - defense_score += 2 - if self.has_all({'Siege Tank', 'Graduating Range (Siege Tank)'}, player): - defense_score += 1 - if self.has_all({'Widow Mine', 'Concealment (Widow Mine)'}, player): - defense_score += 1 - if zerg_enemy: - defense_score += sum((zerg_defense_ratings[item] for item in zerg_defense_ratings if self.has(item, player))) - if self.has('Firebat', player) and self.has('Bunker', player): - defense_score += 2 - if not air_enemy and self.has('Missile Turret', player): - defense_score -= defense_ratings['Missile Turret'] - # Advanced Tactics bumps defense rating requirements down by 2 - if get_option_value(multiworld, player, 'required_tactics') > 0: - defense_score += 2 - return defense_score - - def _sc2wol_has_competent_comp(self, multiworld: MultiWorld, player: int) -> bool: - return \ - ( - ( - self.has_any({'Marine', 'Marauder'}, player) and self.has_any({'Medivac', 'Medic'}, player) - or self.has_any({'Thor', 'Banshee', 'Siege Tank'}, player) - or self.has_all({'Liberator', 'Raid Artillery (Liberator)'}, player) - ) and self._sc2wol_has_competent_anti_air(multiworld, player) - ) \ - or \ - ( - self.has('Battlecruiser', player) and self._sc2wol_has_common_unit(multiworld, player) - ) - - def _sc2wol_has_train_killers(self, multiworld: MultiWorld, player: int) -> bool: - return ( - self.has_any({'Siege Tank', 'Diamondback', 'Marauder', 'Cyclone'}, player) - or get_option_value(multiworld, player, 'required_tactics') > 0 - and ( - self.has_all({'Reaper', "G-4 Clusterbomb"}, player) - or self.has_all({'Spectre', 'Psionic Lash'}, player) - or self.has_any({'Vulture', 'Liberator'}, player) - ) - ) - - def _sc2wol_able_to_rescue(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any({'Medivac', 'Hercules', 'Raven', 'Viking'}, player) or get_option_value(multiworld, player, 'required_tactics') > 0 - - def _sc2wol_has_protoss_common_units(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any({'Zealot', 'Immortal', 'Stalker', 'Dark Templar'}, player) \ - or get_option_value(multiworld, player, 'required_tactics') > 0 and self.has('High Templar', player) - - def _sc2wol_has_protoss_medium_units(self, multiworld: MultiWorld, player: int) -> bool: - return self._sc2wol_has_protoss_common_units(multiworld, player) and \ - self.has_any({'Stalker', 'Void Ray', 'Carrier'}, player) \ - or get_option_value(multiworld, player, 'required_tactics') > 0 and self.has('Dark Templar', player) - - def _sc2wol_beats_protoss_deathball(self, multiworld: MultiWorld, player: int) -> bool: - return (self.has_any({'Banshee', 'Battlecruiser'}, player) or - self.has_all({'Liberator', 'Raid Artillery (Liberator)'}, player)) \ - and self._sc2wol_has_competent_anti_air(multiworld, player) or \ - self._sc2wol_has_competent_comp(multiworld, player) and self._sc2wol_has_air_anti_air(multiworld, player) - - def _sc2wol_has_mm_upgrade(self, multiworld: MultiWorld, player: int) -> bool: - return self.has_any({"Combat Shield (Marine)", "Stabilizer Medpacks (Medic)"}, player) - - def _sc2wol_survives_rip_field(self, multiworld: MultiWorld, player: int) -> bool: - return self.has("Battlecruiser", player) or \ - self._sc2wol_has_air(multiworld, player) and \ - self._sc2wol_has_competent_anti_air(multiworld, player) and \ - self.has("Science Vessel", player) - - def _sc2wol_has_nukes(self, multiworld: MultiWorld, player: int) -> bool: - return get_option_value(multiworld, player, 'required_tactics') > 0 and self.has_any({'Ghost', 'Spectre'}, player) - - def _sc2wol_can_respond_to_colony_infestations(self, multiworld: MultiWorld, player: int) -> bool: - return self._sc2wol_has_common_unit(multiworld, player) \ - and self._sc2wol_has_competent_anti_air(multiworld, player) \ - and \ - ( - self._sc2wol_has_air_anti_air(multiworld, player) or - self.has_any({'Battlecruiser', 'Valkyrie'}), player - ) \ - and \ - self._sc2wol_defense_rating(multiworld, player, True) >= 3 - - def _sc2wol_final_mission_requirements(self, multiworld: MultiWorld, player: int): - beats_kerrigan = self.has_any({'Marine', 'Banshee', 'Ghost'}, player) or get_option_value(multiworld, player, 'required_tactics') > 0 - if get_option_value(multiworld, player, 'all_in_map') == 0: - # Ground - defense_rating = self._sc2wol_defense_rating(multiworld, player, True, False) - if self.has_any({'Battlecruiser', 'Banshee'}, player): - defense_rating += 3 - return defense_rating >= 12 and beats_kerrigan - else: - # Air - defense_rating = self._sc2wol_defense_rating(multiworld, player, True, True) - return defense_rating >= 8 and beats_kerrigan \ - and self.has_any({'Viking', 'Battlecruiser', 'Valkyrie'}, player) \ - and self.has_any({'Hive Mind Emulator', 'Psi Disruptor', 'Missile Turret'}, player) - - def _sc2wol_cleared_missions(self, multiworld: MultiWorld, player: int, mission_count: int) -> bool: - return self.has_group("Missions", player, mission_count) diff --git a/worlds/sc2wol/MissionTables.py b/worlds/sc2wol/MissionTables.py deleted file mode 100644 index 298cd7a978a6..000000000000 --- a/worlds/sc2wol/MissionTables.py +++ /dev/null @@ -1,230 +0,0 @@ -from typing import NamedTuple, Dict, List -from enum import IntEnum - -no_build_regions_list = ["Liberation Day", "Breakout", "Ghost of a Chance", "Piercing the Shroud", "Whispers of Doom", - "Belly of the Beast"] -easy_regions_list = ["The Outlaws", "Zero Hour", "Evacuation", "Outbreak", "Smash and Grab", "Devil's Playground"] -medium_regions_list = ["Safe Haven", "Haven's Fall", "The Dig", "The Moebius Factor", "Supernova", - "Welcome to the Jungle", "The Great Train Robbery", "Cutthroat", "Media Blitz", - "A Sinister Turn", "Echoes of the Future"] -hard_regions_list = ["Maw of the Void", "Engine of Destruction", "In Utter Darkness", "Gates of Hell", - "Shatter the Sky"] - - -class MissionPools(IntEnum): - STARTER = 0 - EASY = 1 - MEDIUM = 2 - HARD = 3 - FINAL = 4 - - -class MissionInfo(NamedTuple): - id: int - required_world: List[int] - category: str - number: int = 0 # number of worlds need beaten - completion_critical: bool = False # missions needed to beat game - or_requirements: bool = False # true if the requirements should be or-ed instead of and-ed - - -class FillMission(NamedTuple): - type: int - connect_to: List[int] # -1 connects to Menu - category: str - number: int = 0 # number of worlds need beaten - completion_critical: bool = False # missions needed to beat game - or_requirements: bool = False # true if the requirements should be or-ed instead of and-ed - removal_priority: int = 0 # how many missions missing from the pool required to remove this mission - - -vanilla_shuffle_order = [ - FillMission(MissionPools.STARTER, [-1], "Mar Sara", completion_critical=True), - FillMission(MissionPools.EASY, [0], "Mar Sara", completion_critical=True), - FillMission(MissionPools.EASY, [1], "Mar Sara", completion_critical=True), - FillMission(MissionPools.EASY, [2], "Colonist"), - FillMission(MissionPools.MEDIUM, [3], "Colonist"), - FillMission(MissionPools.HARD, [4], "Colonist", number=7), - FillMission(MissionPools.HARD, [4], "Colonist", number=7, removal_priority=1), - FillMission(MissionPools.EASY, [2], "Artifact", completion_critical=True), - FillMission(MissionPools.MEDIUM, [7], "Artifact", number=8, completion_critical=True), - FillMission(MissionPools.HARD, [8], "Artifact", number=11, completion_critical=True), - FillMission(MissionPools.HARD, [9], "Artifact", number=14, completion_critical=True, removal_priority=11), - FillMission(MissionPools.HARD, [10], "Artifact", completion_critical=True, removal_priority=10), - FillMission(MissionPools.MEDIUM, [2], "Covert", number=4), - FillMission(MissionPools.MEDIUM, [12], "Covert"), - FillMission(MissionPools.HARD, [13], "Covert", number=8, removal_priority=3), - FillMission(MissionPools.HARD, [13], "Covert", number=8, removal_priority=2), - FillMission(MissionPools.MEDIUM, [2], "Rebellion", number=6), - FillMission(MissionPools.HARD, [16], "Rebellion"), - FillMission(MissionPools.HARD, [17], "Rebellion"), - FillMission(MissionPools.HARD, [18], "Rebellion", removal_priority=12), - FillMission(MissionPools.HARD, [19], "Rebellion", removal_priority=5), - FillMission(MissionPools.MEDIUM, [8], "Prophecy", removal_priority=9), - FillMission(MissionPools.HARD, [21], "Prophecy", removal_priority=8), - FillMission(MissionPools.HARD, [22], "Prophecy", removal_priority=7), - FillMission(MissionPools.HARD, [23], "Prophecy", removal_priority=6), - FillMission(MissionPools.HARD, [11], "Char", completion_critical=True), - FillMission(MissionPools.HARD, [25], "Char", completion_critical=True, removal_priority=4), - FillMission(MissionPools.HARD, [25], "Char", completion_critical=True), - FillMission(MissionPools.FINAL, [26, 27], "Char", completion_critical=True, or_requirements=True) -] - -mini_campaign_order = [ - FillMission(MissionPools.STARTER, [-1], "Mar Sara", completion_critical=True), - FillMission(MissionPools.EASY, [0], "Colonist"), - FillMission(MissionPools.MEDIUM, [1], "Colonist"), - FillMission(MissionPools.EASY, [0], "Artifact", completion_critical=True), - FillMission(MissionPools.MEDIUM, [3], "Artifact", number=4, completion_critical=True), - FillMission(MissionPools.HARD, [4], "Artifact", number=8, completion_critical=True), - FillMission(MissionPools.MEDIUM, [0], "Covert", number=2), - FillMission(MissionPools.HARD, [6], "Covert"), - FillMission(MissionPools.MEDIUM, [0], "Rebellion", number=3), - FillMission(MissionPools.HARD, [8], "Rebellion"), - FillMission(MissionPools.MEDIUM, [4], "Prophecy"), - FillMission(MissionPools.HARD, [10], "Prophecy"), - FillMission(MissionPools.HARD, [5], "Char", completion_critical=True), - FillMission(MissionPools.HARD, [5], "Char", completion_critical=True), - FillMission(MissionPools.FINAL, [12, 13], "Char", completion_critical=True, or_requirements=True) -] - -gauntlet_order = [ - FillMission(MissionPools.STARTER, [-1], "I", completion_critical=True), - FillMission(MissionPools.EASY, [0], "II", completion_critical=True), - FillMission(MissionPools.EASY, [1], "III", completion_critical=True), - FillMission(MissionPools.MEDIUM, [2], "IV", completion_critical=True), - FillMission(MissionPools.MEDIUM, [3], "V", completion_critical=True), - FillMission(MissionPools.HARD, [4], "VI", completion_critical=True), - FillMission(MissionPools.FINAL, [5], "Final", completion_critical=True) -] - -mini_gauntlet_order = [ - FillMission(MissionPools.STARTER, [-1], "I", completion_critical=True), - FillMission(MissionPools.EASY, [0], "II", completion_critical=True), - FillMission(MissionPools.MEDIUM, [1], "III", completion_critical=True), - FillMission(MissionPools.FINAL, [2], "Final", completion_critical=True) -] - -grid_order = [ - FillMission(MissionPools.STARTER, [-1], "_1"), - FillMission(MissionPools.EASY, [0], "_1"), - FillMission(MissionPools.MEDIUM, [1, 6, 3], "_1", or_requirements=True), - FillMission(MissionPools.HARD, [2, 7], "_1", or_requirements=True), - FillMission(MissionPools.EASY, [0], "_2"), - FillMission(MissionPools.MEDIUM, [1, 4], "_2", or_requirements=True), - FillMission(MissionPools.HARD, [2, 5, 10, 7], "_2", or_requirements=True), - FillMission(MissionPools.HARD, [3, 6, 11], "_2", or_requirements=True), - FillMission(MissionPools.MEDIUM, [4, 9, 12], "_3", or_requirements=True), - FillMission(MissionPools.HARD, [5, 8, 10, 13], "_3", or_requirements=True), - FillMission(MissionPools.HARD, [6, 9, 11, 14], "_3", or_requirements=True), - FillMission(MissionPools.HARD, [7, 10], "_3", or_requirements=True), - FillMission(MissionPools.HARD, [8, 13], "_4", or_requirements=True), - FillMission(MissionPools.HARD, [9, 12, 14], "_4", or_requirements=True), - FillMission(MissionPools.HARD, [10, 13], "_4", or_requirements=True), - FillMission(MissionPools.FINAL, [11, 14], "_4", or_requirements=True) -] - -mini_grid_order = [ - FillMission(MissionPools.STARTER, [-1], "_1"), - FillMission(MissionPools.EASY, [0], "_1"), - FillMission(MissionPools.MEDIUM, [1, 5], "_1", or_requirements=True), - FillMission(MissionPools.EASY, [0], "_2"), - FillMission(MissionPools.MEDIUM, [1, 3], "_2", or_requirements=True), - FillMission(MissionPools.HARD, [2, 4], "_2", or_requirements=True), - FillMission(MissionPools.MEDIUM, [3, 7], "_3", or_requirements=True), - FillMission(MissionPools.HARD, [4, 6], "_3", or_requirements=True), - FillMission(MissionPools.FINAL, [5, 7], "_3", or_requirements=True) -] - -tiny_grid_order = [ - FillMission(MissionPools.STARTER, [-1], "_1"), - FillMission(MissionPools.MEDIUM, [0], "_1"), - FillMission(MissionPools.EASY, [0], "_2"), - FillMission(MissionPools.FINAL, [1, 2], "_2", or_requirements=True), -] - -blitz_order = [ - FillMission(MissionPools.STARTER, [-1], "I"), - FillMission(MissionPools.EASY, [-1], "I"), - FillMission(MissionPools.MEDIUM, [0, 1], "II", number=1, or_requirements=True), - FillMission(MissionPools.MEDIUM, [0, 1], "II", number=1, or_requirements=True), - FillMission(MissionPools.MEDIUM, [0, 1], "III", number=2, or_requirements=True), - FillMission(MissionPools.MEDIUM, [0, 1], "III", number=2, or_requirements=True), - FillMission(MissionPools.HARD, [0, 1], "IV", number=3, or_requirements=True), - FillMission(MissionPools.HARD, [0, 1], "IV", number=3, or_requirements=True), - FillMission(MissionPools.HARD, [0, 1], "V", number=4, or_requirements=True), - FillMission(MissionPools.HARD, [0, 1], "V", number=4, or_requirements=True), - FillMission(MissionPools.HARD, [0, 1], "Final", number=5, or_requirements=True), - FillMission(MissionPools.FINAL, [0, 1], "Final", number=5, or_requirements=True) -] - -mission_orders = [ - vanilla_shuffle_order, - vanilla_shuffle_order, - mini_campaign_order, - grid_order, - mini_grid_order, - blitz_order, - gauntlet_order, - mini_gauntlet_order, - tiny_grid_order -] - - -vanilla_mission_req_table = { - "Liberation Day": MissionInfo(1, [], "Mar Sara", completion_critical=True), - "The Outlaws": MissionInfo(2, [1], "Mar Sara", completion_critical=True), - "Zero Hour": MissionInfo(3, [2], "Mar Sara", completion_critical=True), - "Evacuation": MissionInfo(4, [3], "Colonist"), - "Outbreak": MissionInfo(5, [4], "Colonist"), - "Safe Haven": MissionInfo(6, [5], "Colonist", number=7), - "Haven's Fall": MissionInfo(7, [5], "Colonist", number=7), - "Smash and Grab": MissionInfo(8, [3], "Artifact", completion_critical=True), - "The Dig": MissionInfo(9, [8], "Artifact", number=8, completion_critical=True), - "The Moebius Factor": MissionInfo(10, [9], "Artifact", number=11, completion_critical=True), - "Supernova": MissionInfo(11, [10], "Artifact", number=14, completion_critical=True), - "Maw of the Void": MissionInfo(12, [11], "Artifact", completion_critical=True), - "Devil's Playground": MissionInfo(13, [3], "Covert", number=4), - "Welcome to the Jungle": MissionInfo(14, [13], "Covert"), - "Breakout": MissionInfo(15, [14], "Covert", number=8), - "Ghost of a Chance": MissionInfo(16, [14], "Covert", number=8), - "The Great Train Robbery": MissionInfo(17, [3], "Rebellion", number=6), - "Cutthroat": MissionInfo(18, [17], "Rebellion"), - "Engine of Destruction": MissionInfo(19, [18], "Rebellion"), - "Media Blitz": MissionInfo(20, [19], "Rebellion"), - "Piercing the Shroud": MissionInfo(21, [20], "Rebellion"), - "Whispers of Doom": MissionInfo(22, [9], "Prophecy"), - "A Sinister Turn": MissionInfo(23, [22], "Prophecy"), - "Echoes of the Future": MissionInfo(24, [23], "Prophecy"), - "In Utter Darkness": MissionInfo(25, [24], "Prophecy"), - "Gates of Hell": MissionInfo(26, [12], "Char", completion_critical=True), - "Belly of the Beast": MissionInfo(27, [26], "Char", completion_critical=True), - "Shatter the Sky": MissionInfo(28, [26], "Char", completion_critical=True), - "All-In": MissionInfo(29, [27, 28], "Char", completion_critical=True, or_requirements=True) -} - -lookup_id_to_mission: Dict[int, str] = { - data.id: mission_name for mission_name, data in vanilla_mission_req_table.items() if data.id} - -starting_mission_locations = { - "Liberation Day": "Liberation Day: Victory", - "Breakout": "Breakout: Victory", - "Ghost of a Chance": "Ghost of a Chance: Victory", - "Piercing the Shroud": "Piercing the Shroud: Victory", - "Whispers of Doom": "Whispers of Doom: Victory", - "Belly of the Beast": "Belly of the Beast: Victory", - "Zero Hour": "Zero Hour: First Group Rescued", - "Evacuation": "Evacuation: Reach Hanson", - "Devil's Playground": "Devil's Playground: Tosh's Miners", - "Smash and Grab": "Smash and Grab: First Relic", - "The Great Train Robbery": "The Great Train Robbery: North Defiler" -} - - -alt_final_mission_locations = { - "Maw of the Void": "Maw of the Void: Victory", - "Engine of Destruction": "Engine of Destruction: Victory", - "Supernova": "Supernova: Victory", - "Gates of Hell": "Gates of Hell: Victory", - "Shatter the Sky": "Shatter the Sky: Victory" -} \ No newline at end of file diff --git a/worlds/sc2wol/Options.py b/worlds/sc2wol/Options.py deleted file mode 100644 index e4b6a740669a..000000000000 --- a/worlds/sc2wol/Options.py +++ /dev/null @@ -1,362 +0,0 @@ -from typing import Dict, FrozenSet, Union -from BaseClasses import MultiWorld -from Options import Choice, Option, Toggle, DefaultOnToggle, ItemSet, OptionSet, Range -from .MissionTables import vanilla_mission_req_table - -ORDER_VANILLA = 0 -ORDER_VANILLA_SHUFFLED = 1 - -class GameDifficulty(Choice): - """ - The difficulty of the campaign, affects enemy AI, starting units, and game speed. - - For those unfamiliar with the Archipelago randomizer, the recommended settings are one difficulty level - lower than the vanilla game - """ - display_name = "Game Difficulty" - option_casual = 0 - option_normal = 1 - option_hard = 2 - option_brutal = 3 - default = 1 - -class GameSpeed(Choice): - """Optional setting to override difficulty-based game speed.""" - display_name = "Game Speed" - option_default = 0 - option_slower = 1 - option_slow = 2 - option_normal = 3 - option_fast = 4 - option_faster = 5 - default = option_default - -class FinalMap(Choice): - """ - Determines if the final map and goal of the campaign. - All in: You need to beat All-in map - Random Hard: A random hard mission is selected as a goal. - Beat this mission in order to complete the game. - All-in map won't be in the campaign - - Vanilla mission order always ends with All in mission! - - Warning: Using All-in with a short mission order (7 or fewer missions) is not recommended, - as there might not be enough locations to place all the required items, - any excess required items will be placed into the player's starting inventory! - - This option is short-lived. It may be changed in the future - """ - display_name = "Final Map" - option_all_in = 0 - option_random_hard = 1 - -class AllInMap(Choice): - """Determines what version of All-In (final map) that will be generated for the campaign.""" - display_name = "All In Map" - option_ground = 0 - option_air = 1 - - -class MissionOrder(Choice): - """ - Determines the order the missions are played in. The last three mission orders end in a random mission. - Vanilla (29): Keeps the standard mission order and branching from the WoL Campaign. - Vanilla Shuffled (29): Keeps same branching paths from the WoL Campaign but randomizes the order of missions within. - Mini Campaign (15): Shorter version of the campaign with randomized missions and optional branches. - Grid (16): A 4x4 grid of random missions. Start at the top-left and forge a path towards bottom-right mission to win. - Mini Grid (9): A 3x3 version of Grid. Complete the bottom-right mission to win. - Blitz (12): 12 random missions that open up very quickly. Complete the bottom-right mission to win. - Gauntlet (7): Linear series of 7 random missions to complete the campaign. - Mini Gauntlet (4): Linear series of 4 random missions to complete the campaign. - Tiny Grid (4): A 2x2 version of Grid. Complete the bottom-right mission to win. - """ - display_name = "Mission Order" - option_vanilla = 0 - option_vanilla_shuffled = 1 - option_mini_campaign = 2 - option_grid = 3 - option_mini_grid = 4 - option_blitz = 5 - option_gauntlet = 6 - option_mini_gauntlet = 7 - option_tiny_grid = 8 - - -class PlayerColor(Choice): - """Determines in-game team color.""" - display_name = "Player Color" - option_white = 0 - option_red = 1 - option_blue = 2 - option_teal = 3 - option_purple = 4 - option_yellow = 5 - option_orange = 6 - option_green = 7 - option_light_pink = 8 - option_violet = 9 - option_light_grey = 10 - option_dark_green = 11 - option_brown = 12 - option_light_green = 13 - option_dark_grey = 14 - option_pink = 15 - option_rainbow = 16 - option_default = 17 - default = option_default - - -class ShuffleProtoss(DefaultOnToggle): - """Determines if the 3 protoss missions are included in the shuffle if Vanilla mission order is not enabled. - If turned off, the 3 protoss missions will not appear and Protoss units are removed from the pool.""" - display_name = "Shuffle Protoss Missions" - - -class ShuffleNoBuild(DefaultOnToggle): - """Determines if the 5 no-build missions are included in the shuffle if Vanilla mission order is not enabled. - If turned off, the 5 no-build missions will not appear.""" - display_name = "Shuffle No-Build Missions" - - -class EarlyUnit(DefaultOnToggle): - """ - Guarantees that the first mission will contain a unit. - - Each mission available to be the first mission has a pre-defined location where the unit should spawn. - This location gets overriden over any exclusion. It's guaranteed to be reachable with an empty inventory. - """ - display_name = "Early Unit" - - -class RequiredTactics(Choice): - """Determines the maximum tactical difficulty of the seed (separate from mission difficulty). Higher settings - increase randomness. - - Standard: All missions can be completed with good micro and macro. - Advanced: Completing missions may require relying on starting units and micro-heavy units. - No Logic: Units and upgrades may be placed anywhere. LIKELY TO RENDER THE RUN IMPOSSIBLE ON HARDER DIFFICULTIES!""" - display_name = "Required Tactics" - option_standard = 0 - option_advanced = 1 - option_no_logic = 2 - - -class UnitsAlwaysHaveUpgrades(DefaultOnToggle): - """ - If turned on, all upgrades will be present for each unit and structure in the seed. - This usually results in fewer units. - - See also: Max Number of Upgrades - """ - display_name = "Units Always Have Upgrades" - - -class GenericUpgradeMissions(Range): - """Determines the percentage of missions in the mission order that must be completed before - level 1 of all weapon and armor upgrades is unlocked. Level 2 upgrades require double the amount of missions, - and level 3 requires triple the amount. The required amounts are always rounded down. - If set to 0, upgrades are instead added to the item pool and must be found to be used.""" - display_name = "Generic Upgrade Missions" - range_start = 0 - range_end = 100 - default = 0 - - -class GenericUpgradeResearch(Choice): - """Determines how weapon and armor upgrades affect missions once unlocked. - - Vanilla: Upgrades must be researched as normal. - Auto In No-Build: In No-Build missions, upgrades are automatically researched. - In all other missions, upgrades must be researched as normal. - Auto In Build: In No-Build missions, upgrades are unavailable as normal. - In all other missions, upgrades are automatically researched. - Always Auto: Upgrades are automatically researched in all missions.""" - display_name = "Generic Upgrade Research" - option_vanilla = 0 - option_auto_in_no_build = 1 - option_auto_in_build = 2 - option_always_auto = 3 - - -class GenericUpgradeItems(Choice): - """Determines how weapon and armor upgrades are split into items. All options produce 3 levels of each item. - Does nothing if upgrades are unlocked by completed mission counts. - - Individual Items: All weapon and armor upgrades are each an item, - resulting in 18 total upgrade items. - Bundle Weapon And Armor: All types of weapon upgrades are one item, - and all types of armor upgrades are one item, - resulting in 6 total items. - Bundle Unit Class: Weapon and armor upgrades are merged, - but Infantry, Vehicle, and Starship upgrades are bundled separately, - resulting in 9 total items. - Bundle All: All weapon and armor upgrades are one item, - resulting in 3 total items.""" - display_name = "Generic Upgrade Items" - option_individual_items = 0 - option_bundle_weapon_and_armor = 1 - option_bundle_unit_class = 2 - option_bundle_all = 3 - - -class NovaCovertOpsItems(Toggle): - """If turned on, the equipment upgrades from Nova Covert Ops may be present in the world.""" - display_name = "Nova Covert Ops Items" - default = Toggle.option_true - - -class BroodWarItems(Toggle): - """If turned on, returning items from StarCraft: Brood War may appear in the world.""" - display_name = "Brood War Items" - default = Toggle.option_true - - -class ExtendedItems(Toggle): - """If turned on, original items that did not appear in Campaign mode may appear in the world.""" - display_name = "Extended Items" - default = Toggle.option_true - - -class MaxNumberOfUpgrades(Range): - """ - Set a maximum to the number of upgrades a unit/structure can have. -1 is used to define unlimited. - Note that most unit have 4 or 6 upgrades. - - If used with Units Always Have Upgrades, each unit has this given amount of upgrades (if there enough upgrades exist) - - See also: Units Always Have Upgrades - """ - display_name = "Maximum number of upgrades per unit/structure" - range_start = -1 - # Do not know the maximum, but it is less than 123! - range_end = 123 - default = -1 - - -class LockedItems(ItemSet): - """Guarantees that these items will be unlockable""" - display_name = "Locked Items" - - -class ExcludedItems(ItemSet): - """Guarantees that these items will not be unlockable""" - display_name = "Excluded Items" - - -class ExcludedMissions(OptionSet): - """Guarantees that these missions will not appear in the campaign - Doesn't apply to vanilla mission order. - It may be impossible to build a valid campaign if too many missions are excluded.""" - display_name = "Excluded Missions" - valid_keys = {mission_name for mission_name in vanilla_mission_req_table.keys() if mission_name != 'All-In'} - - -class LocationInclusion(Choice): - option_enabled = 0 - option_trash = 1 - option_nothing = 2 - - -class MissionProgressLocations(LocationInclusion): - """ - Enables or disables item rewards for progressing (not finishing) a mission. - Progressing a mission is usually a task of completing or progressing into a main objective. - Clearing an expansion base also counts here. - - Enabled: All locations fitting into this do their normal rewards - Trash: Forces a trash item in - Nothing: No rewards for this type of tasks, effectively disabling such locations - - Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. - See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) - """ - display_name = "Mission Progress Locations" - - -class BonusLocations(LocationInclusion): - """ - Enables or disables item rewards for completing bonus tasks. - Bonus tasks are those giving you a campaign-wide or mission-wide bonus in vanilla game: - Research, credits, bonus units or resources, etc. - - Enabled: All locations fitting into this do their normal rewards - Trash: Forces a trash item in - Nothing: No rewards for this type of tasks, effectively disabling such locations - - Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. - See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) - """ - display_name = "Bonus Locations" - - -class ChallengeLocations(LocationInclusion): - """ - Enables or disables item rewards for completing challenge tasks. - Challenges are tasks that have usually higher requirements to be completed - than to complete the mission they're in successfully. - You might be required to visit the same mission later when getting stronger in order to finish these tasks. - - Enabled: All locations fitting into this do their normal rewards - Trash: Forces a trash item in - Nothing: No rewards for this type of tasks, effectively disabling such locations - - Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. - See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) - """ - display_name = "Challenge Locations" - - -class OptionalBossLocations(LocationInclusion): - """ - Enables or disables item rewards for defeating optional bosses. - An optional boss is any boss that's not required to kill in order to finish the mission successfully. - All Brutalisks, Loki, etc. belongs here. - - Enabled: All locations fitting into this do their normal rewards - Trash: Forces a trash item in - Nothing: No rewards for this type of tasks, effectively disabling such locations - - Note: Individual locations subject to plando are always enabled, so the plando can be placed properly. - See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando) - """ - display_name = "Optional Boss Locations" - - -# noinspection PyTypeChecker -sc2wol_options: Dict[str, Option] = { - "game_difficulty": GameDifficulty, - "game_speed": GameSpeed, - "all_in_map": AllInMap, - "final_map": FinalMap, - "mission_order": MissionOrder, - "player_color": PlayerColor, - "shuffle_protoss": ShuffleProtoss, - "shuffle_no_build": ShuffleNoBuild, - "early_unit": EarlyUnit, - "required_tactics": RequiredTactics, - "units_always_have_upgrades": UnitsAlwaysHaveUpgrades, - "max_number_of_upgrades": MaxNumberOfUpgrades, - "generic_upgrade_missions": GenericUpgradeMissions, - "generic_upgrade_research": GenericUpgradeResearch, - "generic_upgrade_items": GenericUpgradeItems, - "locked_items": LockedItems, - "excluded_items": ExcludedItems, - "excluded_missions": ExcludedMissions, - "nco_items": NovaCovertOpsItems, - "bw_items": BroodWarItems, - "ext_items": ExtendedItems, - "mission_progress_locations": MissionProgressLocations, - "bonus_locations": BonusLocations, - "challenge_locations": ChallengeLocations, - "optional_boss_locations": OptionalBossLocations -} - - -def get_option_value(multiworld: MultiWorld, player: int, name: str) -> Union[int, FrozenSet]: - if multiworld is None: - return sc2wol_options[name].default - - player_option = getattr(multiworld, name)[player] - - return player_option.value diff --git a/worlds/sc2wol/PoolFilter.py b/worlds/sc2wol/PoolFilter.py deleted file mode 100644 index 23422a3d1ea5..000000000000 --- a/worlds/sc2wol/PoolFilter.py +++ /dev/null @@ -1,367 +0,0 @@ -from typing import Callable, Dict, List, Set -from BaseClasses import MultiWorld, ItemClassification, Item, Location -from .Items import get_full_item_list, spider_mine_sources, second_pass_placeable_items, filler_items, \ - progressive_if_nco -from .MissionTables import no_build_regions_list, easy_regions_list, medium_regions_list, hard_regions_list,\ - mission_orders, MissionInfo, alt_final_mission_locations, MissionPools -from .Options import get_option_value, MissionOrder, FinalMap, MissionProgressLocations, LocationInclusion -from .LogicMixin import SC2WoLLogic - -# Items with associated upgrades -UPGRADABLE_ITEMS = [ - "Marine", "Medic", "Firebat", "Marauder", "Reaper", "Ghost", "Spectre", - "Hellion", "Vulture", "Goliath", "Diamondback", "Siege Tank", "Thor", "Predator", "Widow Mine", "Cyclone", - "Medivac", "Wraith", "Viking", "Banshee", "Battlecruiser", "Raven", "Science Vessel", "Liberator", "Valkyrie", - "Bunker", "Missile Turret" -] - -BARRACKS_UNITS = {"Marine", "Medic", "Firebat", "Marauder", "Reaper", "Ghost", "Spectre"} -FACTORY_UNITS = {"Hellion", "Vulture", "Goliath", "Diamondback", "Siege Tank", "Thor", "Predator", "Widow Mine", "Cyclone"} -STARPORT_UNITS = {"Medivac", "Wraith", "Viking", "Banshee", "Battlecruiser", "Hercules", "Science Vessel", "Raven", "Liberator", "Valkyrie"} - -PROTOSS_REGIONS = {"A Sinister Turn", "Echoes of the Future", "In Utter Darkness"} - - -def filter_missions(multiworld: MultiWorld, player: int) -> Dict[int, List[str]]: - """ - Returns a semi-randomly pruned tuple of no-build, easy, medium, and hard mission sets - """ - - mission_order_type = get_option_value(multiworld, player, "mission_order") - shuffle_no_build = get_option_value(multiworld, player, "shuffle_no_build") - shuffle_protoss = get_option_value(multiworld, player, "shuffle_protoss") - excluded_missions = get_option_value(multiworld, player, "excluded_missions") - final_map = get_option_value(multiworld, player, "final_map") - mission_pools = { - MissionPools.STARTER: no_build_regions_list[:], - MissionPools.EASY: easy_regions_list[:], - MissionPools.MEDIUM: medium_regions_list[:], - MissionPools.HARD: hard_regions_list[:], - MissionPools.FINAL: [] - } - if mission_order_type == MissionOrder.option_vanilla: - # Vanilla uses the entire mission pool - mission_pools[MissionPools.FINAL] = ['All-In'] - return mission_pools - # Omitting No-Build missions if not shuffling no-build - if not shuffle_no_build: - excluded_missions = excluded_missions.union(no_build_regions_list) - # Omitting Protoss missions if not shuffling protoss - if not shuffle_protoss: - excluded_missions = excluded_missions.union(PROTOSS_REGIONS) - # Replacing All-In with alternate ending depending on option - if final_map == FinalMap.option_random_hard: - final_mission = multiworld.random.choice([mission for mission in alt_final_mission_locations.keys() if mission not in excluded_missions]) - excluded_missions.add(final_mission) - else: - final_mission = 'All-In' - # Excluding missions - for difficulty, mission_pool in mission_pools.items(): - mission_pools[difficulty] = [mission for mission in mission_pool if mission not in excluded_missions] - mission_pools[MissionPools.FINAL].append(final_mission) - # Mission pool changes on Build-Only - if not get_option_value(multiworld, player, 'shuffle_no_build'): - def move_mission(mission_name, current_pool, new_pool): - if mission_name in mission_pools[current_pool]: - mission_pools[current_pool].remove(mission_name) - mission_pools[new_pool].append(mission_name) - # Replacing No Build missions with Easy missions - move_mission("Zero Hour", MissionPools.EASY, MissionPools.STARTER) - move_mission("Evacuation", MissionPools.EASY, MissionPools.STARTER) - move_mission("Devil's Playground", MissionPools.EASY, MissionPools.STARTER) - # Pushing Outbreak to Normal, as it cannot be placed as the second mission on Build-Only - move_mission("Outbreak", MissionPools.EASY, MissionPools.MEDIUM) - # Pushing extra Normal missions to Easy - move_mission("The Great Train Robbery", MissionPools.MEDIUM, MissionPools.EASY) - move_mission("Echoes of the Future", MissionPools.MEDIUM, MissionPools.EASY) - move_mission("Cutthroat", MissionPools.MEDIUM, MissionPools.EASY) - # Additional changes on Advanced Tactics - if get_option_value(multiworld, player, "required_tactics") > 0: - move_mission("The Great Train Robbery", MissionPools.EASY, MissionPools.STARTER) - move_mission("Smash and Grab", MissionPools.EASY, MissionPools.STARTER) - move_mission("Moebius Factor", MissionPools.MEDIUM, MissionPools.EASY) - move_mission("Welcome to the Jungle", MissionPools.MEDIUM, MissionPools.EASY) - move_mission("Engine of Destruction", MissionPools.HARD, MissionPools.MEDIUM) - - return mission_pools - - -def get_item_upgrades(inventory: List[Item], parent_item: Item or str): - item_name = parent_item.name if isinstance(parent_item, Item) else parent_item - return [ - inv_item for inv_item in inventory - if get_full_item_list()[inv_item.name].parent_item == item_name - ] - - -def get_item_quantity(item: Item, multiworld: MultiWorld, player: int): - if (not get_option_value(multiworld, player, "nco_items")) \ - and item.name in progressive_if_nco: - return 1 - return get_full_item_list()[item.name].quantity - - -def copy_item(item: Item): - return Item(item.name, item.classification, item.code, item.player) - - -class ValidInventory: - - def has(self, item: str, player: int): - return item in self.logical_inventory - - def has_any(self, items: Set[str], player: int): - return any(item in self.logical_inventory for item in items) - - def has_all(self, items: Set[str], player: int): - return all(item in self.logical_inventory for item in items) - - def has_units_per_structure(self) -> bool: - return len(BARRACKS_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure and \ - len(FACTORY_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure and \ - len(STARPORT_UNITS.intersection(self.logical_inventory)) > self.min_units_per_structure - - def generate_reduced_inventory(self, inventory_size: int, mission_requirements: List[Callable]) -> List[Item]: - """Attempts to generate a reduced inventory that can fulfill the mission requirements.""" - inventory = list(self.item_pool) - locked_items = list(self.locked_items) - self.logical_inventory = { - item.name for item in inventory + locked_items + self.existing_items - if item.classification in (ItemClassification.progression, ItemClassification.progression_skip_balancing) - } - requirements = mission_requirements - cascade_keys = self.cascade_removal_map.keys() - units_always_have_upgrades = get_option_value(self.multiworld, self.player, "units_always_have_upgrades") - - def attempt_removal(item: Item) -> bool: - # If item can be removed and has associated items, remove them as well - inventory.remove(item) - # Only run logic checks when removing logic items - if item.name in self.logical_inventory: - self.logical_inventory.remove(item.name) - if not all(requirement(self) for requirement in requirements): - # If item cannot be removed, lock or revert - self.logical_inventory.add(item.name) - for _ in range(get_item_quantity(item, self.multiworld, self.player)): - locked_items.append(copy_item(item)) - return False - return True - - # Limit the maximum number of upgrades - maxUpgrad = get_option_value(self.multiworld, self.player, - "max_number_of_upgrades") - if maxUpgrad != -1: - unit_avail_upgrades = {} - # Needed to take into account locked/existing items - unit_nb_upgrades = {} - for item in inventory: - cItem = get_full_item_list()[item.name] - if cItem.type in UPGRADABLE_ITEMS and item.name not in unit_avail_upgrades: - unit_avail_upgrades[item.name] = [] - unit_nb_upgrades[item.name] = 0 - elif cItem.parent_item is not None: - if cItem.parent_item not in unit_avail_upgrades: - unit_avail_upgrades[cItem.parent_item] = [item] - unit_nb_upgrades[cItem.parent_item] = 1 - else: - unit_avail_upgrades[cItem.parent_item].append(item) - unit_nb_upgrades[cItem.parent_item] += 1 - # For those two categories, we count them but dont include them in removal - for item in locked_items + self.existing_items: - cItem = get_full_item_list()[item.name] - if cItem.type in UPGRADABLE_ITEMS and item.name not in unit_avail_upgrades: - unit_avail_upgrades[item.name] = [] - unit_nb_upgrades[item.name] = 0 - elif cItem.parent_item is not None: - if cItem.parent_item not in unit_avail_upgrades: - unit_nb_upgrades[cItem.parent_item] = 1 - else: - unit_nb_upgrades[cItem.parent_item] += 1 - # Making sure that the upgrades being removed is random - # Currently, only for combat shield vs Stabilizer Medpacks... - shuffled_unit_upgrade_list = list(unit_avail_upgrades.keys()) - self.multiworld.random.shuffle(shuffled_unit_upgrade_list) - for unit in shuffled_unit_upgrade_list: - while (unit_nb_upgrades[unit] > maxUpgrad) \ - and (len(unit_avail_upgrades[unit]) > 0): - itemCandidate = self.multiworld.random.choice(unit_avail_upgrades[unit]) - _ = attempt_removal(itemCandidate) - # Whatever it succeed to remove the iventory or it fails and thus - # lock it, the upgrade is no longer available for removal - unit_avail_upgrades[unit].remove(itemCandidate) - unit_nb_upgrades[unit] -= 1 - - # Locking associated items for items that have already been placed when units_always_have_upgrades is on - if units_always_have_upgrades: - existing_items = set(self.existing_items[:] + locked_items) - while existing_items: - existing_item = existing_items.pop() - items_to_lock = self.cascade_removal_map.get(existing_item, [existing_item]) - if get_full_item_list()[existing_item.name].type != "Upgrade": - # Don't process general upgrades, they may have been pre-locked per-level - for item in items_to_lock: - if item in inventory: - item_quantity = inventory.count(item) - # Unit upgrades, lock all levels - for _ in range(item_quantity): - inventory.remove(item) - if item not in locked_items: - # Lock all the associated items if not already locked - for _ in range(item_quantity): - locked_items.append(copy_item(item)) - if item in existing_items: - existing_items.remove(item) - - if self.min_units_per_structure > 0 and self.has_units_per_structure(): - requirements.append(lambda state: state.has_units_per_structure()) - - # Determining if the full-size inventory can complete campaign - if not all(requirement(self) for requirement in requirements): - raise Exception("Too many items excluded - campaign is impossible to complete.") - - while len(inventory) + len(locked_items) > inventory_size: - if len(inventory) == 0: - # There are more items than locations and all of them are already locked due to YAML or logic. - # Random items from locked ones will go to starting items - self.multiworld.random.shuffle(locked_items) - while len(locked_items) > inventory_size: - item: Item = locked_items.pop() - self.multiworld.push_precollected(item) - break - # Select random item from removable items - item = self.multiworld.random.choice(inventory) - # Cascade removals to associated items - if item in cascade_keys: - items_to_remove = self.cascade_removal_map[item] - transient_items = [] - cascade_failure = False - while len(items_to_remove) > 0: - item_to_remove = items_to_remove.pop() - transient_items.append(item_to_remove) - if item_to_remove not in inventory: - if units_always_have_upgrades and item_to_remove in locked_items: - cascade_failure = True - break - else: - continue - success = attempt_removal(item_to_remove) - if not success and units_always_have_upgrades: - cascade_failure = True - transient_items += items_to_remove - break - # Lock all associated items if any of them cannot be removed on Units Always Have Upgrades - if cascade_failure: - for transient_item in transient_items: - if transient_item in inventory: - for _ in range(inventory.count(transient_item)): - inventory.remove(transient_item) - if transient_item not in locked_items: - for _ in range(get_item_quantity(transient_item, self.multiworld, self.player)): - locked_items.append(copy_item(transient_item)) - if transient_item.classification in (ItemClassification.progression, ItemClassification.progression_skip_balancing): - self.logical_inventory.add(transient_item.name) - else: - attempt_removal(item) - - if not spider_mine_sources & self.logical_inventory: - inventory = [item for item in inventory if not item.name.endswith("(Spider Mine)")] - if not BARRACKS_UNITS & self.logical_inventory: - inventory = [item for item in inventory if - not (item.name.startswith("Progressive Infantry") or item.name == "Orbital Strike")] - if not FACTORY_UNITS & self.logical_inventory: - inventory = [item for item in inventory if not item.name.startswith("Progressive Vehicle")] - if not STARPORT_UNITS & self.logical_inventory: - inventory = [item for item in inventory if not item.name.startswith("Progressive Ship")] - - # Cull finished, adding locked items back into inventory - inventory += locked_items - - # Replacing empty space with generically useful items - replacement_items = [item for item in self.item_pool - if (item not in inventory - and item not in self.locked_items - and item.name in second_pass_placeable_items)] - self.multiworld.random.shuffle(replacement_items) - while len(inventory) < inventory_size and len(replacement_items) > 0: - item = replacement_items.pop() - inventory.append(item) - - return inventory - - def _read_logic(self): - self._sc2wol_has_common_unit = lambda world, player: SC2WoLLogic._sc2wol_has_common_unit(self, world, player) - self._sc2wol_has_air = lambda world, player: SC2WoLLogic._sc2wol_has_air(self, world, player) - self._sc2wol_has_air_anti_air = lambda world, player: SC2WoLLogic._sc2wol_has_air_anti_air(self, world, player) - self._sc2wol_has_competent_anti_air = lambda world, player: SC2WoLLogic._sc2wol_has_competent_anti_air(self, world, player) - self._sc2wol_has_competent_ground_to_air = lambda world, player: SC2WoLLogic._sc2wol_has_competent_ground_to_air(self, world, player) - self._sc2wol_has_anti_air = lambda world, player: SC2WoLLogic._sc2wol_has_anti_air(self, world, player) - self._sc2wol_defense_rating = lambda world, player, zerg_enemy, air_enemy=False: SC2WoLLogic._sc2wol_defense_rating(self, world, player, zerg_enemy, air_enemy) - self._sc2wol_has_competent_comp = lambda world, player: SC2WoLLogic._sc2wol_has_competent_comp(self, world, player) - self._sc2wol_has_train_killers = lambda world, player: SC2WoLLogic._sc2wol_has_train_killers(self, world, player) - self._sc2wol_able_to_rescue = lambda world, player: SC2WoLLogic._sc2wol_able_to_rescue(self, world, player) - self._sc2wol_beats_protoss_deathball = lambda world, player: SC2WoLLogic._sc2wol_beats_protoss_deathball(self, world, player) - self._sc2wol_survives_rip_field = lambda world, player: SC2WoLLogic._sc2wol_survives_rip_field(self, world, player) - self._sc2wol_has_protoss_common_units = lambda world, player: SC2WoLLogic._sc2wol_has_protoss_common_units(self, world, player) - self._sc2wol_has_protoss_medium_units = lambda world, player: SC2WoLLogic._sc2wol_has_protoss_medium_units(self, world, player) - self._sc2wol_has_mm_upgrade = lambda world, player: SC2WoLLogic._sc2wol_has_mm_upgrade(self, world, player) - self._sc2wol_welcome_to_the_jungle_requirement = lambda world, player: SC2WoLLogic._sc2wol_welcome_to_the_jungle_requirement(self, world, player) - self._sc2wol_can_respond_to_colony_infestations = lambda world, player: SC2WoLLogic._sc2wol_can_respond_to_colony_infestations(self, world, player) - self._sc2wol_final_mission_requirements = lambda world, player: SC2WoLLogic._sc2wol_final_mission_requirements(self, world, player) - - def __init__(self, multiworld: MultiWorld, player: int, - item_pool: List[Item], existing_items: List[Item], locked_items: List[Item], - has_protoss: bool): - self.multiworld = multiworld - self.player = player - self.logical_inventory = set() - self.locked_items = locked_items[:] - self.existing_items = existing_items - self._read_logic() - # Initial filter of item pool - self.item_pool = [] - item_quantities: dict[str, int] = dict() - # Inventory restrictiveness based on number of missions with checks - mission_order_type = get_option_value(self.multiworld, self.player, "mission_order") - mission_count = len(mission_orders[mission_order_type]) - 1 - self.min_units_per_structure = int(mission_count / 7) - min_upgrades = 1 if mission_count < 10 else 2 - for item in item_pool: - item_info = get_full_item_list()[item.name] - if item_info.type == "Upgrade": - # Locking upgrades based on mission duration - if item.name not in item_quantities: - item_quantities[item.name] = 0 - item_quantities[item.name] += 1 - if item_quantities[item.name] < min_upgrades: - self.locked_items.append(item) - else: - self.item_pool.append(item) - elif item_info.type == "Goal": - locked_items.append(item) - elif item_info.type != "Protoss" or has_protoss: - self.item_pool.append(item) - self.cascade_removal_map: Dict[Item, List[Item]] = dict() - for item in self.item_pool + locked_items + existing_items: - if item.name in UPGRADABLE_ITEMS: - upgrades = get_item_upgrades(self.item_pool, item) - associated_items = [*upgrades, item] - self.cascade_removal_map[item] = associated_items - if get_option_value(multiworld, player, "units_always_have_upgrades"): - for upgrade in upgrades: - self.cascade_removal_map[upgrade] = associated_items - - -def filter_items(multiworld: MultiWorld, player: int, mission_req_table: Dict[str, MissionInfo], location_cache: List[Location], - item_pool: List[Item], existing_items: List[Item], locked_items: List[Item]) -> List[Item]: - """ - Returns a semi-randomly pruned set of items based on number of available locations. - The returned inventory must be capable of logically accessing every location in the world. - """ - open_locations = [location for location in location_cache if location.item is None] - inventory_size = len(open_locations) - has_protoss = bool(PROTOSS_REGIONS.intersection(mission_req_table.keys())) - mission_requirements = [location.access_rule for location in location_cache] - valid_inventory = ValidInventory(multiworld, player, item_pool, existing_items, locked_items, has_protoss) - - valid_items = valid_inventory.generate_reduced_inventory(inventory_size, mission_requirements) - return valid_items diff --git a/worlds/sc2wol/Regions.py b/worlds/sc2wol/Regions.py deleted file mode 100644 index f588ce7e982e..000000000000 --- a/worlds/sc2wol/Regions.py +++ /dev/null @@ -1,313 +0,0 @@ -from typing import List, Set, Dict, Tuple, Optional, Callable -from BaseClasses import MultiWorld, Region, Entrance, Location -from .Locations import LocationData -from .Options import get_option_value, MissionOrder -from .MissionTables import MissionInfo, mission_orders, vanilla_mission_req_table, alt_final_mission_locations, \ - MissionPools, vanilla_shuffle_order -from .PoolFilter import filter_missions - -PROPHECY_CHAIN_MISSION_COUNT = 4 - -VANILLA_SHUFFLED_FIRST_PROPHECY_MISSION = 21 - -def create_regions(multiworld: MultiWorld, player: int, locations: Tuple[LocationData, ...], location_cache: List[Location])\ - -> Tuple[Dict[str, MissionInfo], int, str]: - locations_per_region = get_locations_per_region(locations) - - mission_order_type = get_option_value(multiworld, player, "mission_order") - mission_order = mission_orders[mission_order_type] - - mission_pools = filter_missions(multiworld, player) - - regions = [create_region(multiworld, player, locations_per_region, location_cache, "Menu")] - - names: Dict[str, int] = {} - - if mission_order_type == MissionOrder.option_vanilla: - - # Generating all regions and locations - for region_name in vanilla_mission_req_table.keys(): - regions.append(create_region(multiworld, player, locations_per_region, location_cache, region_name)) - multiworld.regions += regions - - connect(multiworld, player, names, 'Menu', 'Liberation Day'), - connect(multiworld, player, names, 'Liberation Day', 'The Outlaws', - lambda state: state.has("Beat Liberation Day", player)), - connect(multiworld, player, names, 'The Outlaws', 'Zero Hour', - lambda state: state.has("Beat The Outlaws", player)), - connect(multiworld, player, names, 'Zero Hour', 'Evacuation', - lambda state: state.has("Beat Zero Hour", player)), - connect(multiworld, player, names, 'Evacuation', 'Outbreak', - lambda state: state.has("Beat Evacuation", player)), - connect(multiworld, player, names, "Outbreak", "Safe Haven", - lambda state: state._sc2wol_cleared_missions(multiworld, player, 7) and - state.has("Beat Outbreak", player)), - connect(multiworld, player, names, "Outbreak", "Haven's Fall", - lambda state: state._sc2wol_cleared_missions(multiworld, player, 7) and - state.has("Beat Outbreak", player)), - connect(multiworld, player, names, 'Zero Hour', 'Smash and Grab', - lambda state: state.has("Beat Zero Hour", player)), - connect(multiworld, player, names, 'Smash and Grab', 'The Dig', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 8) and - state.has("Beat Smash and Grab", player)), - connect(multiworld, player, names, 'The Dig', 'The Moebius Factor', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 11) and - state.has("Beat The Dig", player)), - connect(multiworld, player, names, 'The Moebius Factor', 'Supernova', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 14) and - state.has("Beat The Moebius Factor", player)), - connect(multiworld, player, names, 'Supernova', 'Maw of the Void', - lambda state: state.has("Beat Supernova", player)), - connect(multiworld, player, names, 'Zero Hour', "Devil's Playground", - lambda state: state._sc2wol_cleared_missions(multiworld, player, 4) and - state.has("Beat Zero Hour", player)), - connect(multiworld, player, names, "Devil's Playground", 'Welcome to the Jungle', - lambda state: state.has("Beat Devil's Playground", player)), - connect(multiworld, player, names, "Welcome to the Jungle", 'Breakout', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 8) and - state.has("Beat Welcome to the Jungle", player)), - connect(multiworld, player, names, "Welcome to the Jungle", 'Ghost of a Chance', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 8) and - state.has("Beat Welcome to the Jungle", player)), - connect(multiworld, player, names, "Zero Hour", 'The Great Train Robbery', - lambda state: state._sc2wol_cleared_missions(multiworld, player, 6) and - state.has("Beat Zero Hour", player)), - connect(multiworld, player, names, 'The Great Train Robbery', 'Cutthroat', - lambda state: state.has("Beat The Great Train Robbery", player)), - connect(multiworld, player, names, 'Cutthroat', 'Engine of Destruction', - lambda state: state.has("Beat Cutthroat", player)), - connect(multiworld, player, names, 'Engine of Destruction', 'Media Blitz', - lambda state: state.has("Beat Engine of Destruction", player)), - connect(multiworld, player, names, 'Media Blitz', 'Piercing the Shroud', - lambda state: state.has("Beat Media Blitz", player)), - connect(multiworld, player, names, 'The Dig', 'Whispers of Doom', - lambda state: state.has("Beat The Dig", player)), - connect(multiworld, player, names, 'Whispers of Doom', 'A Sinister Turn', - lambda state: state.has("Beat Whispers of Doom", player)), - connect(multiworld, player, names, 'A Sinister Turn', 'Echoes of the Future', - lambda state: state.has("Beat A Sinister Turn", player)), - connect(multiworld, player, names, 'Echoes of the Future', 'In Utter Darkness', - lambda state: state.has("Beat Echoes of the Future", player)), - connect(multiworld, player, names, 'Maw of the Void', 'Gates of Hell', - lambda state: state.has("Beat Maw of the Void", player)), - connect(multiworld, player, names, 'Gates of Hell', 'Belly of the Beast', - lambda state: state.has("Beat Gates of Hell", player)), - connect(multiworld, player, names, 'Gates of Hell', 'Shatter the Sky', - lambda state: state.has("Beat Gates of Hell", player)), - connect(multiworld, player, names, 'Gates of Hell', 'All-In', - lambda state: state.has('Beat Gates of Hell', player) and ( - state.has('Beat Shatter the Sky', player) or state.has('Beat Belly of the Beast', player))) - - return vanilla_mission_req_table, 29, 'All-In: Victory' - - else: - missions = [] - - remove_prophecy = mission_order_type == 1 and not get_option_value(multiworld, player, "shuffle_protoss") - - final_mission = mission_pools[MissionPools.FINAL][0] - - # Determining if missions must be removed - mission_pool_size = sum(len(mission_pool) for mission_pool in mission_pools.values()) - removals = len(mission_order) - mission_pool_size - # Removing entire Prophecy chain on vanilla shuffled when not shuffling protoss - if remove_prophecy: - removals -= PROPHECY_CHAIN_MISSION_COUNT - - # Initial fill out of mission list and marking all-in mission - for mission in mission_order: - # Removing extra missions if mission pool is too small - # Also handle lower removal priority than Prophecy - if 0 < mission.removal_priority <= removals or mission.category == 'Prophecy' and remove_prophecy \ - or (remove_prophecy and mission_order_type == MissionOrder.option_vanilla_shuffled - and mission.removal_priority > vanilla_shuffle_order[ - VANILLA_SHUFFLED_FIRST_PROPHECY_MISSION].removal_priority - and 0 < mission.removal_priority <= removals + PROPHECY_CHAIN_MISSION_COUNT): - missions.append(None) - elif mission.type == MissionPools.FINAL: - missions.append(final_mission) - else: - missions.append(mission.type) - - no_build_slots = [] - easy_slots = [] - medium_slots = [] - hard_slots = [] - - # Search through missions to find slots needed to fill - for i in range(len(missions)): - if missions[i] is None: - continue - if missions[i] == MissionPools.STARTER: - no_build_slots.append(i) - elif missions[i] == MissionPools.EASY: - easy_slots.append(i) - elif missions[i] == MissionPools.MEDIUM: - medium_slots.append(i) - elif missions[i] == MissionPools.HARD: - hard_slots.append(i) - - # Add no_build missions to the pool and fill in no_build slots - missions_to_add = mission_pools[MissionPools.STARTER] - if len(no_build_slots) > len(missions_to_add): - raise Exception("There are no valid No-Build missions. Please exclude fewer missions.") - for slot in no_build_slots: - filler = multiworld.random.randint(0, len(missions_to_add) - 1) - - missions[slot] = missions_to_add.pop(filler) - - # Add easy missions into pool and fill in easy slots - missions_to_add = missions_to_add + mission_pools[MissionPools.EASY] - if len(easy_slots) > len(missions_to_add): - raise Exception("There are not enough Easy missions to fill the campaign. Please exclude fewer missions.") - for slot in easy_slots: - filler = multiworld.random.randint(0, len(missions_to_add) - 1) - - missions[slot] = missions_to_add.pop(filler) - - # Add medium missions into pool and fill in medium slots - missions_to_add = missions_to_add + mission_pools[MissionPools.MEDIUM] - if len(medium_slots) > len(missions_to_add): - raise Exception("There are not enough Easy and Medium missions to fill the campaign. Please exclude fewer missions.") - for slot in medium_slots: - filler = multiworld.random.randint(0, len(missions_to_add) - 1) - - missions[slot] = missions_to_add.pop(filler) - - # Add hard missions into pool and fill in hard slots - missions_to_add = missions_to_add + mission_pools[MissionPools.HARD] - if len(hard_slots) > len(missions_to_add): - raise Exception("There are not enough missions to fill the campaign. Please exclude fewer missions.") - for slot in hard_slots: - filler = multiworld.random.randint(0, len(missions_to_add) - 1) - - missions[slot] = missions_to_add.pop(filler) - - # Generating regions and locations from selected missions - for region_name in missions: - regions.append(create_region(multiworld, player, locations_per_region, location_cache, region_name)) - multiworld.regions += regions - - # Mapping original mission slots to shifted mission slots when missions are removed - slot_map = [] - slot_offset = 0 - for position, mission in enumerate(missions): - slot_map.append(position - slot_offset + 1) - if mission is None: - slot_offset += 1 - - # Loop through missions to create requirements table and connect regions - # TODO: Handle 'and' connections - mission_req_table = {} - - def build_connection_rule(mission_names: List[str], missions_req: int) -> Callable: - if len(mission_names) > 1: - return lambda state: state.has_all({f"Beat {name}" for name in mission_names}, player) and \ - state._sc2wol_cleared_missions(multiworld, player, missions_req) - else: - return lambda state: state.has(f"Beat {mission_names[0]}", player) and \ - state._sc2wol_cleared_missions(multiworld, player, missions_req) - - for i, mission in enumerate(missions): - if mission is None: - continue - connections = [] - all_connections = [] - for connection in mission_order[i].connect_to: - if connection == -1: - continue - while missions[connection] is None: - connection -= 1 - all_connections.append(missions[connection]) - for connection in mission_order[i].connect_to: - required_mission = missions[connection] - if connection == -1: - connect(multiworld, player, names, "Menu", mission) - else: - if required_mission is None and not mission_order[i].completion_critical: # Drop non-critical null slots - continue - while required_mission is None: # Substituting null slot with prior slot - connection -= 1 - required_mission = missions[connection] - required_missions = [required_mission] if mission_order[i].or_requirements else all_connections - connect(multiworld, player, names, required_mission, mission, - build_connection_rule(required_missions, mission_order[i].number)) - connections.append(slot_map[connection]) - - mission_req_table.update({mission: MissionInfo( - vanilla_mission_req_table[mission].id, connections, mission_order[i].category, - number=mission_order[i].number, - completion_critical=mission_order[i].completion_critical, - or_requirements=mission_order[i].or_requirements)}) - - final_mission_id = vanilla_mission_req_table[final_mission].id - - # Changing the completion condition for alternate final missions into an event - if final_mission != 'All-In': - final_location = alt_final_mission_locations[final_mission] - # Final location should be near the end of the cache - for i in range(len(location_cache) - 1, -1, -1): - if location_cache[i].name == final_location: - location_cache[i].locked = True - location_cache[i].event = True - location_cache[i].address = None - break - else: - final_location = 'All-In: Victory' - - return mission_req_table, final_mission_id, final_location - -def create_location(player: int, location_data: LocationData, region: Region, - location_cache: List[Location]) -> Location: - location = Location(player, location_data.name, location_data.code, region) - location.access_rule = location_data.rule - - if id is None: - location.event = True - location.locked = True - - location_cache.append(location) - - return location - - -def create_region(multiworld: MultiWorld, player: int, locations_per_region: Dict[str, List[LocationData]], - location_cache: List[Location], name: str) -> Region: - region = Region(name, player, multiworld) - - if name in locations_per_region: - for location_data in locations_per_region[name]: - location = create_location(player, location_data, region, location_cache) - region.locations.append(location) - - return region - - -def connect(world: MultiWorld, player: int, used_names: Dict[str, int], source: str, target: str, - rule: Optional[Callable] = None): - sourceRegion = world.get_region(source, player) - targetRegion = world.get_region(target, player) - - if target not in used_names: - used_names[target] = 1 - name = target - else: - used_names[target] += 1 - name = target + (' ' * used_names[target]) - - connection = Entrance(player, name, sourceRegion) - - if rule: - connection.access_rule = rule - - sourceRegion.exits.append(connection) - connection.connect(targetRegion) - - -def get_locations_per_region(locations: Tuple[LocationData, ...]) -> Dict[str, List[LocationData]]: - per_region: Dict[str, List[LocationData]] = {} - - for location in locations: - per_region.setdefault(location.region, []).append(location) - - return per_region diff --git a/worlds/sc2wol/Starcraft2.kv b/worlds/sc2wol/Starcraft2.kv deleted file mode 100644 index f0785b89e428..000000000000 --- a/worlds/sc2wol/Starcraft2.kv +++ /dev/null @@ -1,16 +0,0 @@ -: - rows: 1 - -: - cols: 1 - padding: [10,5,10,5] - spacing: [0,5] - -: - text_size: self.size - markup: True - halign: 'center' - valign: 'middle' - padding: [5,0,5,0] - markup: True - outline_width: 1 diff --git a/worlds/sc2wol/__init__.py b/worlds/sc2wol/__init__.py deleted file mode 100644 index 5c487f8fee09..000000000000 --- a/worlds/sc2wol/__init__.py +++ /dev/null @@ -1,324 +0,0 @@ -import typing - -from typing import List, Set, Tuple, Dict -from BaseClasses import Item, MultiWorld, Location, Tutorial, ItemClassification -from worlds.AutoWorld import WebWorld, World -from .Items import StarcraftWoLItem, filler_items, item_name_groups, get_item_table, get_full_item_list, \ - get_basic_units, ItemData, upgrade_included_names, progressive_if_nco -from .Locations import get_locations, LocationType -from .Regions import create_regions -from .Options import sc2wol_options, get_option_value, LocationInclusion -from .LogicMixin import SC2WoLLogic -from .PoolFilter import filter_missions, filter_items, get_item_upgrades -from .MissionTables import starting_mission_locations, MissionInfo - - -class Starcraft2WoLWebWorld(WebWorld): - setup = Tutorial( - "Multiworld Setup Guide", - "A guide to setting up the Starcraft 2 randomizer connected to an Archipelago Multiworld", - "English", - "setup_en.md", - "setup/en", - ["TheCondor"] - ) - - tutorials = [setup] - - -class SC2WoLWorld(World): - """ - StarCraft II: Wings of Liberty is a science fiction real-time strategy video game developed and published by Blizzard Entertainment. - Command Raynor's Raiders in collecting pieces of the Keystone in order to stop the zerg threat posed by the Queen of Blades. - """ - - game = "Starcraft 2 Wings of Liberty" - web = Starcraft2WoLWebWorld() - data_version = 5 - - item_name_to_id = {name: data.code for name, data in get_full_item_list().items()} - location_name_to_id = {location.name: location.code for location in get_locations(None, None)} - option_definitions = sc2wol_options - - item_name_groups = item_name_groups - locked_locations: typing.List[str] - location_cache: typing.List[Location] - mission_req_table = {} - final_mission_id: int - victory_item: str - required_client_version = 0, 4, 3 - - def __init__(self, multiworld: MultiWorld, player: int): - super(SC2WoLWorld, self).__init__(multiworld, player) - self.location_cache = [] - self.locked_locations = [] - - def create_item(self, name: str) -> Item: - data = get_full_item_list()[name] - return StarcraftWoLItem(name, data.classification, data.code, self.player) - - def create_regions(self): - self.mission_req_table, self.final_mission_id, self.victory_item = create_regions( - self.multiworld, self.player, get_locations(self.multiworld, self.player), self.location_cache - ) - - def create_items(self): - setup_events(self.player, self.locked_locations, self.location_cache) - - excluded_items = get_excluded_items(self.multiworld, self.player) - - starter_items = assign_starter_items(self.multiworld, self.player, excluded_items, self.locked_locations) - - filter_locations(self.multiworld, self.player, self.locked_locations, self.location_cache) - - pool = get_item_pool(self.multiworld, self.player, self.mission_req_table, starter_items, excluded_items, self.location_cache) - - fill_item_pool_with_dummy_items(self, self.multiworld, self.player, self.locked_locations, self.location_cache, pool) - - self.multiworld.itempool += pool - - def set_rules(self): - self.multiworld.completion_condition[self.player] = lambda state: state.has(self.victory_item, self.player) - - def get_filler_item_name(self) -> str: - return self.multiworld.random.choice(filler_items) - - def fill_slot_data(self): - slot_data = {} - for option_name in sc2wol_options: - option = getattr(self.multiworld, option_name)[self.player] - if type(option.value) in {str, int}: - slot_data[option_name] = int(option.value) - slot_req_table = {} - for mission in self.mission_req_table: - slot_req_table[mission] = self.mission_req_table[mission]._asdict() - - slot_data["mission_req"] = slot_req_table - slot_data["final_mission"] = self.final_mission_id - return slot_data - - -def setup_events(player: int, locked_locations: typing.List[str], location_cache: typing.List[Location]): - for location in location_cache: - if location.address is None: - item = Item(location.name, ItemClassification.progression, None, player) - - locked_locations.append(location.name) - - location.place_locked_item(item) - - -def get_excluded_items(multiworld: MultiWorld, player: int) -> Set[str]: - excluded_items: Set[str] = set() - - for item in multiworld.precollected_items[player]: - excluded_items.add(item.name) - - excluded_items_option = getattr(multiworld, 'excluded_items', []) - - excluded_items.update(excluded_items_option[player].value) - - return excluded_items - - -def assign_starter_items(multiworld: MultiWorld, player: int, excluded_items: Set[str], locked_locations: List[str]) -> List[Item]: - non_local_items = multiworld.non_local_items[player].value - if get_option_value(multiworld, player, "early_unit"): - local_basic_unit = sorted(item for item in get_basic_units(multiworld, player) if item not in non_local_items and item not in excluded_items) - if not local_basic_unit: - raise Exception("At least one basic unit must be local") - - # The first world should also be the starting world - first_mission = list(multiworld.worlds[player].mission_req_table)[0] - if first_mission in starting_mission_locations: - first_location = starting_mission_locations[first_mission] - elif first_mission == "In Utter Darkness": - first_location = first_mission + ": Defeat" - else: - first_location = first_mission + ": Victory" - - return [assign_starter_item(multiworld, player, excluded_items, locked_locations, first_location, local_basic_unit)] - else: - return [] - - -def assign_starter_item(multiworld: MultiWorld, player: int, excluded_items: Set[str], locked_locations: List[str], - location: str, item_list: Tuple[str, ...]) -> Item: - - item_name = multiworld.random.choice(item_list) - - excluded_items.add(item_name) - - item = create_item_with_correct_settings(player, item_name) - - multiworld.get_location(location, player).place_locked_item(item) - - locked_locations.append(location) - - return item - - -def get_item_pool(multiworld: MultiWorld, player: int, mission_req_table: Dict[str, MissionInfo], - starter_items: List[Item], excluded_items: Set[str], location_cache: List[Location]) -> List[Item]: - pool: List[Item] = [] - - # For the future: goal items like Artifact Shards go here - locked_items = [] - - # YAML items - yaml_locked_items = get_option_value(multiworld, player, 'locked_items') - - # Adjust generic upgrade availability based on options - include_upgrades = get_option_value(multiworld, player, 'generic_upgrade_missions') == 0 - upgrade_items = get_option_value(multiworld, player, 'generic_upgrade_items') - - # Include items from outside Wings of Liberty - item_sets = {'wol'} - if get_option_value(multiworld, player, 'nco_items'): - item_sets.add('nco') - if get_option_value(multiworld, player, 'bw_items'): - item_sets.add('bw') - if get_option_value(multiworld, player, 'ext_items'): - item_sets.add('ext') - - def allowed_quantity(name: str, data: ItemData) -> int: - if name in excluded_items \ - or data.type == "Upgrade" and (not include_upgrades or name not in upgrade_included_names[upgrade_items]) \ - or not data.origin.intersection(item_sets): - return 0 - elif name in progressive_if_nco and 'nco' not in item_sets: - return 1 - else: - return data.quantity - - for name, data in get_item_table(multiworld, player).items(): - for i in range(allowed_quantity(name, data)): - item = create_item_with_correct_settings(player, name) - if name in yaml_locked_items: - locked_items.append(item) - else: - pool.append(item) - - existing_items = starter_items + [item for item in multiworld.precollected_items[player]] - existing_names = [item.name for item in existing_items] - - # Check the parent item integrity, exclude items - pool[:] = [item for item in pool if pool_contains_parent(item, pool + locked_items + existing_items)] - - # Removing upgrades for excluded items - for item_name in excluded_items: - if item_name in existing_names: - continue - invalid_upgrades = get_item_upgrades(pool, item_name) - for invalid_upgrade in invalid_upgrades: - pool.remove(invalid_upgrade) - - filtered_pool = filter_items(multiworld, player, mission_req_table, location_cache, pool, existing_items, locked_items) - return filtered_pool - - -def fill_item_pool_with_dummy_items(self: SC2WoLWorld, multiworld: MultiWorld, player: int, locked_locations: List[str], - location_cache: List[Location], pool: List[Item]): - for _ in range(len(location_cache) - len(locked_locations) - len(pool)): - item = create_item_with_correct_settings(player, self.get_filler_item_name()) - pool.append(item) - - -def create_item_with_correct_settings(player: int, name: str) -> Item: - data = get_full_item_list()[name] - - item = Item(name, data.classification, data.code, player) - - return item - - -def pool_contains_parent(item: Item, pool: [Item]): - item_data = get_full_item_list().get(item.name) - if item_data.parent_item is None: - # The item has not associated parent, the item is valid - return True - parent_item = item_data.parent_item - # Check if the pool contains the parent item - return parent_item in [pool_item.name for pool_item in pool] - - -def filter_locations(multiworld: MultiWorld, player, locked_locations: List[str], location_cache: List[Location]): - """ - Filters the locations in the world using a trash or Nothing item - :param multiworld: - :param player: - :param locked_locations: - :param location_cache: - :return: - """ - open_locations = [location for location in location_cache if location.item is None] - plando_locations = get_plando_locations(multiworld, player) - mission_progress_locations = get_option_value(multiworld, player, "mission_progress_locations") - bonus_locations = get_option_value(multiworld, player, "bonus_locations") - challenge_locations = get_option_value(multiworld, player, "challenge_locations") - optional_boss_locations = get_option_value(multiworld, player, "optional_boss_locations") - location_data = get_locations(multiworld, player) - for location in open_locations: - # Go through the locations that aren't locked yet (early unit, etc) - if location.name not in plando_locations: - # The location is not plando'd - sc2_location = [sc2_location for sc2_location in location_data if sc2_location.name == location.name][0] - location_type = sc2_location.type - - if location_type == LocationType.MISSION_PROGRESS \ - and mission_progress_locations != LocationInclusion.option_enabled: - item_name = get_exclusion_item(multiworld, mission_progress_locations) - place_exclusion_item(item_name, location, locked_locations, player) - - if location_type == LocationType.BONUS \ - and bonus_locations != LocationInclusion.option_enabled: - item_name = get_exclusion_item(multiworld, bonus_locations) - place_exclusion_item(item_name, location, locked_locations, player) - - if location_type == LocationType.CHALLENGE \ - and challenge_locations != LocationInclusion.option_enabled: - item_name = get_exclusion_item(multiworld, challenge_locations) - place_exclusion_item(item_name, location, locked_locations, player) - - if location_type == LocationType.OPTIONAL_BOSS \ - and optional_boss_locations != LocationInclusion.option_enabled: - item_name = get_exclusion_item(multiworld, optional_boss_locations) - place_exclusion_item(item_name, location, locked_locations, player) - - -def place_exclusion_item(item_name, location, locked_locations, player): - item = create_item_with_correct_settings(player, item_name) - location.place_locked_item(item) - locked_locations.append(location.name) - - -def get_exclusion_item(multiworld: MultiWorld, option) -> str: - """ - Gets the exclusion item according to settings (trash/nothing) - :param multiworld: - :param option: - :return: Item used for location exclusion - """ - if option == LocationInclusion.option_nothing: - return "Nothing" - elif option == LocationInclusion.option_trash: - index = multiworld.random.randint(0, len(filler_items) - 1) - return filler_items[index] - raise Exception(f"Unsupported option type: {option}") - - -def get_plando_locations(multiworld: MultiWorld, player) -> List[str]: - """ - - :param multiworld: - :param player: - :return: A list of locations affected by a plando in a world - """ - plando_locations = [] - for plando_setting in multiworld.plando_items[player]: - plando_locations += plando_setting.get("locations", []) - plando_setting_location = plando_setting.get("location", None) - if plando_setting_location is not None: - plando_locations.append(plando_setting_location) - - return plando_locations diff --git a/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md b/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md deleted file mode 100644 index 18bda6478457..000000000000 --- a/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md +++ /dev/null @@ -1,54 +0,0 @@ -# Starcraft 2 Wings of Liberty - -## What does randomization do to this game? - -The following unlocks are randomized as items: -1. Your ability to build any non-worker unit (including Marines!). -2. Your ability to upgrade infantry weapons, infantry armor, vehicle weapons, etc. -3. All armory upgrades -4. All laboratory upgrades -5. All mercenaries -6. Small boosts to your starting mineral and vespene gas totals on each mission - -You find items by making progress in bonus objectives (like by rescuing allies in 'Zero Hour') and by completing -missions. When you receive items, they will immediately become available, even during a mission, and you will be -notified via a text box in the top-right corner of the game screen. (The text client for StarCraft 2 also records all -items in all worlds.) - -Missions are launched only through the text client. The Hyperion is never visited. Additionally, credits are not used. - -## What is the goal of this game when randomized? - -The goal is to beat the final mission: 'All In'. The config file determines which variant you must complete. - -## What non-randomized changes are there from vanilla Starcraft 2? - -1. Some missions have more vespene geysers available to allow a wider variety of units. -2. Starports no longer require Factories in order to be built. -3. In 'A Sinister Turn' and 'Echoes of the Future', you can research Protoss air weapon/armor upgrades. - -## Which of my items can be in another player's world? - -By default, any of StarCraft 2's items (specified above) can be in another player's world. See the -[Advanced YAML Guide](https://archipelago.gg/tutorial/Archipelago/advanced_settings/en) -for more information on how to change this. - -## Unique Local Commands - -The following commands are only available when using the Starcraft 2 Client to play with Archipelago. - -- `/difficulty [difficulty]` Overrides the difficulty set for the world. - - Options: casual, normal, hard, brutal -- `/game_speed [game_speed]` Overrides the game speed for the world - - Options: default, slower, slow, normal, fast, faster -- `/color [color]` Changes your color (Currently has no effect) - - Options: white, red, blue, teal, purple, yellow, orange, green, lightpink, violet, lightgrey, darkgreen, brown, - lightgreen, darkgrey, pink, rainbow, random, default -- `/disable_mission_check` Disables the check to see if a mission is available to play. Meant for co-op runs where one - player can play the next mission in a chain the other player is doing. -- `/play [mission_id]` Starts a Starcraft 2 mission based off of the mission_id provided -- `/available` Get what missions are currently available to play -- `/unfinished` Get what missions are currently available to play and have not had all locations checked -- `/set_path [path]` Menually set the SC2 install directory (if the automatic detection fails) -- `/download_data` Download the most recent release of the necassry files for playing SC2 with Archipelago. Will - overwrite existing files From 2a8784ef7200a8c5586257dd5c4592608cedacfe Mon Sep 17 00:00:00 2001 From: Nicholas Brochu Date: Fri, 15 Mar 2024 12:35:37 -0400 Subject: [PATCH 13/22] Zork Grand Inquisitor: Implement New Game (#2539) Adds Archipelago support for Zork Grand Inquisitor, the 1997 point-and-click PC adventure game. The client (based on `CommonClient`), on top of its regular Archipelago duties, fully handles the randomization of the game and the monitoring / modification of the game state. No game modding needed at all; the player is ready to play an Archipelago seed if they can play the vanilla game through ScummVM. The "reverse engineering" (there's likely a better term for this...) of the game is my own original work and I included an MIT license at the root of my world directory. A PopTracker pack was also created to help people learn the game: https://github.com/SerpentAI/ZorkGrandInquisitorAPTracker --- README.md | 1 + docs/CODEOWNERS | 3 + worlds/zork_grand_inquisitor/LICENSE | 21 + worlds/zork_grand_inquisitor/__init__.py | 17 + worlds/zork_grand_inquisitor/client.py | 188 ++ worlds/zork_grand_inquisitor/data/__init__.py | 0 .../data/entrance_rule_data.py | 419 +++ .../zork_grand_inquisitor/data/item_data.py | 792 +++++ .../data/location_data.py | 1535 +++++++++ ...missable_location_grant_conditions_data.py | 200 ++ .../zork_grand_inquisitor/data/region_data.py | 183 ++ worlds/zork_grand_inquisitor/data_funcs.py | 247 ++ .../docs/en_Zork Grand Inquisitor.md | 102 + worlds/zork_grand_inquisitor/docs/setup_en.md | 42 + worlds/zork_grand_inquisitor/enums.py | 350 ++ .../zork_grand_inquisitor/game_controller.py | 1388 ++++++++ .../game_state_manager.py | 370 +++ worlds/zork_grand_inquisitor/options.py | 61 + worlds/zork_grand_inquisitor/requirements.txt | 1 + worlds/zork_grand_inquisitor/test/__init__.py | 5 + .../zork_grand_inquisitor/test/test_access.py | 2927 +++++++++++++++++ .../test/test_data_funcs.py | 132 + .../test/test_locations.py | 49 + worlds/zork_grand_inquisitor/world.py | 206 ++ 24 files changed, 9239 insertions(+) create mode 100644 worlds/zork_grand_inquisitor/LICENSE create mode 100644 worlds/zork_grand_inquisitor/__init__.py create mode 100644 worlds/zork_grand_inquisitor/client.py create mode 100644 worlds/zork_grand_inquisitor/data/__init__.py create mode 100644 worlds/zork_grand_inquisitor/data/entrance_rule_data.py create mode 100644 worlds/zork_grand_inquisitor/data/item_data.py create mode 100644 worlds/zork_grand_inquisitor/data/location_data.py create mode 100644 worlds/zork_grand_inquisitor/data/missable_location_grant_conditions_data.py create mode 100644 worlds/zork_grand_inquisitor/data/region_data.py create mode 100644 worlds/zork_grand_inquisitor/data_funcs.py create mode 100644 worlds/zork_grand_inquisitor/docs/en_Zork Grand Inquisitor.md create mode 100644 worlds/zork_grand_inquisitor/docs/setup_en.md create mode 100644 worlds/zork_grand_inquisitor/enums.py create mode 100644 worlds/zork_grand_inquisitor/game_controller.py create mode 100644 worlds/zork_grand_inquisitor/game_state_manager.py create mode 100644 worlds/zork_grand_inquisitor/options.py create mode 100644 worlds/zork_grand_inquisitor/requirements.txt create mode 100644 worlds/zork_grand_inquisitor/test/__init__.py create mode 100644 worlds/zork_grand_inquisitor/test/test_access.py create mode 100644 worlds/zork_grand_inquisitor/test/test_data_funcs.py create mode 100644 worlds/zork_grand_inquisitor/test/test_locations.py create mode 100644 worlds/zork_grand_inquisitor/world.py diff --git a/README.md b/README.md index d914f860165e..975f0ce75a7b 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Currently, the following games are supported: * TUNIC * Kirby's Dream Land 3 * Celeste 64 +* Zork Grand Inquisitor For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/). Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index dea869fb5536..90b1dabb6dc8 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -188,6 +188,9 @@ # Zillion /worlds/zillion/ @beauxq +# Zork Grand Inquisitor +/worlds/zork_grand_inquisitor/ @nbrochu + ################################## ## Disabled Unmaintained Worlds ## ################################## diff --git a/worlds/zork_grand_inquisitor/LICENSE b/worlds/zork_grand_inquisitor/LICENSE new file mode 100644 index 000000000000..a94ca6bf9177 --- /dev/null +++ b/worlds/zork_grand_inquisitor/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Serpent.AI + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/worlds/zork_grand_inquisitor/__init__.py b/worlds/zork_grand_inquisitor/__init__.py new file mode 100644 index 000000000000..4da257e47bd0 --- /dev/null +++ b/worlds/zork_grand_inquisitor/__init__.py @@ -0,0 +1,17 @@ +import worlds.LauncherComponents as LauncherComponents + +from .world import ZorkGrandInquisitorWorld + + +def launch_client() -> None: + from .client import main + LauncherComponents.launch_subprocess(main, name="ZorkGrandInquisitorClient") + + +LauncherComponents.components.append( + LauncherComponents.Component( + "Zork Grand Inquisitor Client", + func=launch_client, + component_type=LauncherComponents.Type.CLIENT + ) +) diff --git a/worlds/zork_grand_inquisitor/client.py b/worlds/zork_grand_inquisitor/client.py new file mode 100644 index 000000000000..11d6b7f8f183 --- /dev/null +++ b/worlds/zork_grand_inquisitor/client.py @@ -0,0 +1,188 @@ +import asyncio + +import CommonClient +import NetUtils +import Utils + +from typing import Any, Dict, List, Optional, Set, Tuple + +from .data_funcs import item_names_to_id, location_names_to_id, id_to_items, id_to_locations, id_to_goals +from .enums import ZorkGrandInquisitorItems, ZorkGrandInquisitorLocations +from .game_controller import GameController + + +class ZorkGrandInquisitorCommandProcessor(CommonClient.ClientCommandProcessor): + def _cmd_zork(self) -> None: + """Attach to an open Zork Grand Inquisitor process.""" + result: bool = self.ctx.game_controller.open_process_handle() + + if result: + self.ctx.process_attached_at_least_once = True + self.output("Successfully attached to Zork Grand Inquisitor process.") + else: + self.output("Failed to attach to Zork Grand Inquisitor process.") + + def _cmd_brog(self) -> None: + """List received Brog items.""" + self.ctx.game_controller.list_received_brog_items() + + def _cmd_griff(self) -> None: + """List received Griff items.""" + self.ctx.game_controller.list_received_griff_items() + + def _cmd_lucy(self) -> None: + """List received Lucy items.""" + self.ctx.game_controller.list_received_lucy_items() + + def _cmd_hotspots(self) -> None: + """List received Hotspots.""" + self.ctx.game_controller.list_received_hotspots() + + +class ZorkGrandInquisitorContext(CommonClient.CommonContext): + tags: Set[str] = {"AP"} + game: str = "Zork Grand Inquisitor" + command_processor: CommonClient.ClientCommandProcessor = ZorkGrandInquisitorCommandProcessor + items_handling: int = 0b111 + want_slot_data: bool = True + + item_name_to_id: Dict[str, int] = item_names_to_id() + location_name_to_id: Dict[str, int] = location_names_to_id() + + id_to_items: Dict[int, ZorkGrandInquisitorItems] = id_to_items() + id_to_locations: Dict[int, ZorkGrandInquisitorLocations] = id_to_locations() + + game_controller: GameController + + controller_task: Optional[asyncio.Task] + + process_attached_at_least_once: bool + can_display_process_message: bool + + def __init__(self, server_address: Optional[str], password: Optional[str]) -> None: + super().__init__(server_address, password) + + self.game_controller = GameController(logger=CommonClient.logger) + + self.controller_task = None + + self.process_attached_at_least_once = False + self.can_display_process_message = True + + def run_gui(self) -> None: + from kvui import GameManager + + class TextManager(GameManager): + logging_pairs: List[Tuple[str, str]] = [("Client", "Archipelago")] + base_title: str = "Archipelago Zork Grand Inquisitor Client" + + self.ui = TextManager(self) + self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI") + + async def server_auth(self, password_requested: bool = False): + if password_requested and not self.password: + await super().server_auth(password_requested) + + await self.get_username() + await self.send_connect() + + def on_package(self, cmd: str, _args: Any) -> None: + if cmd == "Connected": + self.game = self.slot_info[self.slot].game + + # Options + self.game_controller.option_goal = id_to_goals()[_args["slot_data"]["goal"]] + self.game_controller.option_deathsanity = _args["slot_data"]["deathsanity"] == 1 + + self.game_controller.option_grant_missable_location_checks = ( + _args["slot_data"]["grant_missable_location_checks"] == 1 + ) + + async def controller(self): + while not self.exit_event.is_set(): + await asyncio.sleep(0.1) + + # Enqueue Received Item Delta + network_item: NetUtils.NetworkItem + for network_item in self.items_received: + item: ZorkGrandInquisitorItems = self.id_to_items[network_item.item] + + if item not in self.game_controller.received_items: + if item not in self.game_controller.received_items_queue: + self.game_controller.received_items_queue.append(item) + + # Game Controller Update + if self.game_controller.is_process_running(): + self.game_controller.update() + self.can_display_process_message = True + else: + process_message: str + + if self.process_attached_at_least_once: + process_message = ( + "Lost connection to Zork Grand Inquisitor process. Please restart the game and use the /zork " + "command to reattach." + ) + else: + process_message = ( + "Please use the /zork command to attach to a running Zork Grand Inquisitor process." + ) + + if self.can_display_process_message: + CommonClient.logger.info(process_message) + self.can_display_process_message = False + + # Send Checked Locations + checked_location_ids: List[int] = list() + + while len(self.game_controller.completed_locations_queue) > 0: + location: ZorkGrandInquisitorLocations = self.game_controller.completed_locations_queue.popleft() + location_id: int = self.location_name_to_id[location.value] + + checked_location_ids.append(location_id) + + await self.send_msgs([ + { + "cmd": "LocationChecks", + "locations": checked_location_ids + } + ]) + + # Check for Goal Completion + if self.game_controller.goal_completed: + await self.send_msgs([ + { + "cmd": "StatusUpdate", + "status": CommonClient.ClientStatus.CLIENT_GOAL + } + ]) + + +def main() -> None: + Utils.init_logging("ZorkGrandInquisitorClient", exception_logger="Client") + + async def _main(): + ctx: ZorkGrandInquisitorContext = ZorkGrandInquisitorContext(None, None) + + ctx.server_task = asyncio.create_task(CommonClient.server_loop(ctx), name="server loop") + ctx.controller_task = asyncio.create_task(ctx.controller(), name="ZorkGrandInquisitorController") + + if CommonClient.gui_enabled: + ctx.run_gui() + + ctx.run_cli() + + await ctx.exit_event.wait() + await ctx.shutdown() + + import colorama + + colorama.init() + + asyncio.run(_main()) + + colorama.deinit() + + +if __name__ == "__main__": + main() diff --git a/worlds/zork_grand_inquisitor/data/__init__.py b/worlds/zork_grand_inquisitor/data/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/worlds/zork_grand_inquisitor/data/entrance_rule_data.py b/worlds/zork_grand_inquisitor/data/entrance_rule_data.py new file mode 100644 index 000000000000..f48be5eb6b6a --- /dev/null +++ b/worlds/zork_grand_inquisitor/data/entrance_rule_data.py @@ -0,0 +1,419 @@ +from typing import Dict, Tuple, Union + +from ..enums import ZorkGrandInquisitorEvents, ZorkGrandInquisitorItems, ZorkGrandInquisitorRegions + + +entrance_rule_data: Dict[ + Tuple[ + ZorkGrandInquisitorRegions, + ZorkGrandInquisitorRegions, + ], + Union[ + Tuple[ + Tuple[ + Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorRegions, + ], + ..., + ], + ..., + ], + None, + ], +] = { + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.DM_LAIR): ( + ( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE, + ), + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.GUE_TECH): ( + ( + ZorkGrandInquisitorItems.SPELL_REZROV, + ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.PORT_FOOZLE): None, + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS): ( + ( + ZorkGrandInquisitorItems.SUBWAY_TOKEN, + ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT, + ), + ), + (ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.CROSSROADS): None, + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR): ( + ( + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, ZorkGrandInquisitorRegions.DM_LAIR): None, + (ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, ZorkGrandInquisitorRegions.WALKING_CASTLE): ( + ( + ZorkGrandInquisitorItems.HOTSPOT_BLINDS, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL, + ), + ), + (ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, ZorkGrandInquisitorRegions.WHITE_HOUSE): ( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR, + ZorkGrandInquisitorItems.SPELL_NARWILE, + ZorkGrandInquisitorEvents.KNOWS_YASTARD, + ), + ), + (ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON): ( + ( + ZorkGrandInquisitorItems.TOTEM_GRIFF, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW, + ), + ), + (ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, ZorkGrandInquisitorRegions.HADES_BEYOND_GATES): None, + (ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO): None, + (ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, ZorkGrandInquisitorRegions.ENDGAME): ( + ( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ZorkGrandInquisitorRegions.WHITE_HOUSE, + ZorkGrandInquisitorItems.TOTEM_BROG, # Needed here since White House is not broken down in 2 regions + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT, + ZorkGrandInquisitorItems.BROGS_PLANK, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH, ZorkGrandInquisitorRegions.CROSSROADS): None, + (ZorkGrandInquisitorRegions.GUE_TECH, ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY): ( + ( + ZorkGrandInquisitorItems.SPELL_IGRAM, + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH, ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE): ( + (ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_DOOR,), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, ZorkGrandInquisitorRegions.GUE_TECH): None, + (ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): ( + ( + ZorkGrandInquisitorItems.STUDENT_ID, + ZorkGrandInquisitorItems.HOTSPOT_STUDENT_ID_MACHINE, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.CROSSROADS): ( + (ZorkGrandInquisitorItems.MAP,), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.DM_LAIR): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.GUE_TECH): None, + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB, + ), + ), + (ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY, + ), + ), + (ZorkGrandInquisitorRegions.HADES, ZorkGrandInquisitorRegions.HADES_BEYOND_GATES): ( + ( + ZorkGrandInquisitorEvents.KNOWS_SNAVIG, + ZorkGrandInquisitorItems.TOTEM_BROG, # Visually hiding this totem is tied to owning it; no choice + ), + ), + (ZorkGrandInquisitorRegions.HADES, ZorkGrandInquisitorRegions.HADES_SHORE): ( + (ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS,), + ), + (ZorkGrandInquisitorRegions.HADES_BEYOND_GATES, ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO): ( + ( + ZorkGrandInquisitorItems.SPELL_NARWILE, + ZorkGrandInquisitorEvents.KNOWS_YASTARD, + ), + ), + (ZorkGrandInquisitorRegions.HADES_BEYOND_GATES, ZorkGrandInquisitorRegions.HADES): None, + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.CROSSROADS): ( + (ZorkGrandInquisitorItems.MAP,), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.DM_LAIR): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR, + ), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH, + ), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.HADES): ( + ( + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER, + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS, + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB, + ), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS): None, + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM,), + ), + (ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY,), + ), + (ZorkGrandInquisitorRegions.MENU, ZorkGrandInquisitorRegions.PORT_FOOZLE): None, + (ZorkGrandInquisitorRegions.MONASTERY, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH, + ), + ), + (ZorkGrandInquisitorRegions.MONASTERY, ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT): ( + ( + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH, + ), + ), + (ZorkGrandInquisitorRegions.MONASTERY, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): None, + (ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, ZorkGrandInquisitorRegions.MONASTERY): None, + (ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST): ( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER, + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT, + ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER, + ZorkGrandInquisitorItems.SPELL_NARWILE, + ZorkGrandInquisitorEvents.KNOWS_YASTARD, + ), + ), + (ZorkGrandInquisitorRegions.PORT_FOOZLE, ZorkGrandInquisitorRegions.CROSSROADS): ( + ( + ZorkGrandInquisitorEvents.LANTERN_DALBOZ_ACCESSIBLE, + ZorkGrandInquisitorItems.ROPE, + ZorkGrandInquisitorItems.HOTSPOT_WELL, + ), + ), + (ZorkGrandInquisitorRegions.PORT_FOOZLE, ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP): ( + ( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL, + ), + ), + (ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP, ZorkGrandInquisitorRegions.PORT_FOOZLE): None, + (ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT): None, + (ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN): ( + ( + ZorkGrandInquisitorItems.TOTEM_LUCY, + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR, + ), + ), + (ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, ZorkGrandInquisitorRegions.ENDGAME): ( + ( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ZorkGrandInquisitorRegions.WHITE_HOUSE, + ZorkGrandInquisitorItems.TOTEM_BROG, # Needed here since White House is not broken down in 2 regions + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT, + ZorkGrandInquisitorItems.BROGS_PLANK, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE, + ), + ), + (ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST): None, + (ZorkGrandInquisitorRegions.SPELL_LAB, ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE): None, + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.CROSSROADS): ( + (ZorkGrandInquisitorItems.MAP,), + ), + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.DM_LAIR): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR, + ), + ), + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH, + ), + ), + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY): None, + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES, + ), + ), + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.SPELL_LAB): ( + ( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE, + ZorkGrandInquisitorEvents.DAM_DESTROYED, + ZorkGrandInquisitorItems.SPELL_GOLGATEM, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM, + ), + ), + (ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + ( + ZorkGrandInquisitorItems.MAP, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY, + ), + ), + (ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, ZorkGrandInquisitorRegions.CROSSROADS): None, + (ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, ZorkGrandInquisitorRegions.HADES_SHORE): ( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES, + ), + ), + (ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM): ( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM, + ), + ), + (ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY, + ), + ), + (ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, ZorkGrandInquisitorRegions.HADES_SHORE): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES,), + ), + (ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS): None, + (ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, ZorkGrandInquisitorRegions.SUBWAY_MONASTERY): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY,), + ), + (ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, ZorkGrandInquisitorRegions.HADES_SHORE): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES,), + ), + (ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, ZorkGrandInquisitorRegions.MONASTERY): ( + ( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorEvents.ROPE_GLORFABLE, + ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT, + ), + ), + (ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS): None, + (ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM): ( + (ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM,), + ), + (ZorkGrandInquisitorRegions.WALKING_CASTLE, ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR): None, + (ZorkGrandInquisitorRegions.WHITE_HOUSE, ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR): None, + (ZorkGrandInquisitorRegions.WHITE_HOUSE, ZorkGrandInquisitorRegions.ENDGAME): ( + ( + ZorkGrandInquisitorItems.TOTEM_BROG, # Needed here since White House is not broken down in 2 regions + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT, + ZorkGrandInquisitorItems.BROGS_PLANK, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE, + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ), + ), +} diff --git a/worlds/zork_grand_inquisitor/data/item_data.py b/worlds/zork_grand_inquisitor/data/item_data.py new file mode 100644 index 000000000000..c312bbce3d09 --- /dev/null +++ b/worlds/zork_grand_inquisitor/data/item_data.py @@ -0,0 +1,792 @@ +from typing import Dict, NamedTuple, Optional, Tuple, Union + +from BaseClasses import ItemClassification + +from ..enums import ZorkGrandInquisitorItems, ZorkGrandInquisitorTags + + +class ZorkGrandInquisitorItemData(NamedTuple): + statemap_keys: Optional[Tuple[int, ...]] + archipelago_id: Optional[int] + classification: ItemClassification + tags: Tuple[ZorkGrandInquisitorTags, ...] + maximum_quantity: Optional[int] = 1 + + +ITEM_OFFSET = 9758067000 + +item_data: Dict[ZorkGrandInquisitorItems, ZorkGrandInquisitorItemData] = { + # Inventory Items + ZorkGrandInquisitorItems.BROGS_BICKERING_TORCH: ZorkGrandInquisitorItemData( + statemap_keys=(67,), # Extinguished = 103 + archipelago_id=ITEM_OFFSET + 0, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH: ZorkGrandInquisitorItemData( + statemap_keys=(68,), # Extinguished = 104 + archipelago_id=ITEM_OFFSET + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.BROGS_GRUE_EGG: ZorkGrandInquisitorItemData( + statemap_keys=(70,), # Boiled = 71 + archipelago_id=ITEM_OFFSET + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.BROGS_PLANK: ZorkGrandInquisitorItemData( + statemap_keys=(69,), + archipelago_id=ITEM_OFFSET + 3, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.FLATHEADIA_FUDGE: ZorkGrandInquisitorItemData( + statemap_keys=(54,), + archipelago_id=ITEM_OFFSET + 4, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP: ZorkGrandInquisitorItemData( + statemap_keys=(86,), + archipelago_id=ITEM_OFFSET + 5, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH: ZorkGrandInquisitorItemData( + statemap_keys=(84,), + archipelago_id=ITEM_OFFSET + 6, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT: ZorkGrandInquisitorItemData( + statemap_keys=(9,), + archipelago_id=ITEM_OFFSET + 7, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN: ZorkGrandInquisitorItemData( + statemap_keys=(16,), + archipelago_id=ITEM_OFFSET + 8, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.HAMMER: ZorkGrandInquisitorItemData( + statemap_keys=(23,), + archipelago_id=ITEM_OFFSET + 9, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.HUNGUS_LARD: ZorkGrandInquisitorItemData( + statemap_keys=(55,), + archipelago_id=ITEM_OFFSET + 10, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.JAR_OF_HOTBUGS: ZorkGrandInquisitorItemData( + statemap_keys=(56,), + archipelago_id=ITEM_OFFSET + 11, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LANTERN: ZorkGrandInquisitorItemData( + statemap_keys=(4,), + archipelago_id=ITEM_OFFSET + 12, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER: ZorkGrandInquisitorItemData( + statemap_keys=(88,), + archipelago_id=ITEM_OFFSET + 13, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1: ZorkGrandInquisitorItemData( + statemap_keys=(116,), # With fly = 120 + archipelago_id=ITEM_OFFSET + 14, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2: ZorkGrandInquisitorItemData( + statemap_keys=(117,), # With fly = 121 + archipelago_id=ITEM_OFFSET + 15, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3: ZorkGrandInquisitorItemData( + statemap_keys=(118,), # With fly = 122 + archipelago_id=ITEM_OFFSET + 16, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4: ZorkGrandInquisitorItemData( + statemap_keys=(119,), # With fly = 123 + archipelago_id=ITEM_OFFSET + 17, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.MAP: ZorkGrandInquisitorItemData( + statemap_keys=(6,), + archipelago_id=ITEM_OFFSET + 18, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.MEAD_LIGHT: ZorkGrandInquisitorItemData( + statemap_keys=(2,), + archipelago_id=ITEM_OFFSET + 19, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.MOSS_OF_MAREILON: ZorkGrandInquisitorItemData( + statemap_keys=(57,), + archipelago_id=ITEM_OFFSET + 20, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.MUG: ZorkGrandInquisitorItemData( + statemap_keys=(35,), + archipelago_id=ITEM_OFFSET + 21, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.OLD_SCRATCH_CARD: ZorkGrandInquisitorItemData( + statemap_keys=(17,), + archipelago_id=ITEM_OFFSET + 22, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.PERMA_SUCK_MACHINE: ZorkGrandInquisitorItemData( + statemap_keys=(36,), + archipelago_id=ITEM_OFFSET + 23, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER: ZorkGrandInquisitorItemData( + statemap_keys=(3,), + archipelago_id=ITEM_OFFSET + 24, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS: ZorkGrandInquisitorItemData( + statemap_keys=(5827,), + archipelago_id=ITEM_OFFSET + 25, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.PROZORK_TABLET: ZorkGrandInquisitorItemData( + statemap_keys=(65,), + archipelago_id=ITEM_OFFSET + 26, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB: ZorkGrandInquisitorItemData( + statemap_keys=(53,), + archipelago_id=ITEM_OFFSET + 27, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.ROPE: ZorkGrandInquisitorItemData( + statemap_keys=(83,), + archipelago_id=ITEM_OFFSET + 28, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS: ZorkGrandInquisitorItemData( + statemap_keys=(101,), # SNA = 41 + archipelago_id=ITEM_OFFSET + 29, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV: ZorkGrandInquisitorItemData( + statemap_keys=(102,), # VIG = 48 + archipelago_id=ITEM_OFFSET + 30, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SHOVEL: ZorkGrandInquisitorItemData( + statemap_keys=(49,), + archipelago_id=ITEM_OFFSET + 31, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SNAPDRAGON: ZorkGrandInquisitorItemData( + statemap_keys=(50,), + archipelago_id=ITEM_OFFSET + 32, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.STUDENT_ID: ZorkGrandInquisitorItemData( + statemap_keys=(39,), + archipelago_id=ITEM_OFFSET + 33, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SUBWAY_TOKEN: ZorkGrandInquisitorItemData( + statemap_keys=(20,), + archipelago_id=ITEM_OFFSET + 34, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.SWORD: ZorkGrandInquisitorItemData( + statemap_keys=(21,), + archipelago_id=ITEM_OFFSET + 35, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.ZIMDOR_SCROLL: ZorkGrandInquisitorItemData( + statemap_keys=(25,), + archipelago_id=ITEM_OFFSET + 36, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + ZorkGrandInquisitorItems.ZORK_ROCKS: ZorkGrandInquisitorItemData( + statemap_keys=(37,), + archipelago_id=ITEM_OFFSET + 37, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.INVENTORY_ITEM,), + ), + # Hotspots + ZorkGrandInquisitorItems.HOTSPOT_666_MAILBOX: ZorkGrandInquisitorItemData( + statemap_keys=(9116,), + archipelago_id=ITEM_OFFSET + 100 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS: ZorkGrandInquisitorItemData( + statemap_keys=(15434, 15436, 15438, 15440), + archipelago_id=ITEM_OFFSET + 100 + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_BLANK_SCROLL_BOX: ZorkGrandInquisitorItemData( + statemap_keys=(12096,), + archipelago_id=ITEM_OFFSET + 100 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_BLINDS: ZorkGrandInquisitorItemData( + statemap_keys=(4799,), + archipelago_id=ITEM_OFFSET + 100 + 3, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS: ZorkGrandInquisitorItemData( + statemap_keys=(12691, 12692, 12693, 12694, 12695, 12696, 12697, 12698, 12699, 12700, 12701), + archipelago_id=ITEM_OFFSET + 100 + 4, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(12702,), + archipelago_id=ITEM_OFFSET + 100 + 5, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_VACUUM_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(12909,), + archipelago_id=ITEM_OFFSET + 100 + 6, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CHANGE_MACHINE_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(12900,), + archipelago_id=ITEM_OFFSET + 100 + 7, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(5010,), + archipelago_id=ITEM_OFFSET + 100 + 8, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(9539,), + archipelago_id=ITEM_OFFSET + 100 + 9, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER: ZorkGrandInquisitorItemData( + statemap_keys=(19712,), + archipelago_id=ITEM_OFFSET + 100 + 10, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT: ZorkGrandInquisitorItemData( + statemap_keys=(2586,), + archipelago_id=ITEM_OFFSET + 100 + 11, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DENTED_LOCKER: ZorkGrandInquisitorItemData( + statemap_keys=(11878,), + archipelago_id=ITEM_OFFSET + 100 + 12, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DIRT_MOUND: ZorkGrandInquisitorItemData( + statemap_keys=(11751,), + archipelago_id=ITEM_OFFSET + 100 + 13, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH: ZorkGrandInquisitorItemData( + statemap_keys=(15147, 15153), + archipelago_id=ITEM_OFFSET + 100 + 14, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW: ZorkGrandInquisitorItemData( + statemap_keys=(1705,), + archipelago_id=ITEM_OFFSET + 100 + 15, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS: ZorkGrandInquisitorItemData( + statemap_keys=(1425, 1426), + archipelago_id=ITEM_OFFSET + 100 + 16, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE: ZorkGrandInquisitorItemData( + statemap_keys=(13106,), + archipelago_id=ITEM_OFFSET + 100 + 17, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS: ZorkGrandInquisitorItemData( + statemap_keys=(13219, 13220, 13221, 13222), + archipelago_id=ITEM_OFFSET + 100 + 18, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS: ZorkGrandInquisitorItemData( + statemap_keys=(14327, 14332, 14337, 14342), + archipelago_id=ITEM_OFFSET + 100 + 19, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(12528,), + archipelago_id=ITEM_OFFSET + 100 + 20, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_DOORS: ZorkGrandInquisitorItemData( + statemap_keys=(12523, 12524, 12525), + archipelago_id=ITEM_OFFSET + 100 + 21, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_GLASS_CASE: ZorkGrandInquisitorItemData( + statemap_keys=(13002,), + archipelago_id=ITEM_OFFSET + 100 + 22, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL: ZorkGrandInquisitorItemData( + statemap_keys=(10726,), + archipelago_id=ITEM_OFFSET + 100 + 23, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(12280,), + archipelago_id=ITEM_OFFSET + 100 + 24, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_GRASS: ZorkGrandInquisitorItemData( + statemap_keys=( + 17694, + 17695, + 17696, + 17697, + 18200, + 17703, + 17704, + 17705, + 17710, + 17711, + 17712, + 17713, + 17714, + 17715, + 17716, + 17722, + 17723, + 17724, + 17725, + 17726, + 17727 + ), + archipelago_id=ITEM_OFFSET + 100 + 25, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS: ZorkGrandInquisitorItemData( + statemap_keys=(8448, 8449, 8450, 8451, 8452, 8453, 8454, 8455, 8456, 8457, 8458, 8459), + archipelago_id=ITEM_OFFSET + 100 + 26, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER: ZorkGrandInquisitorItemData( + statemap_keys=(8446,), + archipelago_id=ITEM_OFFSET + 100 + 27, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_HARRY: ZorkGrandInquisitorItemData( + statemap_keys=(4260,), + archipelago_id=ITEM_OFFSET + 100 + 28, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY: ZorkGrandInquisitorItemData( + statemap_keys=(18026,), + archipelago_id=ITEM_OFFSET + 100 + 29, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH: ZorkGrandInquisitorItemData( + statemap_keys=(17623,), + archipelago_id=ITEM_OFFSET + 100 + 30, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(13140,), + archipelago_id=ITEM_OFFSET + 100 + 31, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(10441,), + archipelago_id=ITEM_OFFSET + 100 + 32, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_LOUDSPEAKER_VOLUME_BUTTONS: ZorkGrandInquisitorItemData( + statemap_keys=(19632, 19627), + archipelago_id=ITEM_OFFSET + 100 + 33, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(3025,), + archipelago_id=ITEM_OFFSET + 100 + 34, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG: ZorkGrandInquisitorItemData( + statemap_keys=(3036,), + archipelago_id=ITEM_OFFSET + 100 + 35, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_MIRROR: ZorkGrandInquisitorItemData( + statemap_keys=(5031,), + archipelago_id=ITEM_OFFSET + 100 + 36, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT: ZorkGrandInquisitorItemData( + statemap_keys=(13597,), + archipelago_id=ITEM_OFFSET + 100 + 37, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_MOSSY_GRATE: ZorkGrandInquisitorItemData( + statemap_keys=(13390,), + archipelago_id=ITEM_OFFSET + 100 + 38, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR: ZorkGrandInquisitorItemData( + statemap_keys=(2455, 2447), + archipelago_id=ITEM_OFFSET + 100 + 39, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS: ZorkGrandInquisitorItemData( + statemap_keys=(12389, 12390), + archipelago_id=ITEM_OFFSET + 100 + 40, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE: ZorkGrandInquisitorItemData( + statemap_keys=(4302,), + archipelago_id=ITEM_OFFSET + 100 + 41, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE: ZorkGrandInquisitorItemData( + statemap_keys=(16383, 16384), + archipelago_id=ITEM_OFFSET + 100 + 42, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE: ZorkGrandInquisitorItemData( + statemap_keys=(2769,), + archipelago_id=ITEM_OFFSET + 100 + 43, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON: ZorkGrandInquisitorItemData( + statemap_keys=(4149,), + archipelago_id=ITEM_OFFSET + 100 + 44, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_BUTTONS: ZorkGrandInquisitorItemData( + statemap_keys=(12584, 12585, 12586, 12587), + archipelago_id=ITEM_OFFSET + 100 + 45, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_COIN_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(12574,), + archipelago_id=ITEM_OFFSET + 100 + 46, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SOUVENIR_COIN_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(13412,), + archipelago_id=ITEM_OFFSET + 100 + 47, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER: ZorkGrandInquisitorItemData( + statemap_keys=(12170,), + archipelago_id=ITEM_OFFSET + 100 + 48, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM: ZorkGrandInquisitorItemData( + statemap_keys=(16382,), + archipelago_id=ITEM_OFFSET + 100 + 49, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM: ZorkGrandInquisitorItemData( + statemap_keys=(4209,), + archipelago_id=ITEM_OFFSET + 100 + 50, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_STUDENT_ID_MACHINE: ZorkGrandInquisitorItemData( + statemap_keys=(11973,), + archipelago_id=ITEM_OFFSET + 100 + 51, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT: ZorkGrandInquisitorItemData( + statemap_keys=(13168,), + archipelago_id=ITEM_OFFSET + 100 + 52, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY: ZorkGrandInquisitorItemData( + statemap_keys=(15396,), + archipelago_id=ITEM_OFFSET + 100 + 53, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH: ZorkGrandInquisitorItemData( + statemap_keys=(9706,), + archipelago_id=ITEM_OFFSET + 100 + 54, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS: ZorkGrandInquisitorItemData( + statemap_keys=(9728, 9729, 9730), + archipelago_id=ITEM_OFFSET + 100 + 55, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + ZorkGrandInquisitorItems.HOTSPOT_WELL: ZorkGrandInquisitorItemData( + statemap_keys=(10314,), + archipelago_id=ITEM_OFFSET + 100 + 56, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.HOTSPOT,), + ), + # Spells + ZorkGrandInquisitorItems.SPELL_GLORF: ZorkGrandInquisitorItemData( + statemap_keys=(202,), + archipelago_id=ITEM_OFFSET + 200 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_GOLGATEM: ZorkGrandInquisitorItemData( + statemap_keys=(192,), + archipelago_id=ITEM_OFFSET + 200 + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_IGRAM: ZorkGrandInquisitorItemData( + statemap_keys=(199,), + archipelago_id=ITEM_OFFSET + 200 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_KENDALL: ZorkGrandInquisitorItemData( + statemap_keys=(196,), + archipelago_id=ITEM_OFFSET + 200 + 3, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_NARWILE: ZorkGrandInquisitorItemData( + statemap_keys=(197,), + archipelago_id=ITEM_OFFSET + 200 + 4, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_REZROV: ZorkGrandInquisitorItemData( + statemap_keys=(195,), + archipelago_id=ITEM_OFFSET + 200 + 5, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_THROCK: ZorkGrandInquisitorItemData( + statemap_keys=(200,), + archipelago_id=ITEM_OFFSET + 200 + 6, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + ZorkGrandInquisitorItems.SPELL_VOXAM: ZorkGrandInquisitorItemData( + statemap_keys=(191,), + archipelago_id=ITEM_OFFSET + 200 + 7, + classification=ItemClassification.useful, + tags=(ZorkGrandInquisitorTags.SPELL,), + ), + # Subway Destinations + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM: ZorkGrandInquisitorItemData( + statemap_keys=(13757, 13297, 13486, 13625), + archipelago_id=ITEM_OFFSET + 300 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SUBWAY_DESTINATION,), + ), + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES: ZorkGrandInquisitorItemData( + statemap_keys=(13758, 13309, 13498, 13637), + archipelago_id=ITEM_OFFSET + 300 + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SUBWAY_DESTINATION,), + ), + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY: ZorkGrandInquisitorItemData( + statemap_keys=(13759, 13316, 13505, 13644), + archipelago_id=ITEM_OFFSET + 300 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.SUBWAY_DESTINATION,), + ), + # Teleporter Destinations + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR: ZorkGrandInquisitorItemData( + statemap_keys=(2203,), + archipelago_id=ITEM_OFFSET + 400 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TELEPORTER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH: ZorkGrandInquisitorItemData( + statemap_keys=(7132,), + archipelago_id=ITEM_OFFSET + 400 + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TELEPORTER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES: ZorkGrandInquisitorItemData( + statemap_keys=(7119,), + archipelago_id=ITEM_OFFSET + 400 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TELEPORTER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY: ZorkGrandInquisitorItemData( + statemap_keys=(7148,), + archipelago_id=ITEM_OFFSET + 400 + 3, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TELEPORTER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB: ZorkGrandInquisitorItemData( + statemap_keys=(16545,), + archipelago_id=ITEM_OFFSET + 400 + 4, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TELEPORTER_DESTINATION,), + ), + # Totemizer Destinations + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION: ZorkGrandInquisitorItemData( + statemap_keys=(9660,), + archipelago_id=ITEM_OFFSET + 500 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TOTEMIZER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_INFINITY: ZorkGrandInquisitorItemData( + statemap_keys=(9666,), + archipelago_id=ITEM_OFFSET + 500 + 1, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.TOTEMIZER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL: ZorkGrandInquisitorItemData( + statemap_keys=(9668,), + archipelago_id=ITEM_OFFSET + 500 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TOTEMIZER_DESTINATION,), + ), + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_SURFACE_OF_MERZ: ZorkGrandInquisitorItemData( + statemap_keys=(9662,), + archipelago_id=ITEM_OFFSET + 500 + 3, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.TOTEMIZER_DESTINATION,), + ), + # Totems + ZorkGrandInquisitorItems.TOTEM_BROG: ZorkGrandInquisitorItemData( + statemap_keys=(4853,), + archipelago_id=ITEM_OFFSET + 600 + 0, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TOTEM,), + ), + ZorkGrandInquisitorItems.TOTEM_GRIFF: ZorkGrandInquisitorItemData( + statemap_keys=(4315,), + archipelago_id=ITEM_OFFSET + 600 + 1, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TOTEM,), + ), + ZorkGrandInquisitorItems.TOTEM_LUCY: ZorkGrandInquisitorItemData( + statemap_keys=(5223,), + archipelago_id=ITEM_OFFSET + 600 + 2, + classification=ItemClassification.progression, + tags=(ZorkGrandInquisitorTags.TOTEM,), + ), + # Filler + ZorkGrandInquisitorItems.FILLER_INQUISITION_PROPAGANDA_FLYER: ZorkGrandInquisitorItemData( + statemap_keys=None, + archipelago_id=ITEM_OFFSET + 700 + 0, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.FILLER,), + maximum_quantity=None, + ), + ZorkGrandInquisitorItems.FILLER_UNREADABLE_SPELL_SCROLL: ZorkGrandInquisitorItemData( + statemap_keys=None, + archipelago_id=ITEM_OFFSET + 700 + 1, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.FILLER,), + maximum_quantity=None, + ), + ZorkGrandInquisitorItems.FILLER_MAGIC_CONTRABAND: ZorkGrandInquisitorItemData( + statemap_keys=None, + archipelago_id=ITEM_OFFSET + 700 + 2, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.FILLER,), + maximum_quantity=None, + ), + ZorkGrandInquisitorItems.FILLER_FROBOZZ_ELECTRIC_GADGET: ZorkGrandInquisitorItemData( + statemap_keys=None, + archipelago_id=ITEM_OFFSET + 700 + 3, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.FILLER,), + maximum_quantity=None, + ), + ZorkGrandInquisitorItems.FILLER_NONSENSICAL_INQUISITION_PAPERWORK: ZorkGrandInquisitorItemData( + statemap_keys=None, + archipelago_id=ITEM_OFFSET + 700 + 4, + classification=ItemClassification.filler, + tags=(ZorkGrandInquisitorTags.FILLER,), + maximum_quantity=None, + ), +} diff --git a/worlds/zork_grand_inquisitor/data/location_data.py b/worlds/zork_grand_inquisitor/data/location_data.py new file mode 100644 index 000000000000..8b4e57392de8 --- /dev/null +++ b/worlds/zork_grand_inquisitor/data/location_data.py @@ -0,0 +1,1535 @@ +from typing import Dict, NamedTuple, Optional, Tuple, Union + +from ..enums import ( + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorLocations, + ZorkGrandInquisitorRegions, + ZorkGrandInquisitorTags, +) + + +class ZorkGrandInquisitorLocationData(NamedTuple): + game_state_trigger: Optional[ + Tuple[ + Union[ + Tuple[str, str], + Tuple[int, int], + Tuple[int, Tuple[int, ...]], + ], + ..., + ] + ] + archipelago_id: Optional[int] + region: ZorkGrandInquisitorRegions + tags: Optional[Tuple[ZorkGrandInquisitorTags, ...]] = None + requirements: Optional[ + Tuple[ + Union[ + Union[ + ZorkGrandInquisitorItems, + ZorkGrandInquisitorEvents, + ], + Tuple[ + Union[ + ZorkGrandInquisitorItems, + ZorkGrandInquisitorEvents, + ], + ..., + ], + ], + ..., + ] + ] = None + event_item_name: Optional[str] = None + + +LOCATION_OFFSET = 9758067000 + +location_data: Dict[ + Union[ZorkGrandInquisitorLocations, ZorkGrandInquisitorEvents], ZorkGrandInquisitorLocationData +] = { + ZorkGrandInquisitorLocations.ALARM_SYSTEM_IS_DOWN: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2m"),), + archipelago_id=LOCATION_OFFSET + 0, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.ARREST_THE_VANDAL: ZorkGrandInquisitorLocationData( + game_state_trigger=((10789, 1),), + archipelago_id=LOCATION_OFFSET + 1, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL, + ), + ), + ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED: ZorkGrandInquisitorLocationData( + game_state_trigger=((11787, 1), (11788, 1), (11789, 1)), + archipelago_id=LOCATION_OFFSET + 2, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER: ZorkGrandInquisitorLocationData( + game_state_trigger=((8929, 1),), + archipelago_id=LOCATION_OFFSET + 3, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.KNOWS_OBIDIL,), + ), + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE: ZorkGrandInquisitorLocationData( + game_state_trigger=((9124, 1),), + archipelago_id=LOCATION_OFFSET + 4, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE, + ZorkGrandInquisitorItems.HOTSPOT_666_MAILBOX, + ), + ), + ZorkGrandInquisitorLocations.A_SMALLWAY: ZorkGrandInquisitorLocationData( + game_state_trigger=((11777, 1),), + archipelago_id=LOCATION_OFFSET + 5, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS, + ZorkGrandInquisitorItems.SPELL_IGRAM, + ), + ), + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY: ZorkGrandInquisitorLocationData( + game_state_trigger=((13278, 1),), + archipelago_id=LOCATION_OFFSET + 6, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_MOSSY_GRATE, + ZorkGrandInquisitorItems.SPELL_THROCK, + ), + ), + ZorkGrandInquisitorLocations.BEBURTT_DEMYSTIFIED: ZorkGrandInquisitorLocationData( + game_state_trigger=((16315, 1),), + archipelago_id=LOCATION_OFFSET + 7, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE, + ZorkGrandInquisitorItems.SPELL_KENDALL, + ), + ), + ZorkGrandInquisitorLocations.BETTER_SPELL_MANUFACTURING_IN_UNDER_10_MINUTES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "th3x"),), + archipelago_id=LOCATION_OFFSET + 8, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE,), + ), + ZorkGrandInquisitorLocations.BOING_BOING_BOING: ZorkGrandInquisitorLocationData( + game_state_trigger=((4220, 1),), + archipelago_id=LOCATION_OFFSET + 9, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.SNAPDRAGON, + ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM, + ), + ), + ZorkGrandInquisitorLocations.BONK: ZorkGrandInquisitorLocationData( + game_state_trigger=((19491, 1),), + archipelago_id=LOCATION_OFFSET + 10, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON, + ), + ), + ZorkGrandInquisitorLocations.BRAVE_SOULS_WANTED: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "us2g"),), + archipelago_id=LOCATION_OFFSET + 11, + region=ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.BROG_DO_GOOD: ZorkGrandInquisitorLocationData( + game_state_trigger=((2644, 1),), + archipelago_id=LOCATION_OFFSET + 12, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_BROG, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ) + ), + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS: ZorkGrandInquisitorLocationData( + game_state_trigger=((2629, 1),), + archipelago_id=LOCATION_OFFSET + 13, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_BROG, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ) + ), + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB: ZorkGrandInquisitorLocationData( + game_state_trigger=((2650, 1),), + archipelago_id=LOCATION_OFFSET + 14, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_BROG, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ) + ), + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME: ZorkGrandInquisitorLocationData( + game_state_trigger=((15715, 1),), + archipelago_id=LOCATION_OFFSET + 15, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_BROG, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_PLANK, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE, + ) + ), + ZorkGrandInquisitorLocations.CASTLE_WATCHING_A_FIELD_GUIDE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dv1t"),), + archipelago_id=LOCATION_OFFSET + 16, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.CAVES_NOTES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "th3y"),), + archipelago_id=LOCATION_OFFSET + 17, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE,), + ), + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS: ZorkGrandInquisitorLocationData( + game_state_trigger=((9543, 1),), + archipelago_id=LOCATION_OFFSET + 18, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.CRISIS_AVERTED: ZorkGrandInquisitorLocationData( + game_state_trigger=((11769, 1),), + archipelago_id=LOCATION_OFFSET + 19, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED, + ZorkGrandInquisitorItems.SPELL_IGRAM, + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS, + ZorkGrandInquisitorItems.HOTSPOT_DENTED_LOCKER, + ), + ), + ZorkGrandInquisitorLocations.CUT_THAT_OUT_YOU_LITTLE_CREEP: ZorkGrandInquisitorLocationData( + game_state_trigger=((19350, 1),), + archipelago_id=LOCATION_OFFSET + 20, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER: ZorkGrandInquisitorLocationData( + game_state_trigger=((17632, 1),), + archipelago_id=LOCATION_OFFSET + 21, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_BLINDS, + ZorkGrandInquisitorItems.SPELL_GOLGATEM, + ), + ), + ZorkGrandInquisitorLocations.DESPERATELY_SEEKING_TUTOR: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2q"),), + archipelago_id=LOCATION_OFFSET + 22, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "hp5e"), (8919, 2), (9, 100)), + archipelago_id=LOCATION_OFFSET + 23, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SWORD,), + ), + ZorkGrandInquisitorLocations.DOOOOOOWN: ZorkGrandInquisitorLocationData( + game_state_trigger=((3619, 3600),), + archipelago_id=LOCATION_OFFSET + 24, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_GRIFF, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ), + ), + ZorkGrandInquisitorLocations.DOWN: ZorkGrandInquisitorLocationData( + game_state_trigger=((3619, 5300),), + archipelago_id=LOCATION_OFFSET + 25, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_LUCY, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ), + ), + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL: ZorkGrandInquisitorLocationData( + game_state_trigger=((9216, 1),), + archipelago_id=LOCATION_OFFSET + 26, + region=ZorkGrandInquisitorRegions.HADES_BEYOND_GATES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SPELL_NARWILE,), + ), + ZorkGrandInquisitorLocations.DUNCE_LOCKER: ZorkGrandInquisitorLocationData( + game_state_trigger=((11851, 1),), + archipelago_id=LOCATION_OFFSET + 27, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS, + ), + ), + ZorkGrandInquisitorLocations.EGGPLANTS: ZorkGrandInquisitorLocationData( + game_state_trigger=((3816, 11000),), + archipelago_id=LOCATION_OFFSET + 28, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.ELSEWHERE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pc1e"),), + archipelago_id=LOCATION_OFFSET + 29, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.EMERGENCY_MAGICATRONIC_MESSAGE: ZorkGrandInquisitorLocationData( + game_state_trigger=((11784, 1),), + archipelago_id=LOCATION_OFFSET + 30, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + ), + ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP: ZorkGrandInquisitorLocationData( + game_state_trigger=((13743, 1),), + archipelago_id=LOCATION_OFFSET + 31, + region=ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SPELL_KENDALL,), + ), + ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA: ZorkGrandInquisitorLocationData( + game_state_trigger=((16368, 1),), + archipelago_id=LOCATION_OFFSET + 32, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.SPELL_IGRAM,), + ), + ZorkGrandInquisitorLocations.FIRE_FIRE: ZorkGrandInquisitorLocationData( + game_state_trigger=((10277, 1),), + archipelago_id=LOCATION_OFFSET + 33, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL, + ), + ), + ZorkGrandInquisitorLocations.FLOOD_CONTROL_DAM_3_THE_NOT_REMOTELY_BORING_TALE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "ue1h"),), + archipelago_id=LOCATION_OFFSET + 34, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON: ZorkGrandInquisitorLocationData( + game_state_trigger=((4222, 1),), + archipelago_id=LOCATION_OFFSET + 35, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SPELL_THROCK, + ZorkGrandInquisitorItems.SNAPDRAGON, + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM, + ), + ), + ZorkGrandInquisitorLocations.FROBUARY_3_UNDERGROUNDHOG_DAY: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dw2g"),), + archipelago_id=LOCATION_OFFSET + 36, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.GETTING_SOME_CHANGE: ZorkGrandInquisitorLocationData( + game_state_trigger=((12892, 1),), + archipelago_id=LOCATION_OFFSET + 37, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.ZORKMID_BILL_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_CHANGE_MACHINE_SLOT, + ), + ), + ZorkGrandInquisitorLocations.GO_AWAY: ZorkGrandInquisitorLocationData( + game_state_trigger=((10654, 1),), + archipelago_id=LOCATION_OFFSET + 38, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.GUE_TECH_DEANS_LIST: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2k"),), + archipelago_id=LOCATION_OFFSET + 39, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.GUE_TECH_ENTRANCE_EXAM: ZorkGrandInquisitorLocationData( + game_state_trigger=((11082, 1), (11307, 1), (11536, 1)), + archipelago_id=LOCATION_OFFSET + 40, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.GUE_TECH_HEALTH_MEMO: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2j"),), + archipelago_id=LOCATION_OFFSET + 41, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.GUE_TECH_MAGEMEISTERS: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2n"),), + archipelago_id=LOCATION_OFFSET + 42, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HAVE_A_HELL_OF_A_DAY: ZorkGrandInquisitorLocationData( + game_state_trigger=((8443, 1),), + archipelago_id=LOCATION_OFFSET + 43, + region=ZorkGrandInquisitorRegions.HADES_SHORE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER, + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS, + ) + ), + ZorkGrandInquisitorLocations.HELLO_THIS_IS_SHONA_FROM_GURTH_PUBLISHING: ZorkGrandInquisitorLocationData( + game_state_trigger=((4698, 1),), + archipelago_id=LOCATION_OFFSET + 44, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE: ZorkGrandInquisitorLocationData( + game_state_trigger=((10421, 1),), + archipelago_id=LOCATION_OFFSET + 45, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH, + ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER, + ), + ), + ZorkGrandInquisitorLocations.HEY_FREE_DIRT: ZorkGrandInquisitorLocationData( + game_state_trigger=((11747, 1),), + archipelago_id=LOCATION_OFFSET + 46, + region=ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_DIRT_MOUND, + ZorkGrandInquisitorItems.SHOVEL, + ), + ), + ZorkGrandInquisitorLocations.HI_MY_NAME_IS_DOUG: ZorkGrandInquisitorLocationData( + game_state_trigger=((4698, 2),), + archipelago_id=LOCATION_OFFSET + 47, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "mt2h"),), + archipelago_id=LOCATION_OFFSET + 48, + region=ZorkGrandInquisitorRegions.MONASTERY, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HOLD_ON_FOR_AN_IMPORTANT_MESSAGE: ZorkGrandInquisitorLocationData( + game_state_trigger=((4698, 5),), + archipelago_id=LOCATION_OFFSET + 49, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HOW_TO_HYPNOTIZE_YOURSELF: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "uh1e"),), + archipelago_id=LOCATION_OFFSET + 50, + region=ZorkGrandInquisitorRegions.HADES_SHORE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.HOW_TO_WIN_AT_DOUBLE_FANUCCI: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "th3s"),), + archipelago_id=LOCATION_OFFSET + 51, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE,), + ), + ZorkGrandInquisitorLocations.IMBUE_BEBURTT: ZorkGrandInquisitorLocationData( + game_state_trigger=((194, 1),), + archipelago_id=LOCATION_OFFSET + 52, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_BLANK_SCROLL_BOX, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + ), + ZorkGrandInquisitorLocations.IM_COMPLETELY_NUDE: ZorkGrandInquisitorLocationData( + game_state_trigger=((19344, 1),), + archipelago_id=LOCATION_OFFSET + 53, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.INTO_THE_FOLIAGE: ZorkGrandInquisitorLocationData( + game_state_trigger=((13060, 1),), + archipelago_id=LOCATION_OFFSET + 54, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE, + ), + ), + ZorkGrandInquisitorLocations.INVISIBLE_FLOWERS: ZorkGrandInquisitorLocationData( + game_state_trigger=((12967, 1),), + archipelago_id=LOCATION_OFFSET + 55, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SPELL_IGRAM,), + ), + ZorkGrandInquisitorLocations.IN_CASE_OF_ADVENTURE: ZorkGrandInquisitorLocationData( + game_state_trigger=((12931, 1),), + archipelago_id=LOCATION_OFFSET + 56, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.HOTSPOT_GLASS_CASE, + ), + ), + ZorkGrandInquisitorLocations.IN_MAGIC_WE_TRUST: ZorkGrandInquisitorLocationData( + game_state_trigger=((13062, 1),), + archipelago_id=LOCATION_OFFSET + 57, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SPELL_REZROV, + ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR, + ), + ), + ZorkGrandInquisitorLocations.ITS_ONE_OF_THOSE_ADVENTURERS_AGAIN: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pe3j"),), + archipelago_id=LOCATION_OFFSET + 58, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY: ZorkGrandInquisitorLocationData( + game_state_trigger=((3816, 1008),), + archipelago_id=LOCATION_OFFSET + 59, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.SPELL_THROCK, + ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON, + ), + ), + ZorkGrandInquisitorLocations.I_DONT_WANT_NO_TROUBLE: ZorkGrandInquisitorLocationData( + game_state_trigger=((10694, 1),), + archipelago_id=LOCATION_OFFSET + 60, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE: ZorkGrandInquisitorLocationData( + game_state_trigger=((9637, 1),), + archipelago_id=LOCATION_OFFSET + 61, + region=ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorEvents.ROPE_GLORFABLE, + ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT, + ), + ), + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE: ZorkGrandInquisitorLocationData( + game_state_trigger=((16374, 1),), + archipelago_id=LOCATION_OFFSET + 62, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE, + ZorkGrandInquisitorEvents.DAM_DESTROYED, + ZorkGrandInquisitorItems.SPELL_GOLGATEM, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM, + ), + ), + ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tp1e"), (9, 87), (1011, 1)), + archipelago_id=LOCATION_OFFSET + 63, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS,), + ), + ZorkGrandInquisitorLocations.LIT_SUNFLOWERS: ZorkGrandInquisitorLocationData( + game_state_trigger=((4129, 1),), + archipelago_id=LOCATION_OFFSET + 64, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SPELL_THROCK,), + ), + ZorkGrandInquisitorLocations.MAGIC_FOREVER: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pc1e"), (10304, 1), (5221, 1)), + archipelago_id=LOCATION_OFFSET + 65, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.LANTERN_DALBOZ_ACCESSIBLE, + ZorkGrandInquisitorItems.ROPE, + ZorkGrandInquisitorItems.HOTSPOT_WELL, + ), + ), + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL: ZorkGrandInquisitorLocationData( + game_state_trigger=((2498, (1, 2)),), + archipelago_id=LOCATION_OFFSET + 66, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + (ZorkGrandInquisitorItems.TOTEM_GRIFF, ZorkGrandInquisitorItems.TOTEM_LUCY), + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_DOOR, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ), + ), + ZorkGrandInquisitorLocations.MAKE_LOVE_NOT_WAR: ZorkGrandInquisitorLocationData( + game_state_trigger=((8623, 21),), + archipelago_id=LOCATION_OFFSET + 67, + region=ZorkGrandInquisitorRegions.HADES_SHORE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.CHARON_CALLED, + ZorkGrandInquisitorItems.SWORD, + ), + ), + ZorkGrandInquisitorLocations.MEAD_LIGHT: ZorkGrandInquisitorLocationData( + game_state_trigger=((10485, 1),), + archipelago_id=LOCATION_OFFSET + 68, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.MEAD_LIGHT, + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR, + ), + ), + ZorkGrandInquisitorLocations.MIKES_PANTS: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2p"),), + archipelago_id=LOCATION_OFFSET + 69, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED: ZorkGrandInquisitorLocationData( + game_state_trigger=((4217, 1),), + archipelago_id=LOCATION_OFFSET + 70, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM, + ), + ), + ZorkGrandInquisitorLocations.NATIONAL_TREASURE: ZorkGrandInquisitorLocationData( + game_state_trigger=((14318, 1),), + archipelago_id=LOCATION_OFFSET + 71, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SPELL_REZROV, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS, + ), + ), + ZorkGrandInquisitorLocations.NATURAL_AND_SUPERNATURAL_CREATURES_OF_QUENDOR: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dv1p"),), + archipelago_id=LOCATION_OFFSET + 72, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO: ZorkGrandInquisitorLocationData( + game_state_trigger=((12706, 1),), + archipelago_id=LOCATION_OFFSET + 73, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS, + ), + ), + ZorkGrandInquisitorLocations.NOTHIN_LIKE_A_GOOD_STOGIE: ZorkGrandInquisitorLocationData( + game_state_trigger=((4237, 1),), + archipelago_id=LOCATION_OFFSET + 74, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY, + ), + ), + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT: ZorkGrandInquisitorLocationData( + game_state_trigger=((8935, 1),), + archipelago_id=LOCATION_OFFSET + 75, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.KNOWS_SNAVIG,), + ), + ZorkGrandInquisitorLocations.NO_AUTOGRAPHS: ZorkGrandInquisitorLocationData( + game_state_trigger=((10476, 1),), + archipelago_id=LOCATION_OFFSET + 76, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR,), + ), + ZorkGrandInquisitorLocations.NO_BONDAGE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pe2e"), (10262, 2), (15150, 83)), + archipelago_id=LOCATION_OFFSET + 77, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.ROPE, + ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH, + ), + ), + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP: ZorkGrandInquisitorLocationData( + game_state_trigger=((12164, 1),), + archipelago_id=LOCATION_OFFSET + 78, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + ), + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON: ZorkGrandInquisitorLocationData( + game_state_trigger=((1300, 1),), + archipelago_id=LOCATION_OFFSET + 79, + region=ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ), + ), + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS: ZorkGrandInquisitorLocationData( + game_state_trigger=((2448, 1),), + archipelago_id=LOCATION_OFFSET + 80, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_BROG, + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR, + ), + ), + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU: ZorkGrandInquisitorLocationData( + game_state_trigger=((4869, 1),), + archipelago_id=LOCATION_OFFSET + 81, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.FLATHEADIA_FUDGE, + ZorkGrandInquisitorItems.HUNGUS_LARD, + ZorkGrandInquisitorItems.JAR_OF_HOTBUGS, + ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB, + ZorkGrandInquisitorItems.MOSS_OF_MAREILON, + ZorkGrandInquisitorItems.MUG, + ), + ), + ZorkGrandInquisitorLocations.OLD_SCRATCH_WINNER: ZorkGrandInquisitorLocationData( + game_state_trigger=((4512, 32),), + archipelago_id=LOCATION_OFFSET + 82, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, # This can be done anywhere if the item requirement is met + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.OLD_SCRATCH_CARD,), + ), + ZorkGrandInquisitorLocations.ONLY_YOU_CAN_PREVENT_FOOZLE_FIRES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pe5n"),), + archipelago_id=LOCATION_OFFSET + 83, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL: ZorkGrandInquisitorLocationData( + game_state_trigger=((8730, 1),), + archipelago_id=LOCATION_OFFSET + 84, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.KNOWS_SNAVIG,), + ), + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES: ZorkGrandInquisitorLocationData( + game_state_trigger=((4241, 1),), + archipelago_id=LOCATION_OFFSET + 85, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HUNGUS_LARD, + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE, + ), + ), + ZorkGrandInquisitorLocations.PERMASEAL: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "mt1g"),), + archipelago_id=LOCATION_OFFSET + 86, + region=ZorkGrandInquisitorRegions.MONASTERY, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.PLANETFALL: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "pp1j"),), + archipelago_id=LOCATION_OFFSET + 87, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.PLEASE_DONT_THROCK_THE_GRASS: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "te1g"),), + archipelago_id=LOCATION_OFFSET + 88, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL: ZorkGrandInquisitorLocationData( + game_state_trigger=((9404, 1),), + archipelago_id=LOCATION_OFFSET + 89, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER, + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT, + ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER, + ZorkGrandInquisitorItems.SPELL_NARWILE, + ), + ), + ZorkGrandInquisitorLocations.PROZORKED: ZorkGrandInquisitorLocationData( + game_state_trigger=((4115, 1),), + archipelago_id=LOCATION_OFFSET + 90, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.PROZORK_TABLET, + ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON, + ), + ), + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG: ZorkGrandInquisitorLocationData( + game_state_trigger=((4512, 98),), + archipelago_id=LOCATION_OFFSET + 91, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS, + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV, + ZorkGrandInquisitorItems.HOTSPOT_MIRROR, + ), + ), + ZorkGrandInquisitorLocations.RESTOCKED_ON_GRUESDAY: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tr2h"),), + archipelago_id=LOCATION_OFFSET + 92, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.RIGHT_HELLO_YES_UH_THIS_IS_SNEFFLE: ZorkGrandInquisitorLocationData( + game_state_trigger=((4698, 3),), + archipelago_id=LOCATION_OFFSET + 93, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.RIGHT_UH_SORRY_ITS_ME_AGAIN_SNEFFLE: ZorkGrandInquisitorLocationData( + game_state_trigger=((4698, 4),), + archipelago_id=LOCATION_OFFSET + 94, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED: ZorkGrandInquisitorLocationData( + game_state_trigger=((201, 1),), + archipelago_id=LOCATION_OFFSET + 95, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + ), + ZorkGrandInquisitorLocations.SOUVENIR: ZorkGrandInquisitorLocationData( + game_state_trigger=((13408, 1),), + archipelago_id=LOCATION_OFFSET + 96, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_SOUVENIR_COIN_SLOT, + ), + ), + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL: ZorkGrandInquisitorLocationData( + game_state_trigger=((9719, 1),), + archipelago_id=LOCATION_OFFSET + 97, + region=ZorkGrandInquisitorRegions.MONASTERY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS, + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH, + ), + ), + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER: ZorkGrandInquisitorLocationData( + game_state_trigger=((14511, 1), (14524, 5)), + archipelago_id=LOCATION_OFFSET + 98, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ), + ), + ZorkGrandInquisitorLocations.SUCKING_ROCKS: ZorkGrandInquisitorLocationData( + game_state_trigger=((12859, 1),), + archipelago_id=LOCATION_OFFSET + 99, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE, + ZorkGrandInquisitorItems.PERMA_SUCK_MACHINE, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_VACUUM_SLOT, + ), + ), + ZorkGrandInquisitorLocations.TALK_TO_ME_GRAND_INQUISITOR: ZorkGrandInquisitorLocationData( + game_state_trigger=((10299, 1),), + archipelago_id=LOCATION_OFFSET + 100, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL,), + ), + ZorkGrandInquisitorLocations.TAMING_YOUR_SNAPDRAGON: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dv1h"),), + archipelago_id=LOCATION_OFFSET + 101, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS: ZorkGrandInquisitorLocationData( + game_state_trigger=((1311, 1), (1312, 1)), + archipelago_id=LOCATION_OFFSET + 102, + region=ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ), + ), + ZorkGrandInquisitorLocations.THATS_A_ROPE: ZorkGrandInquisitorLocationData( + game_state_trigger=((10486, 1),), + archipelago_id=LOCATION_OFFSET + 103, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.ROPE, + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR, + ), + ), + ZorkGrandInquisitorLocations.THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS: ZorkGrandInquisitorLocationData( + game_state_trigger=((13805, 1),), + archipelago_id=LOCATION_OFFSET + 104, + region=ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + ), + ZorkGrandInquisitorLocations.THATS_STILL_A_ROPE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "tp1e"), (9, 83), (1011, 1)), + archipelago_id=LOCATION_OFFSET + 105, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorEvents.ROPE_GLORFABLE,), + ), + ZorkGrandInquisitorLocations.THATS_THE_SPIRIT: ZorkGrandInquisitorLocationData( + game_state_trigger=((10341, 95),), + archipelago_id=LOCATION_OFFSET + 106, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_LOUDSPEAKER_VOLUME_BUTTONS,), + ), + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE: ZorkGrandInquisitorLocationData( + game_state_trigger=((9459, 1),), + archipelago_id=LOCATION_OFFSET + 107, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE: ZorkGrandInquisitorLocationData( + game_state_trigger=((9473, 1),), + archipelago_id=LOCATION_OFFSET + 108, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO: ZorkGrandInquisitorLocationData( + game_state_trigger=((9520, 1),), + archipelago_id=LOCATION_OFFSET + 109, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "me1j"),), + archipelago_id=LOCATION_OFFSET + 110, + region=ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.THE_UNDERGROUND_UNDERGROUND: ZorkGrandInquisitorLocationData( + game_state_trigger=((13167, 1),), + archipelago_id=LOCATION_OFFSET + 111, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SUBWAY_TOKEN, + ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT, + ), + ), + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "cd60"), (1524, 1)), + archipelago_id=LOCATION_OFFSET + 112, + region=ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.TOTEM_LUCY,), + ), + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED: ZorkGrandInquisitorLocationData( + game_state_trigger=((4219, 1),), + archipelago_id=LOCATION_OFFSET + 113, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HAMMER, + ZorkGrandInquisitorItems.SPELL_THROCK, + ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM, + ), + ), + ZorkGrandInquisitorLocations.TIME_TRAVEL_FOR_DUMMIES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "th3z"),), + archipelago_id=LOCATION_OFFSET + 114, + region=ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE,), + ), + ZorkGrandInquisitorLocations.TOTEMIZED_DAILY_BILLBOARD: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "px1h"),), + archipelago_id=LOCATION_OFFSET + 115, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "cd60"), (1520, 1)), + archipelago_id=LOCATION_OFFSET + 116, + region=ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.TOTEM_BROG,), + ), + ZorkGrandInquisitorLocations.UMBRELLA_FLOWERS: ZorkGrandInquisitorLocationData( + game_state_trigger=((12926, 1),), + archipelago_id=LOCATION_OFFSET + 117, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorEvents.KNOWS_BEBURTT,), + ), + ZorkGrandInquisitorLocations.UP: ZorkGrandInquisitorLocationData( + game_state_trigger=((3619, 5200),), + archipelago_id=LOCATION_OFFSET + 118, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_LUCY, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ), + ), + ZorkGrandInquisitorLocations.USELESS_BUT_FUN: ZorkGrandInquisitorLocationData( + game_state_trigger=((14321, 1),), + archipelago_id=LOCATION_OFFSET + 119, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=(ZorkGrandInquisitorItems.SPELL_GOLGATEM,), + ), + ZorkGrandInquisitorLocations.UUUUUP: ZorkGrandInquisitorLocationData( + game_state_trigger=((3619, 3500),), + archipelago_id=LOCATION_OFFSET + 120, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_GRIFF, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ), + ), + ZorkGrandInquisitorLocations.VOYAGE_OF_CAPTAIN_ZAHAB: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "uh1h"),), + archipelago_id=LOCATION_OFFSET + 121, + region=ZorkGrandInquisitorRegions.HADES_SHORE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO: ZorkGrandInquisitorLocationData( + game_state_trigger=((4034, 1),), + archipelago_id=LOCATION_OFFSET + 122, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR, + ZorkGrandInquisitorItems.MEAD_LIGHT, + ZorkGrandInquisitorItems.ZIMDOR_SCROLL, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH, + ), + ), + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE: ZorkGrandInquisitorLocationData( + game_state_trigger=((2461, 1),), + archipelago_id=LOCATION_OFFSET + 123, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.TOTEM_GRIFF, + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR, + ), + ), + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER: ZorkGrandInquisitorLocationData( + game_state_trigger=((15472, 1),), + archipelago_id=LOCATION_OFFSET + 124, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ), + ), + ZorkGrandInquisitorLocations.WHAT_ARE_YOU_STUPID: ZorkGrandInquisitorLocationData( + game_state_trigger=((10484, 1),), + archipelago_id=LOCATION_OFFSET + 125, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER, + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR, + ), + ), + ZorkGrandInquisitorLocations.WHITE_HOUSE_TIME_TUNNEL: ZorkGrandInquisitorLocationData( + game_state_trigger=((4983, 1),), + archipelago_id=LOCATION_OFFSET + 126, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR, + ZorkGrandInquisitorItems.SPELL_NARWILE, + ), + ), + ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dc10"), (1596, 1)), + archipelago_id=LOCATION_OFFSET + 127, + region=ZorkGrandInquisitorRegions.WALKING_CASTLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dm2g"),), + archipelago_id=LOCATION_OFFSET + 128, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_MIRROR,), + ), + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "dg4e"), (4266, 1), (9, 21), (4035, 1)), + archipelago_id=LOCATION_OFFSET + 129, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_HARRY, + ), + ), + ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER: ZorkGrandInquisitorLocationData( + game_state_trigger=((16405, 1),), + archipelago_id=LOCATION_OFFSET + 130, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.SPELL_REZROV,), + ), + ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS: ZorkGrandInquisitorLocationData( + game_state_trigger=((16342, 1),), + archipelago_id=LOCATION_OFFSET + 131, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.CORE,), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE, + ), + ), + ZorkGrandInquisitorLocations.YOU_ONE_OF_THEM_AGITATORS_AINT_YA: ZorkGrandInquisitorLocationData( + game_state_trigger=((10586, 1),), + archipelago_id=LOCATION_OFFSET + 132, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE,), + ), + ZorkGrandInquisitorLocations.YOU_WANT_A_PIECE_OF_ME_DOCK_BOY: ZorkGrandInquisitorLocationData( + game_state_trigger=((15151, 1),), + archipelago_id=LOCATION_OFFSET + 133, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.CORE, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH,), + ), + # Deathsanity + ZorkGrandInquisitorLocations.DEATH_ARRESTED_WITH_JACK: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 1)), + archipelago_id=LOCATION_OFFSET + 200 + 0, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL, + ), + ), + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 20)), + archipelago_id=LOCATION_OFFSET + 200 + 1, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.SWORD, + ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE, + ), + ), + ZorkGrandInquisitorLocations.DEATH_CLIMBED_OUT_OF_THE_WELL: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 21)), + archipelago_id=LOCATION_OFFSET + 200 + 2, + region=ZorkGrandInquisitorRegions.CROSSROADS, + tags=(ZorkGrandInquisitorTags.DEATHSANITY,), + ), + ZorkGrandInquisitorLocations.DEATH_EATEN_BY_A_GRUE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 18)), + archipelago_id=LOCATION_OFFSET + 200 + 3, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.ROPE, + ZorkGrandInquisitorItems.HOTSPOT_WELL, + ), + ), + ZorkGrandInquisitorLocations.DEATH_JUMPED_IN_BOTTOMLESS_PIT: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 3)), + archipelago_id=LOCATION_OFFSET + 200 + 4, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.DEATHSANITY,), + ), + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 37)), + archipelago_id=LOCATION_OFFSET + 200 + 5, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS, + ), + ), + ZorkGrandInquisitorLocations.DEATH_LOST_SOUL_TO_OLD_SCRATCH: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 23)), + archipelago_id=LOCATION_OFFSET + 200 + 6, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorItems.OLD_SCRATCH_CARD,), + ), + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 29)), + archipelago_id=LOCATION_OFFSET + 200 + 7, + region=ZorkGrandInquisitorRegions.DM_LAIR, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.HUNGUS_LARD, + ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE, + ), + ), + ZorkGrandInquisitorLocations.DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 30)), + archipelago_id=LOCATION_OFFSET + 200 + 8, + region=ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + ), + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 4)), + archipelago_id=LOCATION_OFFSET + 200 + 9, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.SPELL_IGRAM, + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS, + ), + ), + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 11)), + archipelago_id=LOCATION_OFFSET + 200 + 10, + region=ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ), + ), + ZorkGrandInquisitorLocations.DEATH_THROCKED_THE_GRASS: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 34)), + archipelago_id=LOCATION_OFFSET + 200 + 11, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.DEATHSANITY,), + requirements=( + ZorkGrandInquisitorItems.SPELL_THROCK, + ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_GRASS, + ), + ), + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, (9, 32, 33))), + archipelago_id=LOCATION_OFFSET + 200 + 12, + region=ZorkGrandInquisitorRegions.MONASTERY, + tags=(ZorkGrandInquisitorTags.DEATHSANITY,), + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH, + ), + ), + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, (5, 6, 7, 8, 13))), + archipelago_id=LOCATION_OFFSET + 200 + 13, + region=ZorkGrandInquisitorRegions.MONASTERY, + tags=(ZorkGrandInquisitorTags.DEATHSANITY,), + requirements=(ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH,), + ), + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 10)), + archipelago_id=LOCATION_OFFSET + 200 + 14, + region=ZorkGrandInquisitorRegions.HADES, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorEvents.KNOWS_SNAVIG,), + ), + ZorkGrandInquisitorLocations.DEATH_ZORK_ROCKS_EXPLODED: ZorkGrandInquisitorLocationData( + game_state_trigger=(("location", "gjde"), (2201, 19)), + archipelago_id=LOCATION_OFFSET + 200 + 15, + region=ZorkGrandInquisitorRegions.GUE_TECH, + tags=(ZorkGrandInquisitorTags.DEATHSANITY, ZorkGrandInquisitorTags.MISSABLE), + requirements=(ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED,), + ), + # Events + ZorkGrandInquisitorEvents.CHARON_CALLED: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.HADES_SHORE, + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER, + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.CHARON_CALLED.value, + ), + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + requirements=( + ZorkGrandInquisitorItems.LANTERN, + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR, + ), + event_item_name=ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE.value, + ), + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.GUE_TECH, + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ), + ZorkGrandInquisitorEvents.DAM_DESTROYED: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + requirements=( + ZorkGrandInquisitorItems.SPELL_REZROV, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ), + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.DM_LAIR, + requirements=( + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR, + ZorkGrandInquisitorItems.MEAD_LIGHT, + ZorkGrandInquisitorItems.ZIMDOR_SCROLL, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH, + ), + event_item_name=ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ), + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.DM_LAIR, + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY, + ), + event_item_name=ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR.value, + ), + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.GUE_TECH, + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ), + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.GUE_TECH, + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_DOORS, + ), + event_item_name=ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ), + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + requirements=( + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS, + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV, + ZorkGrandInquisitorItems.HOTSPOT_MIRROR, + ), + event_item_name=ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ), + ZorkGrandInquisitorEvents.KNOWS_BEBURTT: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + requirements=( + ZorkGrandInquisitorItems.HOTSPOT_BLANK_SCROLL_BOX, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + event_item_name=ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ), + ZorkGrandInquisitorEvents.KNOWS_OBIDIL: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + requirements=( + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + event_item_name=ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ), + ZorkGrandInquisitorEvents.KNOWS_SNAVIG: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.SPELL_LAB, + requirements=( + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER, + ), + event_item_name=ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ), + ZorkGrandInquisitorEvents.KNOWS_YASTARD: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + requirements=( + ZorkGrandInquisitorItems.FLATHEADIA_FUDGE, + ZorkGrandInquisitorItems.HUNGUS_LARD, + ZorkGrandInquisitorItems.JAR_OF_HOTBUGS, + ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB, + ZorkGrandInquisitorItems.MOSS_OF_MAREILON, + ZorkGrandInquisitorItems.MUG, + ), + event_item_name=ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ), + ZorkGrandInquisitorEvents.LANTERN_DALBOZ_ACCESSIBLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + requirements=( + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL, + ), + event_item_name=ZorkGrandInquisitorEvents.LANTERN_DALBOZ_ACCESSIBLE.value, + ), + ZorkGrandInquisitorEvents.ROPE_GLORFABLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.CROSSROADS, + requirements=(ZorkGrandInquisitorItems.SPELL_GLORF,), + event_item_name=ZorkGrandInquisitorEvents.ROPE_GLORFABLE.value, + ), + ZorkGrandInquisitorEvents.VICTORY: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.ENDGAME, + event_item_name=ZorkGrandInquisitorEvents.VICTORY.value, + ), + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.WHITE_HOUSE, + requirements=( + (ZorkGrandInquisitorItems.TOTEM_GRIFF, ZorkGrandInquisitorItems.TOTEM_LUCY), + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG, + ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_DOOR, + ), + event_item_name=ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ), + ZorkGrandInquisitorEvents.ZORKMID_BILL_ACCESSIBLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.PORT_FOOZLE, + requirements=(ZorkGrandInquisitorItems.OLD_SCRATCH_CARD,), + event_item_name=ZorkGrandInquisitorEvents.ZORKMID_BILL_ACCESSIBLE.value, + ), + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.GUE_TECH, + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.ZORK_ROCKS, + ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ), + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE: ZorkGrandInquisitorLocationData( + game_state_trigger=None, + archipelago_id=None, + region=ZorkGrandInquisitorRegions.GUE_TECH, + requirements=( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT, + ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS, + ), + event_item_name=ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ), +} diff --git a/worlds/zork_grand_inquisitor/data/missable_location_grant_conditions_data.py b/worlds/zork_grand_inquisitor/data/missable_location_grant_conditions_data.py new file mode 100644 index 000000000000..ef6eacb78ceb --- /dev/null +++ b/worlds/zork_grand_inquisitor/data/missable_location_grant_conditions_data.py @@ -0,0 +1,200 @@ +from typing import Dict, NamedTuple, Optional, Tuple + +from ..enums import ZorkGrandInquisitorItems, ZorkGrandInquisitorLocations + + +class ZorkGrandInquisitorMissableLocationGrantConditionsData(NamedTuple): + location_condition: ZorkGrandInquisitorLocations + item_conditions: Optional[Tuple[ZorkGrandInquisitorItems, ...]] + + +missable_location_grant_conditions_data: Dict[ + ZorkGrandInquisitorLocations, ZorkGrandInquisitorMissableLocationGrantConditionsData +] = { + ZorkGrandInquisitorLocations.BOING_BOING_BOING: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.BONK: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.PROZORKED, + item_conditions=(ZorkGrandInquisitorItems.HAMMER,), + ) + , + ZorkGrandInquisitorLocations.DEATH_ARRESTED_WITH_JACK: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.ARREST_THE_VANDAL, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_EATEN_BY_A_GRUE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.MAGIC_FOREVER, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_LOST_SOUL_TO_OLD_SCRATCH: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.OLD_SCRATCH_WINNER, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.A_SMALLWAY, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.THAR_SHE_BLOWS, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DEATH_ZORK_ROCKS_EXPLODED: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.CRISIS_AVERTED, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE, + item_conditions=(ZorkGrandInquisitorItems.SPELL_GOLGATEM,), + ) + , + ZorkGrandInquisitorLocations.EMERGENCY_MAGICATRONIC_MESSAGE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS, + item_conditions=(ZorkGrandInquisitorItems.SPELL_IGRAM,), + ) + , + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.PROZORKED, + item_conditions=(ZorkGrandInquisitorItems.SPELL_THROCK,), + ) + , + ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS, + item_conditions=(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS,), + ) + , + ZorkGrandInquisitorLocations.MEAD_LIGHT: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE, + item_conditions=(ZorkGrandInquisitorItems.MEAD_LIGHT,), + ) + , + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.NO_AUTOGRAPHS: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.NO_BONDAGE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE, + item_conditions=(ZorkGrandInquisitorItems.ROPE,), + ) + , + ZorkGrandInquisitorLocations.TALK_TO_ME_GRAND_INQUISITOR: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.THATS_A_ROPE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE, + item_conditions=(ZorkGrandInquisitorItems.ROPE,), + ) + , + ZorkGrandInquisitorLocations.THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.THATS_STILL_A_ROPE: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS, + item_conditions=(ZorkGrandInquisitorItems.SPELL_GLORF,), + ) + , + ZorkGrandInquisitorLocations.WHAT_ARE_YOU_STUPID: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE, + item_conditions=(ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER,), + ) + , + ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG, + item_conditions=None, + ) + , + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO, + item_conditions=(ZorkGrandInquisitorItems.SWORD, ZorkGrandInquisitorItems.HOTSPOT_HARRY), + ) + , + ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS, + item_conditions=(ZorkGrandInquisitorItems.SPELL_REZROV,), + ) + , + ZorkGrandInquisitorLocations.YOU_WANT_A_PIECE_OF_ME_DOCK_BOY: + ZorkGrandInquisitorMissableLocationGrantConditionsData( + location_condition=ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE, + item_conditions=None, + ) + , +} diff --git a/worlds/zork_grand_inquisitor/data/region_data.py b/worlds/zork_grand_inquisitor/data/region_data.py new file mode 100644 index 000000000000..1aed160f3088 --- /dev/null +++ b/worlds/zork_grand_inquisitor/data/region_data.py @@ -0,0 +1,183 @@ +from typing import Dict, NamedTuple, Optional, Tuple + +from ..enums import ZorkGrandInquisitorRegions + + +class ZorkGrandInquisitorRegionData(NamedTuple): + exits: Optional[Tuple[ZorkGrandInquisitorRegions, ...]] + + +region_data: Dict[ZorkGrandInquisitorRegions, ZorkGrandInquisitorRegionData] = { + ZorkGrandInquisitorRegions.CROSSROADS: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DM_LAIR, + ZorkGrandInquisitorRegions.GUE_TECH, + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.PORT_FOOZLE, + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.DM_LAIR: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DM_LAIR, + ZorkGrandInquisitorRegions.WALKING_CASTLE, + ZorkGrandInquisitorRegions.WHITE_HOUSE, + ) + ), + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, + ZorkGrandInquisitorRegions.HADES_BEYOND_GATES, + ) + ), + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, + ZorkGrandInquisitorRegions.ENDGAME, + ) + ), + ZorkGrandInquisitorRegions.ENDGAME: ZorkGrandInquisitorRegionData(exits=None), + ZorkGrandInquisitorRegions.GUE_TECH: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + ) + ), + ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.GUE_TECH, + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + ) + ), + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.DM_LAIR, + ZorkGrandInquisitorRegions.GUE_TECH, + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.HADES: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.HADES_BEYOND_GATES, + ZorkGrandInquisitorRegions.HADES_SHORE, + ) + ), + ZorkGrandInquisitorRegions.HADES_BEYOND_GATES: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO, + ZorkGrandInquisitorRegions.HADES, + ) + ), + ZorkGrandInquisitorRegions.HADES_SHORE: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.DM_LAIR, + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + ZorkGrandInquisitorRegions.HADES, + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE, + ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.MENU: ZorkGrandInquisitorRegionData( + exits=(ZorkGrandInquisitorRegions.PORT_FOOZLE,) + ), + ZorkGrandInquisitorRegions.MONASTERY: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.MONASTERY, + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, + ) + ), + ZorkGrandInquisitorRegions.PORT_FOOZLE: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP, + ) + ), + ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP: ZorkGrandInquisitorRegionData( + exits=(ZorkGrandInquisitorRegions.PORT_FOOZLE,) + ), + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT, + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN, + ) + ), + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.ENDGAME, + ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST, + ) + ), + ZorkGrandInquisitorRegions.SPELL_LAB: ZorkGrandInquisitorRegionData( + exits=(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE,) + ), + ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.DM_LAIR, + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, + ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY, + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.SPELL_LAB, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.CROSSROADS, + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY, + ) + ), + ZorkGrandInquisitorRegions.SUBWAY_MONASTERY: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.HADES_SHORE, + ZorkGrandInquisitorRegions.MONASTERY, + ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS, + ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM, + ) + ), + ZorkGrandInquisitorRegions.WALKING_CASTLE: ZorkGrandInquisitorRegionData( + exits=(ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR,) + ), + ZorkGrandInquisitorRegions.WHITE_HOUSE: ZorkGrandInquisitorRegionData( + exits=( + ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, + ZorkGrandInquisitorRegions.ENDGAME, + ) + ), +} diff --git a/worlds/zork_grand_inquisitor/data_funcs.py b/worlds/zork_grand_inquisitor/data_funcs.py new file mode 100644 index 000000000000..9ea806e8aa4d --- /dev/null +++ b/worlds/zork_grand_inquisitor/data_funcs.py @@ -0,0 +1,247 @@ +from typing import Dict, Set, Tuple, Union + +from .data.entrance_rule_data import entrance_rule_data +from .data.item_data import item_data, ZorkGrandInquisitorItemData +from .data.location_data import location_data, ZorkGrandInquisitorLocationData + +from .enums import ( + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorGoals, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorLocations, + ZorkGrandInquisitorRegions, + ZorkGrandInquisitorTags, +) + + +def item_names_to_id() -> Dict[str, int]: + return {item.value: data.archipelago_id for item, data in item_data.items()} + + +def item_names_to_item() -> Dict[str, ZorkGrandInquisitorItems]: + return {item.value: item for item in item_data} + + +def location_names_to_id() -> Dict[str, int]: + return { + location.value: data.archipelago_id + for location, data in location_data.items() + if data.archipelago_id is not None + } + + +def location_names_to_location() -> Dict[str, ZorkGrandInquisitorLocations]: + return { + location.value: location + for location, data in location_data.items() + if data.archipelago_id is not None + } + + +def id_to_goals() -> Dict[int, ZorkGrandInquisitorGoals]: + return {goal.value: goal for goal in ZorkGrandInquisitorGoals} + + +def id_to_items() -> Dict[int, ZorkGrandInquisitorItems]: + return {data.archipelago_id: item for item, data in item_data.items()} + + +def id_to_locations() -> Dict[int, ZorkGrandInquisitorLocations]: + return { + data.archipelago_id: location + for location, data in location_data.items() + if data.archipelago_id is not None + } + + +def item_groups() -> Dict[str, Set[str]]: + groups: Dict[str, Set[str]] = dict() + + item: ZorkGrandInquisitorItems + data: ZorkGrandInquisitorItemData + for item, data in item_data.items(): + if data.tags is not None: + for tag in data.tags: + groups.setdefault(tag.value, set()).add(item.value) + + return {k: v for k, v in groups.items() if len(v)} + + +def items_with_tag(tag: ZorkGrandInquisitorTags) -> Set[ZorkGrandInquisitorItems]: + items: Set[ZorkGrandInquisitorItems] = set() + + item: ZorkGrandInquisitorItems + data: ZorkGrandInquisitorItemData + for item, data in item_data.items(): + if data.tags is not None and tag in data.tags: + items.add(item) + + return items + + +def game_id_to_items() -> Dict[int, ZorkGrandInquisitorItems]: + mapping: Dict[int, ZorkGrandInquisitorItems] = dict() + + item: ZorkGrandInquisitorItems + data: ZorkGrandInquisitorItemData + for item, data in item_data.items(): + if data.statemap_keys is not None: + for key in data.statemap_keys: + mapping[key] = item + + return mapping + + +def location_groups() -> Dict[str, Set[str]]: + groups: Dict[str, Set[str]] = dict() + + tag: ZorkGrandInquisitorTags + for tag in ZorkGrandInquisitorTags: + groups[tag.value] = set() + + location: ZorkGrandInquisitorLocations + data: ZorkGrandInquisitorLocationData + for location, data in location_data.items(): + if data.tags is not None: + for tag in data.tags: + groups[tag.value].add(location.value) + + return {k: v for k, v in groups.items() if len(v)} + + +def locations_by_region(include_deathsanity: bool = False) -> Dict[ + ZorkGrandInquisitorRegions, Set[ZorkGrandInquisitorLocations] +]: + mapping: Dict[ZorkGrandInquisitorRegions, Set[ZorkGrandInquisitorLocations]] = dict() + + region: ZorkGrandInquisitorRegions + for region in ZorkGrandInquisitorRegions: + mapping[region] = set() + + location: ZorkGrandInquisitorLocations + data: ZorkGrandInquisitorLocationData + for location, data in location_data.items(): + if not include_deathsanity and ZorkGrandInquisitorTags.DEATHSANITY in ( + data.tags or tuple() + ): + continue + + mapping[data.region].add(location) + + return mapping + + +def locations_with_tag(tag: ZorkGrandInquisitorTags) -> Set[ZorkGrandInquisitorLocations]: + location: ZorkGrandInquisitorLocations + data: ZorkGrandInquisitorLocationData + + return {location for location, data in location_data.items() if data.tags is not None and tag in data.tags} + + +def location_access_rule_for(location: ZorkGrandInquisitorLocations, player: int) -> str: + data: ZorkGrandInquisitorLocationData = location_data[location] + + if data.requirements is None: + return "lambda state: True" + + lambda_string: str = "lambda state: " + + i: int + requirement: Union[ + Tuple[ + Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ], + ..., + ], + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems + ] + + for i, requirement in enumerate(data.requirements): + if isinstance(requirement, tuple): + lambda_string += "(" + + ii: int + sub_requirement: Union[ZorkGrandInquisitorEvents, ZorkGrandInquisitorItems] + for ii, sub_requirement in enumerate(requirement): + lambda_string += f"state.has(\"{sub_requirement.value}\", {player})" + + if ii < len(requirement) - 1: + lambda_string += " or " + + lambda_string += ")" + else: + lambda_string += f"state.has(\"{requirement.value}\", {player})" + + if i < len(data.requirements) - 1: + lambda_string += " and " + + return lambda_string + + +def entrance_access_rule_for( + region_origin: ZorkGrandInquisitorRegions, + region_destination: ZorkGrandInquisitorRegions, + player: int +) -> str: + data: Union[ + Tuple[ + Tuple[ + Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorRegions, + ], + ..., + ], + ..., + ], + None, + ] = entrance_rule_data[(region_origin, region_destination)] + + if data is None: + return "lambda state: True" + + lambda_string: str = "lambda state: " + + i: int + requirement_group: Tuple[ + Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorRegions, + ], + ..., + ] + for i, requirement_group in enumerate(data): + lambda_string += "(" + + ii: int + requirement: Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorRegions, + ] + for ii, requirement in enumerate(requirement_group): + requirement_type: Union[ + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorRegions, + ] = type(requirement) + + if requirement_type in (ZorkGrandInquisitorEvents, ZorkGrandInquisitorItems): + lambda_string += f"state.has(\"{requirement.value}\", {player})" + elif requirement_type == ZorkGrandInquisitorRegions: + lambda_string += f"state.can_reach(\"{requirement.value}\", \"Region\", {player})" + + if ii < len(requirement_group) - 1: + lambda_string += " and " + + lambda_string += ")" + + if i < len(data) - 1: + lambda_string += " or " + + return lambda_string diff --git a/worlds/zork_grand_inquisitor/docs/en_Zork Grand Inquisitor.md b/worlds/zork_grand_inquisitor/docs/en_Zork Grand Inquisitor.md new file mode 100644 index 000000000000..d5821914beca --- /dev/null +++ b/worlds/zork_grand_inquisitor/docs/en_Zork Grand Inquisitor.md @@ -0,0 +1,102 @@ +# Zork Grand Inquisitor + +## Where is the options page? + +The [player options page for this game](../player-options) contains all the options you need to configure and export a +configuration file. + +## Is a tracker available for this game? + +Yes! You can download the latest PopTracker pack for Zork Grand Inquisitor [here](https://github.com/SerpentAI/ZorkGrandInquisitorAPTracker/releases/latest). + +## What does randomization do to this game? + +A majority of inventory items you can normally pick up are completely removed from the game (e.g. the lantern won't be +in the crate, the mead won't be at the fish market, etc.). Instead, these items will be distributed in the multiworld. +This means that you can expect to access areas and be in a position to solve certain puzzles in a completely different +order than you normally would. + +Subway, teleporter and totemizer destinations are initially locked and need to be unlocked by receiving the +corresponding item in the multiworld. This alone enables creative routing in a game that would otherwise be rather +linear. The Crossroads destination is always unlocked for both the subway and teleporter to prevent softlocks. Until you +receive your first totemizer destination, it will be locked to Newark, New Jersey. + +Important hotspots are also randomized. This means that you will be unable to interact with certain objects until you +receive the corresponding item in the multiworld. This can be a bit confusing at first, but it adds depth to the +randomization and makes the game more interesting to play. + +You can travel back to the surface without dying by looking inside the bucket. This will work as long as the rope is +still attached to the well. + +Attempting to cast VOXAM will teleport you back to the Crossroads. Fast Travel! + +## What item types are distributed in the multiworld? + +- Inventory items +- Pouch of Zorkmids +- Spells +- Totems +- Subway destinations +- Teleporter destinations +- Totemizer destinations +- Hotspots (with option to start with the items enabling them instead if you prefer not playing with the randomization + of hotspots) + +## When the player receives an item, what happens? + +- **Inventory items**: Directly added to the player's inventory. +- **Pouch of Zorkmids**: Appears on the inventory screen. The player can then pick up Zorkmid coins from it. +- **Spells**: Learned and directly added to the spell book. +- **Totems**: Appears on the inventory screen. +- **Subway destinations**: The destination button on the subway map becomes functional. +- **Teleporter destinations**: The destination can show up on the teleporter screen. +- **Totemizer destinations**: The destination button on the panel becomes functional. +- **Hotspots**: The hotspot becomes interactable. + +## What is considered a location check in Zork Grand Inquisitor? + +- Solving puzzles +- Accessing certain areas for the first time +- Triggering certain interactions, even if they aren't puzzles per se +- Dying in unique ways (Optional; Deathsanity option) + +## The location check names are fun but don't always convey well what's needed to unlock them. Is there a guide? + +Yes! You can find a complete guide for the location checks [here](https://gist.github.com/nbrochu/f7bed7a1fef4e2beb67ad6ddbf18b970). + +## What is the victory condition? + +Victory is achieved when the 3 artifacts of magic are retrieved and placed inside the walking castle. + +## Can I use the save system without a problem? + +Absolutely! The save system is fully supported (and its use is in fact strongly encouraged!). You can save and load your +game as you normally would and the client will automatically sync your items and hotspots with what you should have in +that game state. + +Depending on how your game progresses, there's a chance that certain location checks might become missable. This +presents an excellent opportunity to utilize the save system. Simply make it a habit to save before undertaking +irreversible actions, ensuring you can revert to a previous state if necessary. If you prefer not to depend on the save +system for accessing missable location checks, there's an option to automatically unlock them as they become +unavailable. + +## Unique Local Commands +The following commands are only available when using the Zork Grand Inquisitor Client to play the game with Archipelago. + +- `/zork` Attempts to attach to a running instance of Zork Grand Inquisitor. If successful, the client will then be able + to read and control the state of the game. +- `/brog` Lists received items for Brog. +- `/griff` Lists received items for Griff. +- `/lucy` Lists received items for Lucy. +- `/hotspots` Lists received hotspots. + +## Known issues + +- You will get a second rope right after using GLORF (one in your inventory and one on your cursor). This is a harmless + side effect that will go away after you store it in your inventory as duplicates are actively removed. +- After climbing up to the Monastery for the first time, a rope will forever remain in place in the vent. When you come + back to the Monastery, you will be able to climb up without needing to combine the sword and rope again. However, when + arriving at the top, you will receive a duplicate sword on a rope. This is a harmless side effect that will go away + after you store it in your inventory as duplicates are actively removed. +- Since the client is reading and manipulating the game's memory, rare game crashes can happen. If you encounter one, + simply restart the game, load your latest save and use the `/zork` command again in the client. Nothing will be lost. diff --git a/worlds/zork_grand_inquisitor/docs/setup_en.md b/worlds/zork_grand_inquisitor/docs/setup_en.md new file mode 100644 index 000000000000..f9078c6d39ba --- /dev/null +++ b/worlds/zork_grand_inquisitor/docs/setup_en.md @@ -0,0 +1,42 @@ +# Zork Grand Inquisitor Randomizer Setup Guide + +## Requirements + +- Windows OS (Hard required. Client is using memory reading / writing through Win32 API) +- A copy of Zork Grand Inquisitor. Only the GOG version is supported. The Steam version can work with some tinkering but + is not officially supported. +- ScummVM 2.7.1 64-bit (Important: Will not work with any other version. [Direct Download](https://downloads.scummvm.org/frs/scummvm/2.7.1/scummvm-2.7.1-win32-x86_64.zip)) +- Archipelago 0.4.4+ + +## Game Setup Instructions + +No game modding is required to play Zork Grand Inquisitor with Archipelago. The client does all the work by attaching to +the game process and reading and manipulating the game state in real-time. + +This being said, the game does need to be played through ScummVM 2.7.1, so some configuration is required around that. + +### GOG + +- Open the directory where you installed Zork Grand Inquisitor. You should see a `Launch Zork Grand Inquisitor` + shortcut. +- Open the `scummvm` directory. Delete the entire contents of that directory. +- Still inside the `scummvm` directory, unzip the contents of the ScummVM 2.7.1 zip file you downloaded earlier. +- Go back to the directory where you installed Zork Grand Inquisitor. +- Verify that the game still launches when using the `Launch Zork Grand Inquisitor` shortcut. +- Your game is now ready to be played with Archipelago. From now on, you can use the `Launch Zork Grand Inquisitor` + shortcut to launch the game. + +## Joining a Multiworld Game + +- Launch Zork Grand Inquisitor and start a new game. +- Open the Archipelago Launcher and click `Zork Grand Inquisitor Client`. +- Using the `Zork Grand Inquisitor Client`: + - Enter the room's hostname and port number (e.g. `archipelago.gg:54321`) in the top box and press `Connect`. + - Input your player name at the bottom when prompted and press `Enter`. + - You should now be connected to the Archipelago room. + - Next, input `/zork` at the bottom and press `Enter`. This will attach the client to the game process. + - If the command is successful, you are now ready to play Zork Grand Inquisitor with Archipelago. + +## Continuing a Multiworld Game + +- Perform the same steps as above, but instead of starting a new game, load your latest save file. diff --git a/worlds/zork_grand_inquisitor/enums.py b/worlds/zork_grand_inquisitor/enums.py new file mode 100644 index 000000000000..ecbb38a949b4 --- /dev/null +++ b/worlds/zork_grand_inquisitor/enums.py @@ -0,0 +1,350 @@ +import enum + + +class ZorkGrandInquisitorEvents(enum.Enum): + CHARON_CALLED = "Event: Charon Called" + CIGAR_ACCESSIBLE = "Event: Cigar Accessible" + DALBOZ_LOCKER_OPENABLE = "Event: Dalboz Locker Openable" + DAM_DESTROYED = "Event: Dam Destroyed" + DOOR_DRANK_MEAD = "Event: Door Drank Mead" + DOOR_SMOKED_CIGAR = "Event: Door Smoked Cigar" + DUNCE_LOCKER_OPENABLE = "Event: Dunce Locker Openable" + HAS_REPAIRABLE_OBIDIL = "Event: Has Repairable OBIDIL" + HAS_REPAIRABLE_SNAVIG = "Event: Has Repairable SNAVIG" + KNOWS_BEBURTT = "Event: Knows BEBURTT" + KNOWS_OBIDIL = "Event: Knows OBIDIL" + KNOWS_SNAVIG = "Event: Knows SNAVIG" + KNOWS_YASTARD = "Event: Knows YASTARD" + LANTERN_DALBOZ_ACCESSIBLE = "Event: Lantern (Dalboz) Accessible" + ROPE_GLORFABLE = "Event: Rope GLORFable" + VICTORY = "Victory" + WHITE_HOUSE_LETTER_MAILABLE = "Event: White House Letter Mailable" + ZORKMID_BILL_ACCESSIBLE = "Event: 500 Zorkmid Bill Accessible" + ZORK_ROCKS_ACTIVATED = "Event: Zork Rocks Activated" + ZORK_ROCKS_SUCKABLE = "Event: Zork Rocks Suckable" + + +class ZorkGrandInquisitorGoals(enum.Enum): + THREE_ARTIFACTS = 0 + + +class ZorkGrandInquisitorItems(enum.Enum): + BROGS_BICKERING_TORCH = "Brog's Bickering Torch" + BROGS_FLICKERING_TORCH = "Brog's Flickering Torch" + BROGS_GRUE_EGG = "Brog's Grue Egg" + BROGS_PLANK = "Brog's Plank" + FILLER_FROBOZZ_ELECTRIC_GADGET = "Frobozz Electric Gadget" + FILLER_INQUISITION_PROPAGANDA_FLYER = "Inquisition Propaganda Flyer" + FILLER_MAGIC_CONTRABAND = "Magic Contraband" + FILLER_NONSENSICAL_INQUISITION_PAPERWORK = "Nonsensical Inquisition Paperwork" + FILLER_UNREADABLE_SPELL_SCROLL = "Unreadable Spell Scroll" + FLATHEADIA_FUDGE = "Flatheadia Fudge" + GRIFFS_AIR_PUMP = "Griff's Air Pump" + GRIFFS_DRAGON_TOOTH = "Griff's Dragon Tooth" + GRIFFS_INFLATABLE_RAFT = "Griff's Inflatable Raft" + GRIFFS_INFLATABLE_SEA_CAPTAIN = "Griff's Inflatable Sea Captain" + HAMMER = "Hammer" + HOTSPOT_666_MAILBOX = "Hotspot: 666 Mailbox" + HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS = "Hotspot: Alpine's Quandry Card Slots" + HOTSPOT_BLANK_SCROLL_BOX = "Hotspot: Blank Scroll Box" + HOTSPOT_BLINDS = "Hotspot: Blinds" + HOTSPOT_CANDY_MACHINE_BUTTONS = "Hotspot: Candy Machine Buttons" + HOTSPOT_CANDY_MACHINE_COIN_SLOT = "Hotspot: Candy Machine Coin Slot" + HOTSPOT_CANDY_MACHINE_VACUUM_SLOT = "Hotspot: Candy Machine Vacuum Slot" + HOTSPOT_CHANGE_MACHINE_SLOT = "Hotspot: Change Machine Slot" + HOTSPOT_CLOSET_DOOR = "Hotspot: Closet Door" + HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT = "Hotspot: Closing the Time Tunnels Hammer Slot" + HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER = "Hotspot: Closing the Time Tunnels Lever" + HOTSPOT_COOKING_POT = "Hotspot: Cooking Pot" + HOTSPOT_DENTED_LOCKER = "Hotspot: Dented Locker" + HOTSPOT_DIRT_MOUND = "Hotspot: Dirt Mound" + HOTSPOT_DOCK_WINCH = "Hotspot: Dock Winch" + HOTSPOT_DRAGON_CLAW = "Hotspot: Dragon Claw" + HOTSPOT_DRAGON_NOSTRILS = "Hotspot: Dragon Nostrils" + HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE = "Hotspot: Dungeon Master's Lair Entrance" + HOTSPOT_FLOOD_CONTROL_BUTTONS = "Hotspot: Flood Control Buttons" + HOTSPOT_FLOOD_CONTROL_DOORS = "Hotspot: Flood Control Doors" + HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT = "Hotspot: Frozen Treat Machine Coin Slot" + HOTSPOT_FROZEN_TREAT_MACHINE_DOORS = "Hotspot: Frozen Treat Machine Doors" + HOTSPOT_GLASS_CASE = "Hotspot: Glass Case" + HOTSPOT_GRAND_INQUISITOR_DOLL = "Hotspot: Grand Inquisitor Doll" + HOTSPOT_GUE_TECH_DOOR = "Hotspot: GUE Tech Door" + HOTSPOT_GUE_TECH_GRASS = "Hotspot: GUE Tech Grass" + HOTSPOT_HADES_PHONE_BUTTONS = "Hotspot: Hades Phone Buttons" + HOTSPOT_HADES_PHONE_RECEIVER = "Hotspot: Hades Phone Receiver" + HOTSPOT_HARRY = "Hotspot: Harry" + HOTSPOT_HARRYS_ASHTRAY = "Hotspot: Harry's Ashtray" + HOTSPOT_HARRYS_BIRD_BATH = "Hotspot: Harry's Bird Bath" + HOTSPOT_IN_MAGIC_WE_TRUST_DOOR = "Hotspot: In Magic We Trust Door" + HOTSPOT_JACKS_DOOR = "Hotspot: Jack's Door" + HOTSPOT_LOUDSPEAKER_VOLUME_BUTTONS = "Hotspot: Loudspeaker Volume Buttons" + HOTSPOT_MAILBOX_DOOR = "Hotspot: Mailbox Door" + HOTSPOT_MAILBOX_FLAG = "Hotspot: Mailbox Flag" + HOTSPOT_MIRROR = "Hotspot: Mirror" + HOTSPOT_MONASTERY_VENT = "Hotspot: Monastery Vent" + HOTSPOT_MOSSY_GRATE = "Hotspot: Mossy Grate" + HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR = "Hotspot: Port Foozle Past Tavern Door" + HOTSPOT_PURPLE_WORDS = "Hotspot: Purple Words" + HOTSPOT_QUELBEE_HIVE = "Hotspot: Quelbee Hive" + HOTSPOT_ROPE_BRIDGE = "Hotspot: Rope Bridge" + HOTSPOT_SKULL_CAGE = "Hotspot: Skull Cage" + HOTSPOT_SNAPDRAGON = "Hotspot: Snapdragon" + HOTSPOT_SODA_MACHINE_BUTTONS = "Hotspot: Soda Machine Buttons" + HOTSPOT_SODA_MACHINE_COIN_SLOT = "Hotspot: Soda Machine Coin Slot" + HOTSPOT_SOUVENIR_COIN_SLOT = "Hotspot: Souvenir Coin Slot" + HOTSPOT_SPELL_CHECKER = "Hotspot: Spell Checker" + HOTSPOT_SPELL_LAB_CHASM = "Hotspot: Spell Lab Chasm" + HOTSPOT_SPRING_MUSHROOM = "Hotspot: Spring Mushroom" + HOTSPOT_STUDENT_ID_MACHINE = "Hotspot: Student ID Machine" + HOTSPOT_SUBWAY_TOKEN_SLOT = "Hotspot: Subway Token Slot" + HOTSPOT_TAVERN_FLY = "Hotspot: Tavern Fly" + HOTSPOT_TOTEMIZER_SWITCH = "Hotspot: Totemizer Switch" + HOTSPOT_TOTEMIZER_WHEELS = "Hotspot: Totemizer Wheels" + HOTSPOT_WELL = "Hotspot: Well" + HUNGUS_LARD = "Hungus Lard" + JAR_OF_HOTBUGS = "Jar of Hotbugs" + LANTERN = "Lantern" + LARGE_TELEGRAPH_HAMMER = "Large Telegraph Hammer" + LUCYS_PLAYING_CARD_1 = "Lucy's Playing Card: 1 Pip" + LUCYS_PLAYING_CARD_2 = "Lucy's Playing Card: 2 Pips" + LUCYS_PLAYING_CARD_3 = "Lucy's Playing Card: 3 Pips" + LUCYS_PLAYING_CARD_4 = "Lucy's Playing Card: 4 Pips" + MAP = "Map" + MEAD_LIGHT = "Mead Light" + MOSS_OF_MAREILON = "Moss of Mareilon" + MUG = "Mug" + OLD_SCRATCH_CARD = "Old Scratch Card" + PERMA_SUCK_MACHINE = "Perma-Suck Machine" + PLASTIC_SIX_PACK_HOLDER = "Plastic Six-Pack Holder" + POUCH_OF_ZORKMIDS = "Pouch of Zorkmids" + PROZORK_TABLET = "Prozork Tablet" + QUELBEE_HONEYCOMB = "Quelbee Honeycomb" + ROPE = "Rope" + SCROLL_FRAGMENT_ANS = "Scroll Fragment: ANS" + SCROLL_FRAGMENT_GIV = "Scroll Fragment: GIV" + SHOVEL = "Shovel" + SNAPDRAGON = "Snapdragon" + SPELL_GLORF = "Spell: GLORF" + SPELL_GOLGATEM = "Spell: GOLGATEM" + SPELL_IGRAM = "Spell: IGRAM" + SPELL_KENDALL = "Spell: KENDALL" + SPELL_NARWILE = "Spell: NARWILE" + SPELL_REZROV = "Spell: REZROV" + SPELL_THROCK = "Spell: THROCK" + SPELL_VOXAM = "Spell: VOXAM" + STUDENT_ID = "Student ID" + SUBWAY_DESTINATION_FLOOD_CONTROL_DAM = "Subway Destination: Flood Control Dam #3" + SUBWAY_DESTINATION_HADES = "Subway Destination: Hades" + SUBWAY_DESTINATION_MONASTERY = "Subway Destination: Monastery" + SUBWAY_TOKEN = "Subway Token" + SWORD = "Sword" + TELEPORTER_DESTINATION_DM_LAIR = "Teleporter Destination: Dungeon Master's Lair" + TELEPORTER_DESTINATION_GUE_TECH = "Teleporter Destination: GUE Tech" + TELEPORTER_DESTINATION_HADES = "Teleporter Destination: Hades" + TELEPORTER_DESTINATION_MONASTERY = "Teleporter Destination: Monastery Station" + TELEPORTER_DESTINATION_SPELL_LAB = "Teleporter Destination: Spell Lab" + TOTEM_BROG = "Totem: Brog" + TOTEM_GRIFF = "Totem: Griff" + TOTEM_LUCY = "Totem: Lucy" + TOTEMIZER_DESTINATION_HALL_OF_INQUISITION = "Totemizer Destination: Hall of Inquisition" + TOTEMIZER_DESTINATION_INFINITY = "Totemizer Destination: Infinity" + TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL = "Totemizer Destination: Straight to Hell" + TOTEMIZER_DESTINATION_SURFACE_OF_MERZ = "Totemizer Destination: Surface of Merz" + ZIMDOR_SCROLL = "ZIMDOR Scroll" + ZORK_ROCKS = "Zork Rocks" + + +class ZorkGrandInquisitorLocations(enum.Enum): + ALARM_SYSTEM_IS_DOWN = "Alarm System is Down" + ARREST_THE_VANDAL = "Arrest the Vandal!" + ARTIFACTS_EXPLAINED = "Artifacts, Explained" + A_BIG_FAT_SASSY_2_HEADED_MONSTER = "A Big, Fat, SASSY 2-Headed Monster" + A_LETTER_FROM_THE_WHITE_HOUSE = "A Letter from the White House" + A_SMALLWAY = "A Smallway" + BEAUTIFUL_THATS_PLENTY = "Beautiful, That's Plenty!" + BEBURTT_DEMYSTIFIED = "BEBURTT, Demystified" + BETTER_SPELL_MANUFACTURING_IN_UNDER_10_MINUTES = "Better Spell Manufacturing in Under 10 Minutes" + BOING_BOING_BOING = "Boing, Boing, Boing" + BONK = "Bonk!" + BRAVE_SOULS_WANTED = "Brave Souls Wanted" + BROG_DO_GOOD = "Brog Do Good!" + BROG_EAT_ROCKS = "Brog Eat Rocks" + BROG_KNOW_DUMB_THAT_DUMB = "Brog Know Dumb. That Dumb" + BROG_MUCH_BETTER_AT_THIS_GAME = "Brog Much Better at This Game" + CASTLE_WATCHING_A_FIELD_GUIDE = "Castle Watching: A Field Guide" + CAVES_NOTES = "Cave's Notes" + CLOSING_THE_TIME_TUNNELS = "Closing the Time Tunnels" + CRISIS_AVERTED = "Crisis Averted" + CUT_THAT_OUT_YOU_LITTLE_CREEP = "Cut That Out You Little Creep!" + DEATH_ARRESTED_WITH_JACK = "Death: Arrested With Jack" + DEATH_ATTACKED_THE_QUELBEES = "Death: Attacked the Quelbees" + DEATH_CLIMBED_OUT_OF_THE_WELL = "Death: Climbed Out of the Well" + DEATH_EATEN_BY_A_GRUE = "Death: Eaten by a Grue" + DEATH_JUMPED_IN_BOTTOMLESS_PIT = "Death: Jumped in Bottomless Pit" + DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER = "Death: Lost Game of Strip Grue, Fire, Water" + DEATH_LOST_SOUL_TO_OLD_SCRATCH = "Death: Lost Soul to Old Scratch" + DEATH_OUTSMARTED_BY_THE_QUELBEES = "Death: Outsmarted by the Quelbees" + DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD = "Death: Sliced up by the Invisible Guard" + DEATH_STEPPED_INTO_THE_INFINITE = "Death: Step Into the Infinite" + DEATH_SWALLOWED_BY_A_DRAGON = "Death: Swallowed by a Dragon" + DEATH_THROCKED_THE_GRASS = "Death: THROCKed the Grass" + DEATH_TOTEMIZED = "Death: Totemized?" + DEATH_TOTEMIZED_PERMANENTLY = "Death: Totemized... Permanently" + DEATH_YOURE_NOT_CHARON = "Death: You're Not Charon!?" + DEATH_ZORK_ROCKS_EXPLODED = "Death: Zork Rocks Exploded" + DENIED_BY_THE_LAKE_MONSTER = "Denied by the Lake Monster" + DESPERATELY_SEEKING_TUTOR = "Desperately Seeking Tutor" + DONT_EVEN_START_WITH_US_SPARKY = "Don't Even Start With Us, Sparky" + DOOOOOOWN = "Doooooown" + DOWN = "Down" + DRAGON_ARCHIPELAGO_TIME_TUNNEL = "Dragon Archipelago Time Tunnel" + DUNCE_LOCKER = "Dunce Locker" + EGGPLANTS = "Eggplants" + ELSEWHERE = "Elsewhere" + EMERGENCY_MAGICATRONIC_MESSAGE = "Emergency Magicatronic Message" + ENJOY_YOUR_TRIP = "Enjoy Your Trip!" + FAT_LOT_OF_GOOD_THATLL_DO_YA = "Fat Lot of Good That'll Do Ya" + FIRE_FIRE = "Fire! Fire!" + FLOOD_CONTROL_DAM_3_THE_NOT_REMOTELY_BORING_TALE = "Flood Control Dam #3: The Not Remotely Boring Tale" + FLYING_SNAPDRAGON = "Flying Snapdragon" + FROBUARY_3_UNDERGROUNDHOG_DAY = "Frobruary 3 - Undergroundhog Day" + GETTING_SOME_CHANGE = "Getting Some Change" + GO_AWAY = "GO AWAY!" + GUE_TECH_DEANS_LIST = "GUE Tech Dean's List" + GUE_TECH_ENTRANCE_EXAM = "GUE Tech Entrance Exam" + GUE_TECH_HEALTH_MEMO = "GUE Tech Health Memo" + GUE_TECH_MAGEMEISTERS = "GUE Tech Magemeisters" + HAVE_A_HELL_OF_A_DAY = "Have a Hell of a Day!" + HELLO_THIS_IS_SHONA_FROM_GURTH_PUBLISHING = "Hello, This is Shona from Gurth Publishing" + HELP_ME_CANT_BREATHE = "Help... Me. Can't... Breathe" + HEY_FREE_DIRT = "Hey, Free Dirt!" + HI_MY_NAME_IS_DOUG = "Hi, My Name is Doug" + HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING = "Hmmm. Informative. Yet Deeply Disturbing" + HOLD_ON_FOR_AN_IMPORTANT_MESSAGE = "Hold on for an Important Message" + HOW_TO_HYPNOTIZE_YOURSELF = "How to Hypnotize Yourself" + HOW_TO_WIN_AT_DOUBLE_FANUCCI = "How to Win at Double Fanucci" + IMBUE_BEBURTT = "Imbue BEBURTT" + IM_COMPLETELY_NUDE = "I'm Completely Nude" + INTO_THE_FOLIAGE = "Into the Foliage" + INVISIBLE_FLOWERS = "Invisible Flowers" + IN_CASE_OF_ADVENTURE = "In Case of Adventure, Break Glass!" + IN_MAGIC_WE_TRUST = "In Magic We Trust" + ITS_ONE_OF_THOSE_ADVENTURERS_AGAIN = "It's One of Those Adventurers Again..." + I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY = "I Don't Think You Would've Wanted That to Work Anyway" + I_DONT_WANT_NO_TROUBLE = "I Don't Want No Trouble!" + I_HOPE_YOU_CAN_CLIMB_UP_THERE = "I Hope You Can Climb Up There With All This Junk" + I_LIKE_YOUR_STYLE = "I Like Your Style!" + I_SPIT_ON_YOUR_FILTHY_COINAGE = "I Spit on Your Filthy Coinage" + LIT_SUNFLOWERS = "Lit Sunflowers" + MAGIC_FOREVER = "Magic Forever!" + MAILED_IT_TO_HELL = "Mailed it to Hell" + MAKE_LOVE_NOT_WAR = "Make Love, Not War" + MEAD_LIGHT = "Mead Light?" + MIKES_PANTS = "Mike's Pants" + MUSHROOM_HAMMERED = "Mushroom, Hammered" + NATIONAL_TREASURE = "300 Year Old National Treasure" + NATURAL_AND_SUPERNATURAL_CREATURES_OF_QUENDOR = "Natural and Supernatural Creatures of Quendor" + NOOOOOOOOOOOOO = "NOOOOOOOOOOOOO!" + NOTHIN_LIKE_A_GOOD_STOGIE = "Nothin' Like a Good Stogie" + NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT = "Now You Look Like Us, Which is an Improvement" + NO_AUTOGRAPHS = "No Autographs" + NO_BONDAGE = "No Bondage" + OBIDIL_DRIED_UP = "OBIDIL, Dried Up" + OH_DEAR_GOD_ITS_A_DRAGON = "Oh Dear God, It's a Dragon!" + OH_VERY_FUNNY_GUYS = "Oh, Very Funny Guys" + OH_WOW_TALK_ABOUT_DEJA_VU = "Oh, Wow! Talk About Deja Vu" + OLD_SCRATCH_WINNER = "Old Scratch Winner!" + ONLY_YOU_CAN_PREVENT_FOOZLE_FIRES = "Only You Can Prevent Foozle Fires" + OPEN_THE_GATES_OF_HELL = "Open the Gates of Hell" + OUTSMART_THE_QUELBEES = "Outsmart the Quelbees" + PERMASEAL = "PermaSeal" + PLANETFALL = "Planetfall" + PLEASE_DONT_THROCK_THE_GRASS = "Please Don't THROCK the Grass" + PORT_FOOZLE_TIME_TUNNEL = "Port Foozle Time Tunnel" + PROZORKED = "Prozorked" + REASSEMBLE_SNAVIG = "Reassemble SNAVIG" + RESTOCKED_ON_GRUESDAY = "Restocked on Gruesday" + RIGHT_HELLO_YES_UH_THIS_IS_SNEFFLE = "Right. Hello. Yes. Uh, This is Sneffle" + RIGHT_UH_SORRY_ITS_ME_AGAIN_SNEFFLE = "Right. Uh, Sorry. It's Me Again. Sneffle" + SNAVIG_REPAIRED = "SNAVIG, Repaired" + SOUVENIR = "Souvenir" + STRAIGHT_TO_HELL = "Straight to Hell" + STRIP_GRUE_FIRE_WATER = "Strip Grue, Fire, Water" + SUCKING_ROCKS = "Sucking Rocks" + TALK_TO_ME_GRAND_INQUISITOR = "Talk to Me Grand Inquisitor" + TAMING_YOUR_SNAPDRAGON = "Taming Your Snapdragon" + THAR_SHE_BLOWS = "Thar She Blows!" + THATS_A_ROPE = "That's a Rope" + THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS = "That's it! Just Keep Hitting Those Buttons" + THATS_STILL_A_ROPE = "That's Still a Rope" + THATS_THE_SPIRIT = "That's the Spirit!" + THE_ALCHEMICAL_DEBACLE = "The Alchemical Debacle" + THE_ENDLESS_FIRE = "The Endless Fire" + THE_FLATHEADIAN_FUDGE_FIASCO = "The Flatheadian Fudge Fiasco" + THE_PERILS_OF_MAGIC = "The Perils of Magic" + THE_UNDERGROUND_UNDERGROUND = "The Underground Underground" + THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE = "This Doesn't Look Anything Like the Brochure" + THROCKED_MUSHROOM_HAMMERED = "THROCKed Mushroom, Hammered" + TIME_TRAVEL_FOR_DUMMIES = "Time Travel for Dummies" + TOTEMIZED_DAILY_BILLBOARD = "Totemized Daily Billboard Functioning Correctly" + UH_OH_BROG_CANT_SWIM = "Uh-Oh. Brog Can't Swim" + UMBRELLA_FLOWERS = "Umbrella Flowers" + UP = "Up" + USELESS_BUT_FUN = "Useless, But Fun" + UUUUUP = "Uuuuup" + VOYAGE_OF_CAPTAIN_ZAHAB = "Voyage of Captain Zahab" + WANT_SOME_RYE_COURSE_YA_DO = "Want Some Rye? Course Ya Do!" + WE_DONT_SERVE_YOUR_KIND_HERE = "We Don't Serve Your Kind Here" + WE_GOT_A_HIGH_ROLLER = "We Got a High Roller!" + WHAT_ARE_YOU_STUPID = "What Are You, Stupid?" + WHITE_HOUSE_TIME_TUNNEL = "White House Time Tunnel" + WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE = "Wow! I've Never Gone Inside Him Before!" + YAD_GOHDNUORGREDNU_3_YRAUBORF = "yaD gohdnuorgrednU - 3 yrauborF" + YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY = "Your Puny Weapons Don't Phase Me, Baby!" + YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER = "You Don't Go Messing With a Man's Zipper" + YOU_GAINED_86_EXPERIENCE_POINTS = "You Gained 86 Experience Points" + YOU_ONE_OF_THEM_AGITATORS_AINT_YA = "You One of Them Agitators, Ain't Ya?" + YOU_WANT_A_PIECE_OF_ME_DOCK_BOY = "You Want a Piece of Me, Dock Boy? or Girl" + + +class ZorkGrandInquisitorRegions(enum.Enum): + CROSSROADS = "Crossroads" + DM_LAIR = "Dungeon Master's Lair" + DM_LAIR_INTERIOR = "Dungeon Master's Lair - Interior" + DRAGON_ARCHIPELAGO = "Dragon Archipelago" + DRAGON_ARCHIPELAGO_DRAGON = "Dragon Archipelago - Dragon" + ENDGAME = "Endgame" + GUE_TECH = "GUE Tech" + GUE_TECH_HALLWAY = "GUE Tech - Hallway" + GUE_TECH_OUTSIDE = "GUE Tech - Outside" + HADES = "Hades" + HADES_BEYOND_GATES = "Hades - Beyond Gates" + HADES_SHORE = "Hades - Shore" + MENU = "Menu" + MONASTERY = "Monastery" + MONASTERY_EXHIBIT = "Monastery - Exhibit" + PORT_FOOZLE = "Port Foozle" + PORT_FOOZLE_JACKS_SHOP = "Port Foozle - Jack's Shop" + PORT_FOOZLE_PAST = "Port Foozle Past" + PORT_FOOZLE_PAST_TAVERN = "Port Foozle Past - Tavern" + SPELL_LAB = "Spell Lab" + SPELL_LAB_BRIDGE = "Spell Lab - Bridge" + SUBWAY_CROSSROADS = "Subway Platform - Crossroads" + SUBWAY_FLOOD_CONTROL_DAM = "Subway Platform - Flood Control Dam #3" + SUBWAY_MONASTERY = "Subway Platform - Monastery" + WALKING_CASTLE = "Walking Castle" + WHITE_HOUSE = "White House" + + +class ZorkGrandInquisitorTags(enum.Enum): + CORE = "Core" + DEATHSANITY = "Deathsanity" + FILLER = "Filler" + HOTSPOT = "Hotspot" + INVENTORY_ITEM = "Inventory Item" + MISSABLE = "Missable" + SPELL = "Spell" + SUBWAY_DESTINATION = "Subway Destination" + TELEPORTER_DESTINATION = "Teleporter Destination" + TOTEMIZER_DESTINATION = "Totemizer Destination" + TOTEM = "Totem" diff --git a/worlds/zork_grand_inquisitor/game_controller.py b/worlds/zork_grand_inquisitor/game_controller.py new file mode 100644 index 000000000000..7a60a1460829 --- /dev/null +++ b/worlds/zork_grand_inquisitor/game_controller.py @@ -0,0 +1,1388 @@ +import collections +import functools +import logging + +from typing import Dict, Optional, Set, Tuple, Union + +from .data.item_data import item_data, ZorkGrandInquisitorItemData +from .data.location_data import location_data, ZorkGrandInquisitorLocationData + +from .data.missable_location_grant_conditions_data import ( + missable_location_grant_conditions_data, + ZorkGrandInquisitorMissableLocationGrantConditionsData, +) + +from .data_funcs import game_id_to_items, items_with_tag, locations_with_tag + +from .enums import ( + ZorkGrandInquisitorGoals, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorLocations, + ZorkGrandInquisitorTags, +) + +from .game_state_manager import GameStateManager + + +class GameController: + logger: Optional[logging.Logger] + + game_state_manager: GameStateManager + + received_items: Set[ZorkGrandInquisitorItems] + completed_locations: Set[ZorkGrandInquisitorLocations] + + completed_locations_queue: collections.deque + received_items_queue: collections.deque + + all_hotspot_items: Set[ZorkGrandInquisitorItems] + + game_id_to_items: Dict[int, ZorkGrandInquisitorItems] + + possible_inventory_items: Set[ZorkGrandInquisitorItems] + + available_inventory_slots: Set[int] + + goal_completed: bool + + option_goal: Optional[ZorkGrandInquisitorGoals] + option_deathsanity: Optional[bool] + option_grant_missable_location_checks: Optional[bool] + + def __init__(self, logger=None) -> None: + self.logger = logger + + self.game_state_manager = GameStateManager() + + self.received_items = set() + self.completed_locations = set() + + self.completed_locations_queue = collections.deque() + self.received_items_queue = collections.deque() + + self.all_hotspot_items = ( + items_with_tag(ZorkGrandInquisitorTags.HOTSPOT) + | items_with_tag(ZorkGrandInquisitorTags.SUBWAY_DESTINATION) + | items_with_tag(ZorkGrandInquisitorTags.TOTEMIZER_DESTINATION) + ) + + self.game_id_to_items = game_id_to_items() + + self.possible_inventory_items = ( + items_with_tag(ZorkGrandInquisitorTags.INVENTORY_ITEM) + | items_with_tag(ZorkGrandInquisitorTags.SPELL) + | items_with_tag(ZorkGrandInquisitorTags.TOTEM) + ) + + self.available_inventory_slots = set() + + self.goal_completed = False + + self.option_goal = None + self.option_deathsanity = None + self.option_grant_missable_location_checks = None + + @functools.cached_property + def brog_items(self) -> Set[ZorkGrandInquisitorItems]: + return { + ZorkGrandInquisitorItems.BROGS_BICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG, + ZorkGrandInquisitorItems.BROGS_PLANK, + } + + @functools.cached_property + def griff_items(self) -> Set[ZorkGrandInquisitorItems]: + return { + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN, + } + + @functools.cached_property + def lucy_items(self) -> Set[ZorkGrandInquisitorItems]: + return { + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4, + } + + @property + def totem_items(self) -> Set[ZorkGrandInquisitorItems]: + return self.brog_items | self.griff_items | self.lucy_items + + @functools.cached_property + def missable_locations(self) -> Set[ZorkGrandInquisitorLocations]: + return locations_with_tag(ZorkGrandInquisitorTags.MISSABLE) + + def log(self, message) -> None: + if self.logger: + self.logger.info(message) + + def log_debug(self, message) -> None: + if self.logger: + self.logger.debug(message) + + def open_process_handle(self) -> bool: + return self.game_state_manager.open_process_handle() + + def close_process_handle(self) -> bool: + return self.game_state_manager.close_process_handle() + + def is_process_running(self) -> bool: + return self.game_state_manager.is_process_running + + def list_received_brog_items(self) -> None: + self.log("Received Brog Items:") + + self._process_received_items() + received_brog_items: Set[ZorkGrandInquisitorItems] = self.received_items & self.brog_items + + if not len(received_brog_items): + self.log(" Nothing") + return + + for item in sorted(i.value for i in received_brog_items): + self.log(f" {item}") + + def list_received_griff_items(self) -> None: + self.log("Received Griff Items:") + + self._process_received_items() + received_griff_items: Set[ZorkGrandInquisitorItems] = self.received_items & self.griff_items + + if not len(received_griff_items): + self.log(" Nothing") + return + + for item in sorted(i.value for i in received_griff_items): + self.log(f" {item}") + + def list_received_lucy_items(self) -> None: + self.log("Received Lucy Items:") + + self._process_received_items() + received_lucy_items: Set[ZorkGrandInquisitorItems] = self.received_items & self.lucy_items + + if not len(received_lucy_items): + self.log(" Nothing") + return + + for item in sorted(i.value for i in received_lucy_items): + self.log(f" {item}") + + def list_received_hotspots(self) -> None: + self.log("Received Hotspots:") + + self._process_received_items() + + hotspot_items: Set[ZorkGrandInquisitorItems] = items_with_tag(ZorkGrandInquisitorTags.HOTSPOT) + received_hotspots: Set[ZorkGrandInquisitorItems] = self.received_items & hotspot_items + + if not len(received_hotspots): + self.log(" Nothing") + return + + for item in sorted(i.value for i in received_hotspots): + self.log(f" {item}") + + def update(self) -> None: + if self.game_state_manager.is_process_still_running(): + try: + self.game_state_manager.refresh_game_location() + + self._apply_permanent_game_state() + self._apply_conditional_game_state() + + self._apply_permanent_game_flags() + + self._check_for_completed_locations() + + if self.option_grant_missable_location_checks: + self._check_for_missable_locations_to_grant() + + self._process_received_items() + + self._manage_hotspots() + self._manage_items() + + self._apply_conditional_teleports() + + self._check_for_victory() + except Exception as e: + self.log_debug(e) + + def _apply_permanent_game_state(self) -> None: + self._write_game_state_value_for(10934, 1) # Rope Taken + self._write_game_state_value_for(10418, 1) # Mead Light Taken + self._write_game_state_value_for(10275, 0) # Lantern in Crate + self._write_game_state_value_for(13929, 1) # Great Underground Door Open + self._write_game_state_value_for(13968, 1) # Subway Token Taken + self._write_game_state_value_for(12930, 1) # Hammer Taken + self._write_game_state_value_for(12935, 1) # Griff Totem Taken + self._write_game_state_value_for(12948, 1) # ZIMDOR Scroll Taken + self._write_game_state_value_for(4058, 1) # Shovel Taken + self._write_game_state_value_for(4059, 1) # THROCK Scroll Taken + self._write_game_state_value_for(11758, 1) # KENDALL Scroll Taken + self._write_game_state_value_for(16959, 1) # Old Scratch Card Taken + self._write_game_state_value_for(12840, 0) # Zork Rocks in Perma-Suck Machine + self._write_game_state_value_for(11886, 1) # Student ID Taken + self._write_game_state_value_for(16279, 1) # Prozork Tablet Taken + self._write_game_state_value_for(13260, 1) # GOLGATEM Scroll Taken + self._write_game_state_value_for(4834, 1) # Flatheadia Fudge Taken + self._write_game_state_value_for(4746, 1) # Jar of Hotbugs Taken + self._write_game_state_value_for(4755, 1) # Hungus Lard Taken + self._write_game_state_value_for(4758, 1) # Mug Taken + self._write_game_state_value_for(3716, 1) # NARWILE Scroll Taken + self._write_game_state_value_for(17147, 1) # Lucy Totem Taken + self._write_game_state_value_for(9818, 1) # Middle Telegraph Hammer Taken + self._write_game_state_value_for(3766, 0) # ANS Scroll in Window + self._write_game_state_value_for(4980, 0) # ANS Scroll in Window + self._write_game_state_value_for(3768, 0) # GIV Scroll in Window + self._write_game_state_value_for(4978, 0) # GIV Scroll in Window + self._write_game_state_value_for(3765, 0) # SNA Scroll in Window + self._write_game_state_value_for(4979, 0) # SNA Scroll in Window + self._write_game_state_value_for(3767, 0) # VIG Scroll in Window + self._write_game_state_value_for(4977, 0) # VIG Scroll in Window + self._write_game_state_value_for(15065, 1) # Brog's Bickering Torch Taken + self._write_game_state_value_for(15088, 1) # Brog's Flickering Torch Taken + self._write_game_state_value_for(2628, 4) # Brog's Grue Eggs Taken + self._write_game_state_value_for(2971, 1) # Brog's Plank Taken + self._write_game_state_value_for(1340, 1) # Griff's Inflatable Sea Captain Taken + self._write_game_state_value_for(1341, 1) # Griff's Inflatable Raft Taken + self._write_game_state_value_for(1477, 1) # Griff's Air Pump Taken + self._write_game_state_value_for(1814, 1) # Griff's Dragon Tooth Taken + self._write_game_state_value_for(15403, 0) # Lucy's Cards Taken + self._write_game_state_value_for(15404, 1) # Lucy's Cards Taken + self._write_game_state_value_for(15405, 4) # Lucy's Cards Taken + self._write_game_state_value_for(5222, 1) # User Has Spell Book + self._write_game_state_value_for(13930, 1) # Skip Well Cutscenes + self._write_game_state_value_for(19057, 1) # Skip Well Cutscenes + self._write_game_state_value_for(13934, 1) # Skip Well Cutscenes + self._write_game_state_value_for(13935, 1) # Skip Well Cutscenes + self._write_game_state_value_for(13384, 1) # Skip Meanwhile... Cutscene + self._write_game_state_value_for(8620, 1) # First Coin Paid to Charon + self._write_game_state_value_for(8731, 1) # First Coin Paid to Charon + + def _apply_conditional_game_state(self): + # Can teleport to Dungeon Master's Lair + if self._player_has(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR): + self._write_game_state_value_for(2203, 1) + else: + self._write_game_state_value_for(2203, 0) + + # Can teleport to GUE Tech + if self._player_has(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH): + self._write_game_state_value_for(7132, 1) + else: + self._write_game_state_value_for(7132, 0) + + # Can Teleport to Spell Lab + if self._player_has(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB): + self._write_game_state_value_for(16545, 1) + else: + self._write_game_state_value_for(16545, 0) + + # Can Teleport to Hades + if self._player_has(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES): + self._write_game_state_value_for(7119, 1) + else: + self._write_game_state_value_for(7119, 0) + + # Can Teleport to Monastery Station + if self._player_has(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY): + self._write_game_state_value_for(7148, 1) + else: + self._write_game_state_value_for(7148, 0) + + # Initial Totemizer Destination + should_force_initial_totemizer_destination: bool = True + + if self._player_has(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION): + should_force_initial_totemizer_destination = False + elif self._player_has(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL): + should_force_initial_totemizer_destination = False + elif self._player_has(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_INFINITY): + should_force_initial_totemizer_destination = False + elif self._player_has(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_SURFACE_OF_MERZ): + should_force_initial_totemizer_destination = False + + if should_force_initial_totemizer_destination: + self._write_game_state_value_for(9617, 2) + + # Pouch of Zorkmids + if self._player_has(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS): + self._write_game_state_value_for(5827, 1) + else: + self._write_game_state_value_for(5827, 0) + + # Brog Torches + if self._player_is_brog() and self._player_has(ZorkGrandInquisitorItems.BROGS_BICKERING_TORCH): + self._write_game_state_value_for(10999, 1) + else: + self._write_game_state_value_for(10999, 0) + + if self._player_is_brog() and self._player_has(ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH): + self._write_game_state_value_for(10998, 1) + else: + self._write_game_state_value_for(10998, 0) + + # Monastery Rope + if ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE in self.completed_locations: + self._write_game_state_value_for(9637, 1) + + def _apply_permanent_game_flags(self) -> None: + self._write_game_flags_value_for(9437, 2) # Monastery Exhibit Door to Outside + self._write_game_flags_value_for(3074, 2) # White House Door + self._write_game_flags_value_for(13005, 2) # Map + self._write_game_flags_value_for(13006, 2) # Sword + self._write_game_flags_value_for(13007, 2) # Sword + self._write_game_flags_value_for(13389, 2) # Moss of Mareilon + self._write_game_flags_value_for(4301, 2) # Quelbee Honeycomb + self._write_game_flags_value_for(12895, 2) # Change Machine Money + self._write_game_flags_value_for(4150, 2) # Prozorked Snapdragon + self._write_game_flags_value_for(13413, 2) # Letter Opener + self._write_game_flags_value_for(15403, 2) # Lucy's Cards + + def _check_for_completed_locations(self) -> None: + location: ZorkGrandInquisitorLocations + data: ZorkGrandInquisitorLocationData + for location, data in location_data.items(): + if location in self.completed_locations or not isinstance( + location, ZorkGrandInquisitorLocations + ): + continue + + is_location_completed: bool = True + + trigger: [Union[str, int]] + value: Union[str, int, Tuple[int, ...]] + for trigger, value in data.game_state_trigger: + if trigger == "location": + if not self._player_is_at(value): + is_location_completed = False + break + elif isinstance(trigger, int): + if isinstance(value, int): + if self._read_game_state_value_for(trigger) != value: + is_location_completed = False + break + elif isinstance(value, tuple): + if self._read_game_state_value_for(trigger) not in value: + is_location_completed = False + break + else: + is_location_completed = False + break + else: + is_location_completed = False + break + + if is_location_completed: + self.completed_locations.add(location) + self.completed_locations_queue.append(location) + + def _check_for_missable_locations_to_grant(self) -> None: + missable_location: ZorkGrandInquisitorLocations + for missable_location in self.missable_locations: + if missable_location in self.completed_locations: + continue + + data: ZorkGrandInquisitorLocationData = location_data[missable_location] + + if ZorkGrandInquisitorTags.DEATHSANITY in data.tags and not self.option_deathsanity: + continue + + condition_data: ZorkGrandInquisitorMissableLocationGrantConditionsData = ( + missable_location_grant_conditions_data.get(missable_location) + ) + + if condition_data is None: + self.log_debug(f"Missable Location {missable_location.value} has no grant conditions") + continue + + if condition_data.location_condition in self.completed_locations: + grant_location: bool = True + + item: ZorkGrandInquisitorItems + for item in condition_data.item_conditions or tuple(): + if self._player_doesnt_have(item): + grant_location = False + break + + if grant_location: + self.completed_locations_queue.append(missable_location) + + def _process_received_items(self) -> None: + while len(self.received_items_queue) > 0: + item: ZorkGrandInquisitorItems = self.received_items_queue.popleft() + data: ZorkGrandInquisitorItemData = item_data[item] + + if ZorkGrandInquisitorTags.FILLER in data.tags: + continue + + self.received_items.add(item) + + def _manage_hotspots(self) -> None: + hotspot_item: ZorkGrandInquisitorItems + for hotspot_item in self.all_hotspot_items: + data: ZorkGrandInquisitorItemData = item_data[hotspot_item] + + if hotspot_item not in self.received_items: + key: int + for key in data.statemap_keys: + self._write_game_flags_value_for(key, 2) + else: + if hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_666_MAILBOX: + if self.game_state_manager.game_location == "hp5g": + if self._read_game_state_value_for(9113) == 0: + self._write_game_flags_value_for(9116, 0) + else: + self._write_game_flags_value_for(9116, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS: + if self.game_state_manager.game_location == "qb2g": + if self._read_game_state_value_for(15433) == 0: + self._write_game_flags_value_for(15434, 0) + else: + self._write_game_flags_value_for(15434, 2) + + if self._read_game_state_value_for(15435) == 0: + self._write_game_flags_value_for(15436, 0) + else: + self._write_game_flags_value_for(15436, 2) + + if self._read_game_state_value_for(15437) == 0: + self._write_game_flags_value_for(15438, 0) + else: + self._write_game_flags_value_for(15438, 2) + + if self._read_game_state_value_for(15439) == 0: + self._write_game_flags_value_for(15440, 0) + else: + self._write_game_flags_value_for(15440, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_BLANK_SCROLL_BOX: + if self.game_state_manager.game_location == "tp2g": + if self._read_game_state_value_for(12095) == 1: + self._write_game_flags_value_for(9115, 2) + else: + self._write_game_flags_value_for(9115, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_BLINDS: + if self.game_state_manager.game_location == "dv1e": + if self._read_game_state_value_for(4743) == 0: + self._write_game_flags_value_for(4799, 0) + else: + self._write_game_flags_value_for(4799, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS: + if self.game_state_manager.game_location == "tr5g": + key: int + for key in data.statemap_keys: + self._write_game_flags_value_for(key, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT: + if self.game_state_manager.game_location == "tr5g": + self._write_game_flags_value_for(12702, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_VACUUM_SLOT: + if self.game_state_manager.game_location == "tr5m": + self._write_game_flags_value_for(12909, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CHANGE_MACHINE_SLOT: + if self.game_state_manager.game_location == "tr5j": + if self._read_game_state_value_for(12892) == 0: + self._write_game_flags_value_for(12900, 0) + else: + self._write_game_flags_value_for(12900, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR: + if self.game_state_manager.game_location == "dw1e": + if self._read_game_state_value_for(4983) == 0: + self._write_game_flags_value_for(5010, 0) + else: + self._write_game_flags_value_for(5010, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT: + if self.game_state_manager.game_location == "me2j": + if self._read_game_state_value_for(9491) == 2: + self._write_game_flags_value_for(9539, 0) + else: + self._write_game_flags_value_for(9539, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER: + if self.game_state_manager.game_location == "me2j": + if self._read_game_state_value_for(9546) == 2 or self._read_game_state_value_for(9419) == 1: + self._write_game_flags_value_for(19712, 2) + else: + self._write_game_flags_value_for(19712, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT: + if self.game_state_manager.game_location == "sg1f": + self._write_game_flags_value_for(2586, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DENTED_LOCKER: + if self.game_state_manager.game_location == "th3j": + five_is_open: bool = self._read_game_state_value_for(11847) == 1 + six_is_open: bool = self._read_game_state_value_for(11840) == 1 + seven_is_open: bool = self._read_game_state_value_for(11841) == 1 + eight_is_open: bool = self._read_game_state_value_for(11848) == 1 + + rocks_in_six: bool = self._read_game_state_value_for(11769) == 1 + six_blasted: bool = self._read_game_state_value_for(11770) == 1 + + if five_is_open or six_is_open or seven_is_open or eight_is_open or rocks_in_six or six_blasted: + self._write_game_flags_value_for(11878, 2) + else: + self._write_game_flags_value_for(11878, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DIRT_MOUND: + if self.game_state_manager.game_location == "te5e": + if self._read_game_state_value_for(11747) == 0: + self._write_game_flags_value_for(11751, 0) + else: + self._write_game_flags_value_for(11751, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH: + if self.game_state_manager.game_location == "pe2e": + self._write_game_flags_value_for(15147, 0) + self._write_game_flags_value_for(15153, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW: + if self.game_state_manager.game_location == "cd70": + self._write_game_flags_value_for(1705, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS: + if self.game_state_manager.game_location == "cd3h": + raft_in_left: bool = self._read_game_state_value_for(1301) == 1 + raft_in_right: bool = self._read_game_state_value_for(1304) == 1 + raft_inflated: bool = self._read_game_state_value_for(1379) == 1 + + captain_in_left: bool = self._read_game_state_value_for(1374) == 1 + captain_in_right: bool = self._read_game_state_value_for(1381) == 1 + captain_inflated: bool = self._read_game_state_value_for(1378) == 1 + + left_inflated: bool = (raft_in_left and raft_inflated) or (captain_in_left and captain_inflated) + + right_inflated: bool = (raft_in_right and raft_inflated) or ( + captain_in_right and captain_inflated + ) + + if left_inflated: + self._write_game_flags_value_for(1425, 2) + else: + self._write_game_flags_value_for(1425, 0) + + if right_inflated: + self._write_game_flags_value_for(1426, 2) + else: + self._write_game_flags_value_for(1426, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE: + if self.game_state_manager.game_location == "uc3e": + if self._read_game_state_value_for(13060) == 0: + self._write_game_flags_value_for(13106, 0) + else: + self._write_game_flags_value_for(13106, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS: + if self.game_state_manager.game_location == "ue1e": + if self._read_game_state_value_for(14318) == 0: + self._write_game_flags_value_for(13219, 0) + self._write_game_flags_value_for(13220, 0) + self._write_game_flags_value_for(13221, 0) + self._write_game_flags_value_for(13222, 0) + else: + self._write_game_flags_value_for(13219, 2) + self._write_game_flags_value_for(13220, 2) + self._write_game_flags_value_for(13221, 2) + self._write_game_flags_value_for(13222, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS: + if self.game_state_manager.game_location == "ue1e": + if self._read_game_state_value_for(14318) == 0: + self._write_game_flags_value_for(14327, 0) + self._write_game_flags_value_for(14332, 0) + self._write_game_flags_value_for(14337, 0) + self._write_game_flags_value_for(14342, 0) + else: + self._write_game_flags_value_for(14327, 2) + self._write_game_flags_value_for(14332, 2) + self._write_game_flags_value_for(14337, 2) + self._write_game_flags_value_for(14342, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT: + if self.game_state_manager.game_location == "tr5e": + self._write_game_flags_value_for(12528, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_DOORS: + if self.game_state_manager.game_location == "tr5e": + if self._read_game_state_value_for(12220) == 0: + self._write_game_flags_value_for(12523, 2) + self._write_game_flags_value_for(12524, 2) + self._write_game_flags_value_for(12525, 2) + else: + self._write_game_flags_value_for(12523, 0) + self._write_game_flags_value_for(12524, 0) + self._write_game_flags_value_for(12525, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_GLASS_CASE: + if self.game_state_manager.game_location == "uc1g": + if self._read_game_state_value_for(12931) == 1 or self._read_game_state_value_for(12929) == 1: + self._write_game_flags_value_for(13002, 2) + else: + self._write_game_flags_value_for(13002, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL: + if self.game_state_manager.game_location == "pe5e": + if self._read_game_state_value_for(10277) == 0: + self._write_game_flags_value_for(10726, 0) + else: + self._write_game_flags_value_for(10726, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_DOOR: + if self.game_state_manager.game_location == "tr1k": + if self._read_game_state_value_for(12212) == 0: + self._write_game_flags_value_for(12280, 0) + else: + self._write_game_flags_value_for(12280, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_GRASS: + if self.game_state_manager.game_location in ("te10", "te1g", "te20", "te30", "te40"): + key: int + for key in data.statemap_keys: + self._write_game_flags_value_for(key, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS: + if self.game_state_manager.game_location == "hp1e": + if self._read_game_state_value_for(8431) == 1: + key: int + for key in data.statemap_keys: + self._write_game_flags_value_for(key, 0) + else: + key: int + for key in data.statemap_keys: + self._write_game_flags_value_for(key, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER: + if self.game_state_manager.game_location == "hp1e": + if self._read_game_state_value_for(8431) == 1: + self._write_game_flags_value_for(8446, 2) + else: + self._write_game_flags_value_for(8446, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_HARRY: + if self.game_state_manager.game_location == "dg4e": + if self._read_game_state_value_for(4237) == 1 and self._read_game_state_value_for(4034) == 1: + self._write_game_flags_value_for(4260, 2) + else: + self._write_game_flags_value_for(4260, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY: + if self.game_state_manager.game_location == "dg4h": + if self._read_game_state_value_for(4279) == 1: + self._write_game_flags_value_for(18026, 2) + else: + self._write_game_flags_value_for(18026, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH: + if self.game_state_manager.game_location == "dg4g": + if self._read_game_state_value_for(4034) == 1: + self._write_game_flags_value_for(17623, 2) + else: + self._write_game_flags_value_for(17623, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR: + if self.game_state_manager.game_location == "uc4e": + if self._read_game_state_value_for(13062) == 1: + self._write_game_flags_value_for(13140, 2) + else: + self._write_game_flags_value_for(13140, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR: + if self.game_state_manager.game_location == "pe1e": + if self._read_game_state_value_for(10451) == 1: + self._write_game_flags_value_for(10441, 2) + else: + self._write_game_flags_value_for(10441, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_LOUDSPEAKER_VOLUME_BUTTONS: + if self.game_state_manager.game_location == "pe2j": + self._write_game_flags_value_for(19632, 0) + self._write_game_flags_value_for(19627, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_DOOR: + if self.game_state_manager.game_location == "sw4e": + if self._read_game_state_value_for(2989) == 1: + self._write_game_flags_value_for(3025, 2) + else: + self._write_game_flags_value_for(3025, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG: + if self.game_state_manager.game_location == "sw4e": + self._write_game_flags_value_for(3036, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_MIRROR: + if self.game_state_manager.game_location == "dw1f": + self._write_game_flags_value_for(5031, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT: + if self.game_state_manager.game_location == "um1e": + if self._read_game_state_value_for(9637) == 0: + self._write_game_flags_value_for(13597, 0) + else: + self._write_game_flags_value_for(13597, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_MOSSY_GRATE: + if self.game_state_manager.game_location == "ue2g": + if self._read_game_state_value_for(13278) == 0: + self._write_game_flags_value_for(13390, 0) + else: + self._write_game_flags_value_for(13390, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR: + if self.game_state_manager.game_location == "qe1e": + if self._player_is_brog(): + self._write_game_flags_value_for(2447, 0) + elif self._player_is_griff(): + self._write_game_flags_value_for(2455, 0) + elif self._player_is_lucy(): + if self._read_game_state_value_for(2457) == 0: + self._write_game_flags_value_for(2455, 0) + else: + self._write_game_flags_value_for(2455, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS: + if self.game_state_manager.game_location == "tr3h": + if self._read_game_state_value_for(11777) == 1: + self._write_game_flags_value_for(12389, 2) + else: + self._write_game_flags_value_for(12389, 0) + + self._write_game_state_value_for(12390, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE: + if self.game_state_manager.game_location == "dg4f": + if self._read_game_state_value_for(4241) == 1: + self._write_game_flags_value_for(4302, 2) + else: + self._write_game_flags_value_for(4302, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE: + if self.game_state_manager.game_location == "tp1e": + if self._read_game_state_value_for(16342) == 1: + self._write_game_flags_value_for(16383, 2) + self._write_game_flags_value_for(16384, 2) + else: + self._write_game_flags_value_for(16383, 0) + self._write_game_flags_value_for(16384, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE: + if self.game_state_manager.game_location == "sg6e": + if self._read_game_state_value_for(15715) == 1: + self._write_game_flags_value_for(2769, 2) + else: + self._write_game_flags_value_for(2769, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON: + if self.game_state_manager.game_location == "dg2f": + if self._read_game_state_value_for(4114) == 1 or self._read_game_state_value_for(4115) == 1: + self._write_game_flags_value_for(4149, 2) + else: + self._write_game_flags_value_for(4149, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_BUTTONS: + if self.game_state_manager.game_location == "tr5f": + self._write_game_flags_value_for(12584, 0) + self._write_game_flags_value_for(12585, 0) + self._write_game_flags_value_for(12586, 0) + self._write_game_flags_value_for(12587, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_COIN_SLOT: + if self.game_state_manager.game_location == "tr5f": + self._write_game_flags_value_for(12574, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SOUVENIR_COIN_SLOT: + if self.game_state_manager.game_location == "ue2j": + if self._read_game_state_value_for(13408) == 1: + self._write_game_flags_value_for(13412, 2) + else: + self._write_game_flags_value_for(13412, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER: + if self.game_state_manager.game_location == "tp4g": + self._write_game_flags_value_for(12170, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM: + if self.game_state_manager.game_location == "tp1e": + if self._read_game_state_value_for(16342) == 1 and self._read_game_state_value_for(16374) == 0: + self._write_game_flags_value_for(16382, 0) + else: + self._write_game_flags_value_for(16382, 2) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM: + if self.game_state_manager.game_location == "dg3e": + self._write_game_flags_value_for(4209, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_STUDENT_ID_MACHINE: + if self.game_state_manager.game_location == "th3r": + self._write_game_flags_value_for(11973, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT: + if self.game_state_manager.game_location == "uc6e": + self._write_game_flags_value_for(13168, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY: + if self.game_state_manager.game_location == "qb2e": + if self._read_game_state_value_for(15395) == 1: + self._write_game_flags_value_for(15396, 2) + else: + self._write_game_flags_value_for(15396, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH: + if self.game_state_manager.game_location == "mt2e": + self._write_game_flags_value_for(9706, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS: + if self.game_state_manager.game_location == "mt2g": + self._write_game_flags_value_for(9728, 0) + self._write_game_flags_value_for(9729, 0) + self._write_game_flags_value_for(9730, 0) + elif hotspot_item == ZorkGrandInquisitorItems.HOTSPOT_WELL: + if self.game_state_manager.game_location == "pc1e": + self._write_game_flags_value_for(10314, 0) + elif hotspot_item == ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM: + if self.game_state_manager.game_location == "us2e": + self._write_game_flags_value_for(13757, 0) + elif self.game_state_manager.game_location == "ue2e": + self._write_game_flags_value_for(13297, 0) + elif self.game_state_manager.game_location == "uh2e": + self._write_game_flags_value_for(13486, 0) + elif self.game_state_manager.game_location == "um2e": + self._write_game_flags_value_for(13625, 0) + elif hotspot_item == ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES: + if self.game_state_manager.game_location == "us2e": + self._write_game_flags_value_for(13758, 0) + elif self.game_state_manager.game_location == "ue2e": + self._write_game_flags_value_for(13309, 0) + elif self.game_state_manager.game_location == "uh2e": + self._write_game_flags_value_for(13498, 0) + elif self.game_state_manager.game_location == "um2e": + self._write_game_flags_value_for(13637, 0) + elif hotspot_item == ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY: + if self.game_state_manager.game_location == "us2e": + self._write_game_flags_value_for(13759, 0) + elif self.game_state_manager.game_location == "ue2e": + self._write_game_flags_value_for(13316, 0) + elif self.game_state_manager.game_location == "uh2e": + self._write_game_flags_value_for(13505, 0) + elif self.game_state_manager.game_location == "um2e": + self._write_game_flags_value_for(13644, 0) + elif hotspot_item == ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION: + if self.game_state_manager.game_location == "mt1f": + self._write_game_flags_value_for(9660, 0) + elif hotspot_item == ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_INFINITY: + if self.game_state_manager.game_location == "mt1f": + self._write_game_flags_value_for(9666, 0) + elif hotspot_item == ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL: + if self.game_state_manager.game_location == "mt1f": + self._write_game_flags_value_for(9668, 0) + elif hotspot_item == ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_SURFACE_OF_MERZ: + if self.game_state_manager.game_location == "mt1f": + self._write_game_flags_value_for(9662, 0) + + def _manage_items(self) -> None: + if self._player_is_afgncaap(): + self.available_inventory_slots = self._determine_available_inventory_slots() + + received_inventory_items: Set[ZorkGrandInquisitorItems] + received_inventory_items = self.received_items & self.possible_inventory_items + + received_inventory_items = self._filter_received_inventory_items(received_inventory_items) + elif self._player_is_totem(): + self.available_inventory_slots = self._determine_available_inventory_slots(is_totem=True) + + received_inventory_items: Set[ZorkGrandInquisitorItems] + + if self._player_is_brog(): + received_inventory_items = self.received_items & self.brog_items + received_inventory_items = self._filter_received_brog_inventory_items(received_inventory_items) + elif self._player_is_griff(): + received_inventory_items = self.received_items & self.griff_items + received_inventory_items = self._filter_received_griff_inventory_items(received_inventory_items) + elif self._player_is_lucy(): + received_inventory_items = self.received_items & self.lucy_items + received_inventory_items = self._filter_received_lucy_inventory_items(received_inventory_items) + else: + return None + else: + return None + + game_state_inventory_items: Set[ZorkGrandInquisitorItems] = self._determine_game_state_inventory() + + inventory_items_to_remove: Set[ZorkGrandInquisitorItems] + inventory_items_to_remove = game_state_inventory_items - received_inventory_items + + inventory_items_to_add: Set[ZorkGrandInquisitorItems] + inventory_items_to_add = received_inventory_items - game_state_inventory_items + + item: ZorkGrandInquisitorItems + for item in inventory_items_to_remove: + self._remove_from_inventory(item) + + item: ZorkGrandInquisitorItems + for item in inventory_items_to_add: + self._add_to_inventory(item) + + # Item Deduplication (Just in Case) + seen_items: Set[int] = set() + + i: int + for i in range(151, 171): + item: int = self._read_game_state_value_for(i) + + if item in seen_items: + self._write_game_state_value_for(i, 0) + else: + seen_items.add(item) + + def _apply_conditional_teleports(self) -> None: + if self._player_is_at("uw1x"): + self.game_state_manager.set_game_location("uw10", 0) + + if self._player_is_at("uw1k") and self._read_game_state_value_for(13938) == 0: + self.game_state_manager.set_game_location("pc10", 250) + + if self._player_is_at("ue1q"): + self.game_state_manager.set_game_location("ue1e", 0) + + if self._player_is_at("ej10"): + self.game_state_manager.set_game_location("uc10", 1200) + + if self._read_game_state_value_for(9) == 224: + self._write_game_state_value_for(9, 0) + self.game_state_manager.set_game_location("uc10", 1200) + + def _check_for_victory(self) -> None: + if self.option_goal == ZorkGrandInquisitorGoals.THREE_ARTIFACTS: + coconut_is_placed = self._read_game_state_value_for(2200) == 1 + cube_is_placed = self._read_game_state_value_for(2322) == 1 + skull_is_placed = self._read_game_state_value_for(2321) == 1 + + self.goal_completed = coconut_is_placed and cube_is_placed and skull_is_placed + + def _determine_game_state_inventory(self) -> Set[ZorkGrandInquisitorItems]: + game_state_inventory: Set[ZorkGrandInquisitorItems] = set() + + # Item on Cursor + item_on_cursor: int = self._read_game_state_value_for(9) + + if item_on_cursor != 0: + if item_on_cursor in self.game_id_to_items: + game_state_inventory.add(self.game_id_to_items[item_on_cursor]) + + # Item in Inspector + item_in_inspector: int = self._read_game_state_value_for(4512) + + if item_in_inspector != 0: + if item_in_inspector in self.game_id_to_items: + game_state_inventory.add(self.game_id_to_items[item_in_inspector]) + + # Items in Inventory Slots + i: int + for i in range(151, 171): + if self._read_game_state_value_for(i) != 0: + if self._read_game_state_value_for(i) in self.game_id_to_items: + game_state_inventory.add( + self.game_id_to_items[self._read_game_state_value_for(i)] + ) + + # Pouch of Zorkmids + if self._read_game_state_value_for(5827) == 1: + game_state_inventory.add(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS) + + # Spells + i: int + for i in range(191, 203): + if self._read_game_state_value_for(i) == 1: + if i in self.game_id_to_items: + game_state_inventory.add(self.game_id_to_items[i]) + + # Totems + if self._read_game_state_value_for(4853) == 1: + game_state_inventory.add(ZorkGrandInquisitorItems.TOTEM_BROG) + + if self._read_game_state_value_for(4315) == 1: + game_state_inventory.add(ZorkGrandInquisitorItems.TOTEM_GRIFF) + + if self._read_game_state_value_for(5223) == 1: + game_state_inventory.add(ZorkGrandInquisitorItems.TOTEM_LUCY) + + return game_state_inventory + + def _add_to_inventory(self, item: ZorkGrandInquisitorItems) -> None: + if item == ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS: + return None + + data: ZorkGrandInquisitorItemData = item_data[item] + + if ZorkGrandInquisitorTags.INVENTORY_ITEM in data.tags: + if len(self.available_inventory_slots): # Inventory slot overflow protection + inventory_slot: int = self.available_inventory_slots.pop() + self._write_game_state_value_for(inventory_slot, data.statemap_keys[0]) + elif ZorkGrandInquisitorTags.SPELL in data.tags: + self._write_game_state_value_for(data.statemap_keys[0], 1) + elif ZorkGrandInquisitorTags.TOTEM in data.tags: + self._write_game_state_value_for(data.statemap_keys[0], 1) + + def _remove_from_inventory(self, item: ZorkGrandInquisitorItems) -> None: + if item == ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS: + return None + + data: ZorkGrandInquisitorItemData = item_data[item] + + if ZorkGrandInquisitorTags.INVENTORY_ITEM in data.tags: + inventory_slot: Optional[int] = self._inventory_slot_for(item) + + if inventory_slot is None: + return None + + self._write_game_state_value_for(inventory_slot, 0) + + if inventory_slot != 9: + self.available_inventory_slots.add(inventory_slot) + elif ZorkGrandInquisitorTags.SPELL in data.tags: + self._write_game_state_value_for(data.statemap_keys[0], 0) + elif ZorkGrandInquisitorTags.TOTEM in data.tags: + self._write_game_state_value_for(data.statemap_keys[0], 0) + + def _determine_available_inventory_slots(self, is_totem: bool = False) -> Set[int]: + available_inventory_slots: Set[int] = set() + + inventory_slot_range_end: int = 171 + + if is_totem: + if self._player_is_brog(): + inventory_slot_range_end = 161 + elif self._player_is_griff(): + inventory_slot_range_end = 160 + elif self._player_is_lucy(): + inventory_slot_range_end = 157 + + i: int + for i in range(151, inventory_slot_range_end): + if self._read_game_state_value_for(i) == 0: + available_inventory_slots.add(i) + + return available_inventory_slots + + def _inventory_slot_for(self, item) -> Optional[int]: + data: ZorkGrandInquisitorItemData = item_data[item] + + if ZorkGrandInquisitorTags.INVENTORY_ITEM in data.tags: + i: int + for i in range(151, 171): + if self._read_game_state_value_for(i) == data.statemap_keys[0]: + return i + + if self._read_game_state_value_for(9) == data.statemap_keys[0]: + return 9 + + if self._read_game_state_value_for(4512) == data.statemap_keys[0]: + return 4512 + + return None + + def _filter_received_inventory_items( + self, received_inventory_items: Set[ZorkGrandInquisitorItems] + ) -> Set[ZorkGrandInquisitorItems]: + to_filter_inventory_items: Set[ZorkGrandInquisitorItems] = self.totem_items + + inventory_item_values: Set[int] = set() + + i: int + for i in range(151, 171): + inventory_item_values.add(self._read_game_state_value_for(i)) + + cursor_item_value: int = self._read_game_state_value_for(9) + inspector_item_value: int = self._read_game_state_value_for(4512) + + inventory_item_values.add(cursor_item_value) + inventory_item_values.add(inspector_item_value) + + item: ZorkGrandInquisitorItems + for item in received_inventory_items: + if item == ZorkGrandInquisitorItems.FLATHEADIA_FUDGE: + if self._read_game_state_value_for(4766) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4869) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.HUNGUS_LARD: + if self._read_game_state_value_for(4870) == 1: + to_filter_inventory_items.add(item) + elif ( + self._read_game_state_value_for(4244) == 1 + and self._read_game_state_value_for(4309) == 0 + ): + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.JAR_OF_HOTBUGS: + if self._read_game_state_value_for(4750) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4869) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.LANTERN: + if self._read_game_state_value_for(10477) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(5221) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER: + if self._read_game_state_value_for(9491) == 3: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.MAP: + if self._read_game_state_value_for(16618) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.MEAD_LIGHT: + if 105 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(17620) > 0: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4034) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.MOSS_OF_MAREILON: + if self._read_game_state_value_for(4763) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4869) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.MUG: + if self._read_game_state_value_for(4772) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4869) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.OLD_SCRATCH_CARD: + if 32 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(12892) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.PERMA_SUCK_MACHINE: + if self._read_game_state_value_for(12218) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER: + if self._read_game_state_value_for(15150) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(10421) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.PROZORK_TABLET: + if self._read_game_state_value_for(4115) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB: + if self._read_game_state_value_for(4769) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4869) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.ROPE: + if 22 in inventory_item_values: + to_filter_inventory_items.add(item) + elif 111 in inventory_item_values: + to_filter_inventory_items.add(item) + elif ( + self._read_game_state_value_for(10304) == 1 + and not self._read_game_state_value_for(13938) == 1 + ): + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15150) == 83: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS: + if 41 in inventory_item_values: + to_filter_inventory_items.add(item) + elif 98 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(201) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV: + if 48 in inventory_item_values: + to_filter_inventory_items.add(item) + elif 98 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(201) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.SNAPDRAGON: + if self._read_game_state_value_for(4199) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.STUDENT_ID: + if self._read_game_state_value_for(11838) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.SUBWAY_TOKEN: + if self._read_game_state_value_for(13167) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.SWORD: + if 22 in inventory_item_values: + to_filter_inventory_items.add(item) + elif 100 in inventory_item_values: + to_filter_inventory_items.add(item) + elif 111 in inventory_item_values: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.ZIMDOR_SCROLL: + if 105 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(17620) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(4034) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.ZORK_ROCKS: + if self._read_game_state_value_for(12486) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(12487) == 1: + to_filter_inventory_items.add(item) + elif 52 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(11769) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(11840) == 1: + to_filter_inventory_items.add(item) + + return received_inventory_items - to_filter_inventory_items + + def _filter_received_brog_inventory_items( + self, received_inventory_items: Set[ZorkGrandInquisitorItems] + ) -> Set[ZorkGrandInquisitorItems]: + to_filter_inventory_items: Set[ZorkGrandInquisitorItems] = set() + + inventory_item_values: Set[int] = set() + + i: int + for i in range(151, 161): + inventory_item_values.add(self._read_game_state_value_for(i)) + + cursor_item_value: int = self._read_game_state_value_for(9) + inspector_item_value: int = self._read_game_state_value_for(2194) + + inventory_item_values.add(cursor_item_value) + inventory_item_values.add(inspector_item_value) + + item: ZorkGrandInquisitorItems + for item in received_inventory_items: + if item == ZorkGrandInquisitorItems.BROGS_BICKERING_TORCH: + if 103 in inventory_item_values: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH: + if 104 in inventory_item_values: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.BROGS_GRUE_EGG: + if self._read_game_state_value_for(2577) == 1: + to_filter_inventory_items.add(item) + elif 71 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(2641) == 1: + to_filter_inventory_items.add(item) + + return received_inventory_items - to_filter_inventory_items + + def _filter_received_griff_inventory_items( + self, received_inventory_items: Set[ZorkGrandInquisitorItems] + ) -> Set[ZorkGrandInquisitorItems]: + to_filter_inventory_items: Set[ZorkGrandInquisitorItems] = set() + + inventory_item_values: Set[int] = set() + + i: int + for i in range(151, 160): + inventory_item_values.add(self._read_game_state_value_for(i)) + + cursor_item_value: int = self._read_game_state_value_for(9) + inspector_item_value: int = self._read_game_state_value_for(4512) + + inventory_item_values.add(cursor_item_value) + inventory_item_values.add(inspector_item_value) + + item: ZorkGrandInquisitorItems + for item in received_inventory_items: + if item == ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT: + if self._read_game_state_value_for(1301) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(1304) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(16562) == 1: + to_filter_inventory_items.add(item) + if item == ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN: + if self._read_game_state_value_for(1374) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(1381) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(16562) == 1: + to_filter_inventory_items.add(item) + + return received_inventory_items - to_filter_inventory_items + + def _filter_received_lucy_inventory_items( + self, received_inventory_items: Set[ZorkGrandInquisitorItems] + ) -> Set[ZorkGrandInquisitorItems]: + to_filter_inventory_items: Set[ZorkGrandInquisitorItems] = set() + + inventory_item_values: Set[int] = set() + + i: int + for i in range(151, 157): + inventory_item_values.add(self._read_game_state_value_for(i)) + + cursor_item_value: int = self._read_game_state_value_for(9) + inspector_item_value: int = self._read_game_state_value_for(2198) + + inventory_item_values.add(cursor_item_value) + inventory_item_values.add(inspector_item_value) + + item: ZorkGrandInquisitorItems + for item in received_inventory_items: + if item == ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1: + if 120 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15433) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15435) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15437) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15439) == 1: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15472) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2: + if 121 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15433) == 2: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15435) == 2: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15437) == 2: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15439) == 2: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15472) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3: + if 122 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15433) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15435) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15437) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15439) == 3: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15472) == 1: + to_filter_inventory_items.add(item) + elif item == ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4: + if 123 in inventory_item_values: + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15433) in (4, 5): + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15435) in (4, 5): + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15437) in (4, 5): + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15439) in (4, 5): + to_filter_inventory_items.add(item) + elif self._read_game_state_value_for(15472) == 1: + to_filter_inventory_items.add(item) + + return received_inventory_items - to_filter_inventory_items + + def _read_game_state_value_for(self, key: int) -> Optional[int]: + try: + return self.game_state_manager.read_game_state_value_for(key) + except Exception as e: + self.log_debug(f"Exception: {e} while trying to read game state key '{key}'") + raise e + + def _write_game_state_value_for(self, key: int, value: int) -> Optional[bool]: + try: + return self.game_state_manager.write_game_state_value_for(key, value) + except Exception as e: + self.log_debug(f"Exception: {e} while trying to write '{key} = {value}' to game state") + raise e + + def _read_game_flags_value_for(self, key: int) -> Optional[int]: + try: + return self.game_state_manager.read_game_flags_value_for(key) + except Exception as e: + self.log_debug(f"Exception: {e} while trying to read game flags key '{key}'") + raise e + + def _write_game_flags_value_for(self, key: int, value: int) -> Optional[bool]: + try: + return self.game_state_manager.write_game_flags_value_for(key, value) + except Exception as e: + self.log_debug(f"Exception: {e} while trying to write '{key} = {value}' to game flags") + raise e + + def _player_has(self, item: ZorkGrandInquisitorItems) -> bool: + return item in self.received_items + + def _player_doesnt_have(self, item: ZorkGrandInquisitorItems) -> bool: + return item not in self.received_items + + def _player_is_at(self, game_location: str) -> bool: + return self.game_state_manager.game_location == game_location + + def _player_is_afgncaap(self) -> bool: + return self._read_game_state_value_for(1596) == 1 + + def _player_is_totem(self) -> bool: + return self._player_is_brog() or self._player_is_griff() or self._player_is_lucy() + + def _player_is_brog(self) -> bool: + return self._read_game_state_value_for(1520) == 1 + + def _player_is_griff(self) -> bool: + return self._read_game_state_value_for(1296) == 1 + + def _player_is_lucy(self) -> bool: + return self._read_game_state_value_for(1524) == 1 diff --git a/worlds/zork_grand_inquisitor/game_state_manager.py b/worlds/zork_grand_inquisitor/game_state_manager.py new file mode 100644 index 000000000000..25b35969bf5e --- /dev/null +++ b/worlds/zork_grand_inquisitor/game_state_manager.py @@ -0,0 +1,370 @@ +from typing import Optional, Tuple + +from pymem import Pymem +from pymem.process import close_handle + + +class GameStateManager: + process_name = "scummvm.exe" + + process: Optional[Pymem] + is_process_running: bool + + script_manager_struct_address: int + render_manager_struct_address: int + + game_location: Optional[str] + game_location_offset: Optional[int] + + def __init__(self) -> None: + self.process = None + self.is_process_running = False + + self.script_manager_struct_address = 0x0 + self.render_manager_struct_address = 0x0 + + self.game_location = None + self.game_location_offset = None + + @property + def game_state_storage_pointer_address(self) -> int: + return self.script_manager_struct_address + 0x88 + + @property + def game_state_storage_address(self) -> int: + return self.process.read_longlong(self.game_state_storage_pointer_address) + + @property + def game_state_hashmap_size_address(self) -> int: + return self.script_manager_struct_address + 0x90 + + @property + def game_state_key_count_address(self) -> int: + return self.script_manager_struct_address + 0x94 + + @property + def game_state_deleted_key_count_address(self) -> int: + return self.script_manager_struct_address + 0x98 + + @property + def game_flags_storage_pointer_address(self) -> int: + return self.script_manager_struct_address + 0x120 + + @property + def game_flags_storage_address(self) -> int: + return self.process.read_longlong(self.game_flags_storage_pointer_address) + + @property + def game_flags_hashmap_size_address(self) -> int: + return self.script_manager_struct_address + 0x128 + + @property + def game_flags_key_count_address(self) -> int: + return self.script_manager_struct_address + 0x12C + + @property + def game_flags_deleted_key_count_address(self) -> int: + return self.script_manager_struct_address + 0x130 + + @property + def current_location_address(self) -> int: + return self.script_manager_struct_address + 0x400 + + @property + def current_location_offset_address(self) -> int: + return self.script_manager_struct_address + 0x404 + + @property + def next_location_address(self) -> int: + return self.script_manager_struct_address + 0x408 + + @property + def next_location_offset_address(self) -> int: + return self.script_manager_struct_address + 0x40C + + @property + def panorama_reversed_address(self) -> int: + return self.render_manager_struct_address + 0x1C + + def open_process_handle(self) -> bool: + try: + self.process = Pymem(self.process_name) + self.is_process_running = True + + self.script_manager_struct_address = self._resolve_address(0x5276600, (0xC8, 0x0)) + self.render_manager_struct_address = self._resolve_address(0x5276600, (0xD0, 0x120)) + except Exception: + return False + + return True + + def close_process_handle(self) -> bool: + if close_handle(self.process.process_handle): + self.is_process_running = False + self.process = None + + self.script_manager_struct_address = 0x0 + self.render_manager_struct_address = 0x0 + + return True + + return False + + def is_process_still_running(self) -> bool: + try: + self.process.read_int(self.process.base_address) + except Exception: + self.is_process_running = False + self.process = None + + self.script_manager_struct_address = 0x0 + self.render_manager_struct_address = 0x0 + + return False + + return True + + def read_game_state_value_for(self, key: int) -> Optional[int]: + return self.read_statemap_value_for(key, scope="game_state") + + def read_game_flags_value_for(self, key: int) -> Optional[int]: + return self.read_statemap_value_for(key, scope="game_flags") + + def read_statemap_value_for(self, key: int, scope: str = "game_state") -> Optional[int]: + if self.is_process_running: + offset: int + + address: int + address_value: int + + if scope == "game_state": + offset = self._get_game_state_address_read_offset_for(key) + + address = self.game_state_storage_address + offset + address_value = self.process.read_longlong(address) + elif scope == "game_flags": + offset = self._get_game_flags_address_read_offset_for(key) + + address = self.game_flags_storage_address + offset + address_value = self.process.read_longlong(address) + else: + raise ValueError(f"Invalid scope: {scope}") + + if address_value == 0: + return 0 + + statemap_value: int = self.process.read_int(address_value + 0x0) + statemap_key: int = self.process.read_int(address_value + 0x4) + + assert statemap_key == key + + return statemap_value + + return None + + def write_game_state_value_for(self, key: int, value: int) -> Optional[bool]: + return self.write_statemap_value_for(key, value, scope="game_state") + + def write_game_flags_value_for(self, key: int, value: int) -> Optional[bool]: + return self.write_statemap_value_for(key, value, scope="game_flags") + + def write_statemap_value_for(self, key: int, value: int, scope: str = "game_state") -> Optional[bool]: + if self.is_process_running: + offset: int + is_existing_node: bool + is_reused_dummy_node: bool + + key_count_address: int + deleted_key_count_address: int + + storage_address: int + + if scope == "game_state": + offset, is_existing_node, is_reused_dummy_node = self._get_game_state_address_write_offset_for(key) + + key_count_address = self.game_state_key_count_address + deleted_key_count_address = self.game_state_deleted_key_count_address + + storage_address = self.game_state_storage_address + elif scope == "game_flags": + offset, is_existing_node, is_reused_dummy_node = self._get_game_flags_address_write_offset_for(key) + + key_count_address = self.game_flags_key_count_address + deleted_key_count_address = self.game_flags_deleted_key_count_address + + storage_address = self.game_flags_storage_address + else: + raise ValueError(f"Invalid scope: {scope}") + + statemap_key_count: int = self.process.read_int(key_count_address) + statemap_deleted_key_count: int = self.process.read_int(deleted_key_count_address) + + if value == 0: + if not is_existing_node: + return False + + self.process.write_longlong(storage_address + offset, 1) + + self.process.write_int(key_count_address, statemap_key_count - 1) + self.process.write_int(deleted_key_count_address, statemap_deleted_key_count + 1) + else: + if is_existing_node: + address_value: int = self.process.read_longlong(storage_address + offset) + self.process.write_int(address_value + 0x0, value) + else: + write_address: int = self.process.allocate(0x8) + + self.process.write_int(write_address + 0x0, value) + self.process.write_int(write_address + 0x4, key) + + self.process.write_longlong(storage_address + offset, write_address) + + self.process.write_int(key_count_address, statemap_key_count + 1) + + if is_reused_dummy_node: + self.process.write_int(deleted_key_count_address, statemap_deleted_key_count - 1) + + return True + + return None + + def refresh_game_location(self) -> Optional[bool]: + if self.is_process_running: + game_location_bytes: bytes = self.process.read_bytes(self.current_location_address, 4) + + self.game_location = game_location_bytes.decode("ascii") + self.game_location_offset = self.process.read_int(self.current_location_offset_address) + + return True + + return None + + def set_game_location(self, game_location: str, offset: int) -> Optional[bool]: + if self.is_process_running: + game_location_bytes: bytes = game_location.encode("ascii") + + self.process.write_bytes(self.next_location_address, game_location_bytes, 4) + self.process.write_int(self.next_location_offset_address, offset) + + return True + + return None + + def set_panorama_reversed(self, is_reversed: bool) -> Optional[bool]: + if self.is_process_running: + self.process.write_int(self.panorama_reversed_address, 1 if is_reversed else 0) + + return True + + return None + + def _resolve_address(self, base_offset: int, offsets: Tuple[int, ...]): + address: int = self.process.read_longlong(self.process.base_address + base_offset) + + for offset in offsets[:-1]: + address = self.process.read_longlong(address + offset) + + return address + offsets[-1] + + def _get_game_state_address_read_offset_for(self, key: int): + return self._get_statemap_address_read_offset_for(key, scope="game_state") + + def _get_game_flags_address_read_offset_for(self, key: int): + return self._get_statemap_address_read_offset_for(key, scope="game_flags") + + def _get_statemap_address_read_offset_for(self, key: int, scope: str = "game_state") -> int: + hashmap_size_address: int + storage_address: int + + if scope == "game_state": + hashmap_size_address = self.game_state_hashmap_size_address + storage_address = self.game_state_storage_address + elif scope == "game_flags": + hashmap_size_address = self.game_flags_hashmap_size_address + storage_address = self.game_flags_storage_address + else: + raise ValueError(f"Invalid scope: {scope}") + + statemap_hashmap_size: int = self.process.read_int(hashmap_size_address) + + perturb: int = key + perturb_shift: int = 0x5 + + index: int = key & statemap_hashmap_size + offset: int = index * 0x8 + + while True: + offset_value: int = self.process.read_longlong(storage_address + offset) + + if offset_value == 0: # Null Pointer + break + elif offset_value == 1: # Dummy Node + pass + elif offset_value > 1: # Existing Node + if self.process.read_int(offset_value + 0x4) == key: + break + + index = ((0x5 * index) + perturb + 0x1) & statemap_hashmap_size + offset = index * 0x8 + + perturb >>= perturb_shift + + return offset + + def _get_game_state_address_write_offset_for(self, key: int) -> Tuple[int, bool, bool]: + return self._get_statemap_address_write_offset_for(key, scope="game_state") + + def _get_game_flags_address_write_offset_for(self, key: int) -> Tuple[int, bool, bool]: + return self._get_statemap_address_write_offset_for(key, scope="game_flags") + + def _get_statemap_address_write_offset_for(self, key: int, scope: str = "game_state") -> Tuple[int, bool, bool]: + hashmap_size_address: int + storage_address: int + + if scope == "game_state": + hashmap_size_address = self.game_state_hashmap_size_address + storage_address = self.game_state_storage_address + elif scope == "game_flags": + hashmap_size_address = self.game_flags_hashmap_size_address + storage_address = self.game_flags_storage_address + else: + raise ValueError(f"Invalid scope: {scope}") + + statemap_hashmap_size: int = self.process.read_int(hashmap_size_address) + + perturb: int = key + perturb_shift: int = 0x5 + + index: int = key & statemap_hashmap_size + offset: int = index * 0x8 + + node_found: bool = False + + dummy_node_found: bool = False + dummy_node_offset: Optional[int] = None + + while True: + offset_value: int = self.process.read_longlong(storage_address + offset) + + if offset_value == 0: # Null Pointer + break + elif offset_value == 1: # Dummy Node + if not dummy_node_found: + dummy_node_offset = offset + dummy_node_found = True + elif offset_value > 1: # Existing Node + if self.process.read_int(offset_value + 0x4) == key: + node_found = True + break + + index = ((0x5 * index) + perturb + 0x1) & statemap_hashmap_size + offset = index * 0x8 + + perturb >>= perturb_shift + + if not node_found and dummy_node_found: # We should reuse the dummy node + return dummy_node_offset, False, True + elif not node_found and not dummy_node_found: # We should allocate a new node + return offset, False, False + + return offset, True, False # We should update the existing node diff --git a/worlds/zork_grand_inquisitor/options.py b/worlds/zork_grand_inquisitor/options.py new file mode 100644 index 000000000000..f06415199934 --- /dev/null +++ b/worlds/zork_grand_inquisitor/options.py @@ -0,0 +1,61 @@ +from dataclasses import dataclass + +from Options import Choice, DefaultOnToggle, PerGameCommonOptions, Toggle + + +class Goal(Choice): + """ + Determines the victory condition + + Three Artifacts: Retrieve the three artifacts of magic and place them in the walking castle + """ + display_name: str = "Goal" + + default: int = 0 + option_three_artifacts: int = 0 + + +class QuickPortFoozle(DefaultOnToggle): + """If true, the items needed to go down the well will be found in early locations for a smoother early game""" + + display_name: str = "Quick Port Foozle" + + +class StartWithHotspotItems(DefaultOnToggle): + """ + If true, the player will be given all the hotspot items at the start of the game, effectively removing the need + to enable the important hotspots in the game before interacting with them. Recommended for beginners + + Note: The spots these hotspot items would have occupied in the item pool will instead be filled with junk items. + Expect a higher volume of filler items if you enable this option + """ + + display_name: str = "Start with Hotspot Items" + + +class Deathsanity(Toggle): + """If true, adds 16 player death locations to the world""" + + display_name: str = "Deathsanity" + + +class GrantMissableLocationChecks(Toggle): + """ + If true, performing an irreversible action will grant the locations checks that would have become unobtainable as a + result of that action when you meet the item requirements + + Otherwise, the player is expected to potentially have to use the save system to reach those location checks. If you + don't like the idea of rarely having to reload an earlier save to get a location check, make sure this option is + enabled + """ + + display_name: str = "Grant Missable Checks" + + +@dataclass +class ZorkGrandInquisitorOptions(PerGameCommonOptions): + goal: Goal + quick_port_foozle: QuickPortFoozle + start_with_hotspot_items: StartWithHotspotItems + deathsanity: Deathsanity + grant_missable_location_checks: GrantMissableLocationChecks diff --git a/worlds/zork_grand_inquisitor/requirements.txt b/worlds/zork_grand_inquisitor/requirements.txt new file mode 100644 index 000000000000..fe25267f6705 --- /dev/null +++ b/worlds/zork_grand_inquisitor/requirements.txt @@ -0,0 +1 @@ +Pymem>=1.13.0 \ No newline at end of file diff --git a/worlds/zork_grand_inquisitor/test/__init__.py b/worlds/zork_grand_inquisitor/test/__init__.py new file mode 100644 index 000000000000..c8ceda43a7bf --- /dev/null +++ b/worlds/zork_grand_inquisitor/test/__init__.py @@ -0,0 +1,5 @@ +from test.bases import WorldTestBase + + +class ZorkGrandInquisitorTestBase(WorldTestBase): + game = "Zork Grand Inquisitor" diff --git a/worlds/zork_grand_inquisitor/test/test_access.py b/worlds/zork_grand_inquisitor/test/test_access.py new file mode 100644 index 000000000000..63a5f8c9ab1d --- /dev/null +++ b/worlds/zork_grand_inquisitor/test/test_access.py @@ -0,0 +1,2927 @@ +from typing import List + +from . import ZorkGrandInquisitorTestBase + +from ..enums import ( + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorLocations, + ZorkGrandInquisitorRegions, +) + + +class AccessTestRegions(ZorkGrandInquisitorTestBase): + options = { + "start_with_hotspot_items": "false", + } + + def test_access_crossroads_to_dm_lair_sword(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_crossroads_to_dm_lair_teleporter(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_crossroads_to_gue_tech(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + def test_access_crossroads_to_gue_tech_outside(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + def test_access_crossroads_to_hades_shore(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_crossroads_to_port_foozle(self) -> None: + self._go_to_crossroads() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE.value)) + + def test_access_crossroads_to_spell_lab_bridge(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_crossroads_to_subway_crossroads(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SUBWAY_TOKEN.value, + ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS.value)) + + def test_access_crossroads_to_subway_monastery(self) -> None: + self._go_to_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_dm_lair_to_crossroads(self) -> None: + self._go_to_dm_lair() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_dm_lair_to_dm_lair_interior(self) -> None: + self._go_to_dm_lair() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY.value, + ZorkGrandInquisitorItems.MEAD_LIGHT.value, + ZorkGrandInquisitorItems.ZIMDOR_SCROLL.value, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR.value)) + + def test_access_dm_lair_to_gue_tech_outside(self) -> None: + self._go_to_dm_lair() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + def test_access_dm_lair_to_hades_shore(self) -> None: + self._go_to_dm_lair() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_dm_lair_to_spell_lab_bridge(self) -> None: + self._go_to_dm_lair() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_dm_lair_to_subway_monastery(self) -> None: + self._go_to_dm_lair() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_dm_lair_interior_to_dm_lair(self) -> None: + self._go_to_dm_lair_interior() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_dm_lair_interior_to_walking_castle(self) -> None: + self._go_to_dm_lair_interior() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.WALKING_CASTLE.value)) + + self._obtain_obidil() + + self.collect_by_name(ZorkGrandInquisitorItems.HOTSPOT_BLINDS.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.WALKING_CASTLE.value)) + + def test_access_dm_lair_interior_to_white_house(self) -> None: + self._go_to_dm_lair_interior() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.WHITE_HOUSE.value)) + + self._obtain_yastard() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR.value, + ZorkGrandInquisitorItems.SPELL_NARWILE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.WHITE_HOUSE.value)) + + def test_access_dragon_archipelago_to_dragon_archipelago_dragon(self) -> None: + self._go_to_dragon_archipelago() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_GRIFF.value, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON.value)) + + def test_access_dragon_archipelago_to_hades_beyond_gates(self) -> None: + self._go_to_dragon_archipelago() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_BEYOND_GATES.value)) + + def test_access_dragon_archipelago_dragon_to_dragon_archipelago(self) -> None: + self._go_to_dragon_archipelago_dragon() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO.value)) + + def test_access_dragon_archipelago_dragon_to_endgame(self) -> None: + self._go_to_dragon_archipelago_dragon() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN.value, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS.value, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH.value, + ) + ) + + self._go_to_port_foozle_past_tavern() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4.value, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY.value, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS.value, + ) + ) + + self._go_to_white_house() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_BROG.value, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH.value, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG.value, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT.value, + ZorkGrandInquisitorItems.BROGS_PLANK.value, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + def test_access_gue_tech_to_crossroads(self) -> None: + self._go_to_gue_tech() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_gue_tech_to_gue_tech_hallway(self) -> None: + self._go_to_gue_tech() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_IGRAM.value, + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY.value)) + + def test_access_gue_tech_to_gue_tech_outside(self) -> None: + self._go_to_gue_tech() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_DOOR.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + def test_access_gue_tech_hallway_to_gue_tech(self) -> None: + self._go_to_gue_tech_hallway() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + def test_access_gue_tech_hallway_to_spell_lab_bridge(self) -> None: + self._go_to_gue_tech_hallway() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.STUDENT_ID.value, + ZorkGrandInquisitorItems.HOTSPOT_STUDENT_ID_MACHINE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_gue_tech_outside_to_crossroads(self) -> None: + self._go_to_gue_tech_outside() + + # Direct connection requires the map but indirect connection is free + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_gue_tech_outside_to_dm_lair(self) -> None: + self._go_to_gue_tech_outside() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_gue_tech_outside_to_gue_tech(self) -> None: + self._go_to_gue_tech_outside() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH.value)) + + def test_access_gue_tech_outside_to_hades_shore(self) -> None: + self._go_to_gue_tech_outside() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_gue_tech_outside_to_spell_lab_bridge(self) -> None: + self._go_to_gue_tech_outside() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_gue_tech_outside_to_subway_monastery(self) -> None: + self._go_to_gue_tech_outside() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_hades_to_hades_beyond_gates(self) -> None: + self._go_to_hades() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_BEYOND_GATES.value)) + + self._obtain_snavig() + + self.collect_by_name(ZorkGrandInquisitorItems.TOTEM_BROG.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_BEYOND_GATES.value)) + + def test_access_hades_to_hades_shore(self) -> None: + self._go_to_hades() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_hades_beyond_gates_to_dragon_archipelago(self) -> None: + self._go_to_hades_beyond_gates() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO.value)) + + self._obtain_yastard() + + self.collect_by_name(ZorkGrandInquisitorItems.SPELL_NARWILE.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO.value)) + + def test_access_hades_beyond_gates_to_hades(self) -> None: + self._go_to_hades_beyond_gates() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES.value)) + + def test_access_hades_shore_to_crossroads(self) -> None: + self._go_to_hades_shore() + + # Direct connection requires the map but indirect connection is free + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_hades_shore_to_dm_lair(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_hades_shore_to_gue_tech_outside(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + def test_access_hades_shore_to_hades(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER.value, + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS.value, + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES.value)) + + def test_access_hades_shore_to_spell_lab_bridge(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_hades_shore_to_subway_crossroads(self) -> None: + self._go_to_hades_shore() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS.value)) + + def test_access_hades_shore_to_subway_flood_control_dam(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value)) + + def test_access_hades_shore_to_subway_monastery(self) -> None: + self._go_to_hades_shore() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_monastery_to_hades_shore(self) -> None: + self._go_to_monastery() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_monastery_to_monastery_exhibit(self) -> None: + self._go_to_monastery() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT.value)) + + def test_access_monastery_to_subway_monastery(self) -> None: + self._go_to_monastery() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_monastery_exhibit_to_monastery(self) -> None: + self._go_to_monastery_exhibit() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY.value)) + + def test_access_monastery_exhibit_to_port_foozle_past(self) -> None: + self._go_to_monastery_exhibit() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST.value)) + + self._obtain_yastard() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER.value, + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT.value, + ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER.value, + ZorkGrandInquisitorItems.SPELL_NARWILE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST.value)) + + def test_access_port_foozle_to_crossroads(self) -> None: + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value, + ZorkGrandInquisitorItems.LANTERN.value, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value, + ZorkGrandInquisitorItems.ROPE.value, + ZorkGrandInquisitorItems.HOTSPOT_WELL.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_port_foozle_to_port_foozle_jacks_shop(self) -> None: + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value, + ZorkGrandInquisitorItems.LANTERN.value, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_JACKS_SHOP.value)) + + def test_access_port_foozle_jacks_shop_to_port_foozle(self) -> None: + self._go_to_port_foozle_jacks_shop() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE.value)) + + def test_access_port_foozle_past_to_monastery_exhibit(self) -> None: + self._go_to_port_foozle_past() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY_EXHIBIT.value)) + + def test_access_port_foozle_past_to_port_foozle_past_tavern(self) -> None: + self._go_to_port_foozle_past() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_LUCY.value, + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN.value)) + + def test_access_port_foozle_past_tavern_to_endgame(self) -> None: + self._go_to_port_foozle_past_tavern() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4.value, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY.value, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS.value, + ) + ) + + self._go_to_dragon_archipelago_dragon() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN.value, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS.value, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH.value, + ) + ) + + self._go_to_white_house() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_BROG.value, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH.value, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG.value, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT.value, + ZorkGrandInquisitorItems.BROGS_PLANK.value, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + def test_access_port_foozle_past_tavern_to_port_foozle_past(self) -> None: + self._go_to_port_foozle_past_tavern() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST.value)) + + def test_access_spell_lab_to_spell_lab_bridge(self) -> None: + self._go_to_spell_lab() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE.value)) + + def test_access_spell_lab_bridge_to_crossroads(self) -> None: + self._go_to_spell_lab_bridge() + + # Direct connection requires the map but indirect connection is free + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_spell_lab_bridge_to_dm_lair(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR.value)) + + def test_access_spell_lab_bridge_to_gue_tech_outside(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE.value)) + + def test_access_spell_lab_bridge_to_gue_tech_hallway(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY.value)) + + def test_access_spell_lab_bridge_to_hades_shore(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_spell_lab_bridge_to_spell_lab(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB.value)) + + self._go_to_subway_flood_control_dam() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS.value, + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE.value, + ZorkGrandInquisitorItems.SPELL_GOLGATEM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SPELL_LAB.value)) + + def test_access_spell_lab_bridge_to_subway_monastery(self) -> None: + self._go_to_spell_lab_bridge() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_subway_crossroads_to_crossroads(self) -> None: + self._go_to_subway_crossroads() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.CROSSROADS.value)) + + def test_access_subway_crossroads_to_hades_shore(self) -> None: + self._go_to_subway_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL.value, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_subway_crossroads_to_subway_flood_control_dam(self) -> None: + self._go_to_subway_crossroads() + + self.assertFalse( + self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value) + ) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL.value, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM.value, + ) + ) + + self.assertTrue( + self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value) + ) + + def test_access_subway_crossroads_to_subway_monastery(self) -> None: + self._go_to_subway_crossroads() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL.value, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_subway_flood_control_dam_to_hades_shore(self) -> None: + self._go_to_subway_flood_control_dam() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_subway_flood_control_dam_to_subway_crossroads(self) -> None: + self._go_to_subway_flood_control_dam() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS.value)) + + def test_access_subway_flood_control_dam_to_subway_monastery(self) -> None: + self._go_to_subway_flood_control_dam() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_MONASTERY.value)) + + def test_access_subway_monastery_to_hades_shore(self) -> None: + self._go_to_subway_monastery() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES.value) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.HADES_SHORE.value)) + + def test_access_subway_monastery_to_monastery(self) -> None: + self._go_to_subway_monastery() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.SPELL_GLORF.value, + ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.MONASTERY.value)) + + def test_access_subway_monastery_to_subway_crossroads(self) -> None: + self._go_to_subway_monastery() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_CROSSROADS.value)) + + def test_access_subway_monastery_to_subway_flood_control_dam(self) -> None: + self._go_to_subway_monastery() + + self.assertFalse( + self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value) + ) + + self.collect_by_name(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM.value) + + self.assertTrue( + self.can_reach_region(ZorkGrandInquisitorRegions.SUBWAY_FLOOD_CONTROL_DAM.value) + ) + + def test_access_walking_castle_to_dm_lair_interior(self) -> None: + self._go_to_walking_castle() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR.value)) + + def test_access_white_house_to_dm_lair_interior(self) -> None: + self._go_to_white_house() + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR.value)) + + def test_access_white_house_to_endgame(self) -> None: + self._go_to_white_house() + + self.assertFalse(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_BROG.value, + ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH.value, + ZorkGrandInquisitorItems.BROGS_GRUE_EGG.value, + ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT.value, + ZorkGrandInquisitorItems.BROGS_PLANK.value, + ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE.value, + ) + ) + + self._go_to_dragon_archipelago_dragon() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT.value, + ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN.value, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS.value, + ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH.value, + ) + ) + + self._go_to_port_foozle_past_tavern() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3.value, + ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4.value, + ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY.value, + ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS.value, + ) + ) + + self.assertTrue(self.can_reach_region(ZorkGrandInquisitorRegions.ENDGAME.value)) + + def _go_to_crossroads(self) -> None: + self.collect_by_name( + ( + ZorkGrandInquisitorItems.LANTERN.value, + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value, + ZorkGrandInquisitorItems.ROPE.value, + ZorkGrandInquisitorItems.HOTSPOT_WELL.value, + ) + ) + + def _go_to_dm_lair(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE.value, + ) + ) + + def _go_to_dm_lair_interior(self) -> None: + self._go_to_dm_lair() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY.value, + ZorkGrandInquisitorItems.MEAD_LIGHT.value, + ZorkGrandInquisitorItems.ZIMDOR_SCROLL.value, + ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH.value, + ) + ) + + def _go_to_dragon_archipelago(self) -> None: + self._go_to_hades_beyond_gates() + self._obtain_yastard() + + self.collect_by_name(ZorkGrandInquisitorItems.SPELL_NARWILE.value) + + def _go_to_dragon_archipelago_dragon(self) -> None: + self._go_to_dragon_archipelago() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_GRIFF.value, + ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW.value, + ) + ) + + def _go_to_gue_tech(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR.value, + ) + ) + + def _go_to_gue_tech_hallway(self) -> None: + self._go_to_gue_tech() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_IGRAM.value, + ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS.value, + ) + ) + + def _go_to_gue_tech_outside(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value, + ) + ) + + def _go_to_hades(self) -> None: + self._go_to_hades_shore() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER.value, + ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS.value, + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS.value, + ) + ) + + def _go_to_hades_beyond_gates(self) -> None: + self._go_to_hades() + self._obtain_snavig() + + self.collect_by_name(ZorkGrandInquisitorItems.TOTEM_BROG.value) + + def _go_to_hades_shore(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value, + ) + ) + + def _go_to_monastery(self) -> None: + self._go_to_subway_monastery() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.SPELL_GLORF.value, + ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT.value, + ) + ) + + def _go_to_monastery_exhibit(self) -> None: + self._go_to_monastery() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS.value, + ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH.value, + ) + ) + + def _go_to_port_foozle_jacks_shop(self) -> None: + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value, + ZorkGrandInquisitorItems.LANTERN.value, + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value, + ) + ) + + def _go_to_port_foozle_past(self) -> None: + self._go_to_monastery_exhibit() + + self._obtain_yastard() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER.value, + ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT.value, + ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER.value, + ZorkGrandInquisitorItems.SPELL_NARWILE.value, + ) + ) + + def _go_to_port_foozle_past_tavern(self) -> None: + self._go_to_port_foozle_past() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.TOTEM_LUCY.value, + ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR.value, + ) + ) + + def _go_to_spell_lab(self) -> None: + self._go_to_subway_flood_control_dam() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS.value, + ) + ) + + self._go_to_spell_lab_bridge() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE.value, + ZorkGrandInquisitorItems.SPELL_GOLGATEM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM.value, + ) + ) + + def _go_to_spell_lab_bridge(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value, + ) + ) + + def _go_to_subway_crossroads(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SUBWAY_TOKEN.value, + ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT.value, + ) + ) + + def _go_to_subway_flood_control_dam(self) -> None: + self._go_to_subway_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_KENDALL.value, + ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM.value, + ) + ) + + def _go_to_subway_monastery(self) -> None: + self._go_to_crossroads() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.MAP.value, + ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value, + ) + ) + + def _go_to_white_house(self) -> None: + self._go_to_dm_lair_interior() + + self._obtain_yastard() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR.value, + ZorkGrandInquisitorItems.SPELL_NARWILE.value, + ) + ) + + def _go_to_walking_castle(self) -> None: + self._go_to_dm_lair_interior() + + self._obtain_obidil() + self.collect_by_name(ZorkGrandInquisitorItems.HOTSPOT_BLINDS.value) + + def _obtain_obidil(self) -> None: + self._go_to_crossroads() + self._go_to_gue_tech() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS.value, + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT.value, + ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_DOORS.value, + ) + ) + + self._go_to_subway_flood_control_dam() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS.value, + ) + ) + + self._go_to_spell_lab_bridge() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE.value, + ZorkGrandInquisitorItems.SPELL_GOLGATEM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER.value, + ) + ) + + def _obtain_snavig(self) -> None: + self._go_to_crossroads() + self._go_to_dm_lair_interior() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS.value, + ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV.value, + ZorkGrandInquisitorItems.HOTSPOT_MIRROR.value, + ) + ) + + self._go_to_subway_flood_control_dam() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SPELL_REZROV.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS.value, + ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS.value, + ) + ) + + self._go_to_spell_lab_bridge() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.SWORD.value, + ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE.value, + ZorkGrandInquisitorItems.SPELL_GOLGATEM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM.value, + ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER.value, + ) + ) + + def _obtain_yastard(self) -> None: + self._go_to_crossroads() + self._go_to_dm_lair_interior() + + self.collect_by_name( + ( + ZorkGrandInquisitorItems.FLATHEADIA_FUDGE.value, + ZorkGrandInquisitorItems.HUNGUS_LARD.value, + ZorkGrandInquisitorItems.JAR_OF_HOTBUGS.value, + ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB.value, + ZorkGrandInquisitorItems.MOSS_OF_MAREILON.value, + ZorkGrandInquisitorItems.MUG.value, + ) + ) + + +class AccessTestLocations(ZorkGrandInquisitorTestBase): + options = { + "deathsanity": "true", + "start_with_hotspot_items": "false", + } + + def test_access_locations_requiring_brogs_flickering_torch(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.BROGS_FLICKERING_TORCH.value,)] + ) + + def test_access_locations_requiring_brogs_grue_egg(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.BROGS_GRUE_EGG.value,)] + ) + + def test_access_locations_requiring_brogs_plank(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.BROGS_PLANK.value,)] + ) + + def test_access_locations_requiring_flatheadia_fudge(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.FLATHEADIA_FUDGE.value,)] + ) + + def test_access_locations_requiring_griffs_air_pump(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.GRIFFS_AIR_PUMP.value,)] + ) + + def test_access_locations_requiring_griffs_dragon_tooth(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.GRIFFS_DRAGON_TOOTH.value,)] + ) + + def test_access_locations_requiring_griffs_inflatable_raft(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_RAFT.value,)] + ) + + def test_access_locations_requiring_griffs_inflatable_sea_captain(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.GRIFFS_INFLATABLE_SEA_CAPTAIN.value,)] + ) + + def test_access_locations_requiring_hammer(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BOING_BOING_BOING.value, + ZorkGrandInquisitorLocations.BONK.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.IN_CASE_OF_ADVENTURE.value, + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HAMMER.value,)] + ) + + def test_access_locations_requiring_hungus_lard(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HUNGUS_LARD.value,)] + ) + + def test_access_locations_requiring_jar_of_hotbugs(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.JAR_OF_HOTBUGS.value,)] + ) + + def test_access_locations_requiring_lantern(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LANTERN.value,)] + ) + + def test_access_locations_requiring_large_telegraph_hammer(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LARGE_TELEGRAPH_HAMMER.value,)] + ) + + def test_access_locations_requiring_lucys_playing_cards(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_1.value,)] + ) + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_2.value,)] + ) + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_3.value,)] + ) + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.LUCYS_PLAYING_CARD_4.value,)] + ) + + def test_access_locations_requiring_map(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.MAP.value,)] + ) + + def test_access_locations_requiring_mead_light(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.MEAD_LIGHT.value, + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO.value, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.MEAD_LIGHT.value,)] + ) + + def test_access_locations_requiring_moss_of_mareilon(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.MOSS_OF_MAREILON.value,)] + ) + + def test_access_locations_requiring_mug(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.MUG.value,)] + ) + + def test_access_locations_requiring_old_scratch_card(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_SOUL_TO_OLD_SCRATCH.value, + ZorkGrandInquisitorLocations.OLD_SCRATCH_WINNER.value, + ZorkGrandInquisitorEvents.ZORKMID_BILL_ACCESSIBLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.OLD_SCRATCH_CARD.value,)] + ) + + def test_access_locations_requiring_perma_suck_machine(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.SUCKING_ROCKS.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.PERMA_SUCK_MACHINE.value,)] + ) + + def test_access_locations_requiring_plastic_six_pack_holder(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE.value, + ZorkGrandInquisitorLocations.WHAT_ARE_YOU_STUPID.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER.value,)] + ) + + def test_access_locations_requiring_pouch_of_zorkmids(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER.value, + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.DUNCE_LOCKER.value, + ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE.value, + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO.value, + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL.value, + ZorkGrandInquisitorLocations.SOUVENIR.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS.value,)] + ) + + def test_access_locations_requiring_prozork_tablet(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.PROZORKED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.PROZORK_TABLET.value,)] + ) + + def test_access_locations_requiring_quelbee_honeycomb(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.QUELBEE_HONEYCOMB.value,)] + ) + + def test_access_locations_requiring_rope(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.ALARM_SYSTEM_IS_DOWN.value, + ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED.value, + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER.value, + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ZorkGrandInquisitorLocations.A_SMALLWAY.value, + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY.value, + ZorkGrandInquisitorLocations.BEBURTT_DEMYSTIFIED.value, + ZorkGrandInquisitorLocations.BETTER_SPELL_MANUFACTURING_IN_UNDER_10_MINUTES.value, + ZorkGrandInquisitorLocations.BOING_BOING_BOING.value, + ZorkGrandInquisitorLocations.BONK.value, + ZorkGrandInquisitorLocations.BRAVE_SOULS_WANTED.value, + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorLocations.CASTLE_WATCHING_A_FIELD_GUIDE.value, + ZorkGrandInquisitorLocations.CAVES_NOTES.value, + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.CRISIS_AVERTED.value, + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_CLIMBED_OUT_OF_THE_WELL.value, + ZorkGrandInquisitorLocations.DEATH_EATEN_BY_A_GRUE.value, + ZorkGrandInquisitorLocations.DEATH_JUMPED_IN_BOTTOMLESS_PIT.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD.value, + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DEATH_THROCKED_THE_GRASS.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY.value, + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON.value, + ZorkGrandInquisitorLocations.DEATH_ZORK_ROCKS_EXPLODED.value, + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER.value, + ZorkGrandInquisitorLocations.DESPERATELY_SEEKING_TUTOR.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.DUNCE_LOCKER.value, + ZorkGrandInquisitorLocations.EGGPLANTS.value, + ZorkGrandInquisitorLocations.EMERGENCY_MAGICATRONIC_MESSAGE.value, + ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP.value, + ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA.value, + ZorkGrandInquisitorLocations.FLOOD_CONTROL_DAM_3_THE_NOT_REMOTELY_BORING_TALE.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.FROBUARY_3_UNDERGROUNDHOG_DAY.value, + ZorkGrandInquisitorLocations.GETTING_SOME_CHANGE.value, + ZorkGrandInquisitorLocations.GUE_TECH_DEANS_LIST.value, + ZorkGrandInquisitorLocations.GUE_TECH_ENTRANCE_EXAM.value, + ZorkGrandInquisitorLocations.GUE_TECH_HEALTH_MEMO.value, + ZorkGrandInquisitorLocations.GUE_TECH_MAGEMEISTERS.value, + ZorkGrandInquisitorLocations.HAVE_A_HELL_OF_A_DAY.value, + ZorkGrandInquisitorLocations.HELLO_THIS_IS_SHONA_FROM_GURTH_PUBLISHING.value, + ZorkGrandInquisitorLocations.HEY_FREE_DIRT.value, + ZorkGrandInquisitorLocations.HI_MY_NAME_IS_DOUG.value, + ZorkGrandInquisitorLocations.HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING.value, + ZorkGrandInquisitorLocations.HOLD_ON_FOR_AN_IMPORTANT_MESSAGE.value, + ZorkGrandInquisitorLocations.HOW_TO_HYPNOTIZE_YOURSELF.value, + ZorkGrandInquisitorLocations.HOW_TO_WIN_AT_DOUBLE_FANUCCI.value, + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY.value, + ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.INTO_THE_FOLIAGE.value, + ZorkGrandInquisitorLocations.IN_CASE_OF_ADVENTURE.value, + ZorkGrandInquisitorLocations.IN_MAGIC_WE_TRUST.value, + ZorkGrandInquisitorLocations.INVISIBLE_FLOWERS.value, + ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE.value, + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.LIT_SUNFLOWERS.value, + ZorkGrandInquisitorLocations.MAGIC_FOREVER.value, + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorLocations.MAKE_LOVE_NOT_WAR.value, + ZorkGrandInquisitorLocations.MIKES_PANTS.value, + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorLocations.NATURAL_AND_SUPERNATURAL_CREATURES_OF_QUENDOR.value, + ZorkGrandInquisitorLocations.NO_BONDAGE.value, + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO.value, + ZorkGrandInquisitorLocations.NOTHIN_LIKE_A_GOOD_STOGIE.value, + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL.value, + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.PERMASEAL.value, + ZorkGrandInquisitorLocations.PLEASE_DONT_THROCK_THE_GRASS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.PROZORKED.value, + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG.value, + ZorkGrandInquisitorLocations.RESTOCKED_ON_GRUESDAY.value, + ZorkGrandInquisitorLocations.RIGHT_HELLO_YES_UH_THIS_IS_SNEFFLE.value, + ZorkGrandInquisitorLocations.RIGHT_UH_SORRY_ITS_ME_AGAIN_SNEFFLE.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorLocations.SOUVENIR.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.SUCKING_ROCKS.value, + ZorkGrandInquisitorLocations.TAMING_YOUR_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THATS_A_ROPE.value, + ZorkGrandInquisitorLocations.THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS.value, + ZorkGrandInquisitorLocations.THATS_STILL_A_ROPE.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.THE_UNDERGROUND_UNDERGROUND.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.TIME_TRAVEL_FOR_DUMMIES.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorLocations.UMBRELLA_FLOWERS.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.USELESS_BUT_FUN.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorLocations.VOYAGE_OF_CAPTAIN_ZAHAB.value, + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.WHITE_HOUSE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE.value, + ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF.value, + ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER.value, + ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS.value, + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY.value, + ZorkGrandInquisitorEvents.CHARON_CALLED.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR.value, + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ZorkGrandInquisitorEvents.ROPE_GLORFABLE.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.ROPE.value,)] + ) + + def test_access_locations_requiring_scroll_fragment_ans(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SCROLL_FRAGMENT_ANS.value,)] + ) + + def test_access_locations_requiring_scroll_fragment_giv(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SCROLL_FRAGMENT_GIV.value,)] + ) + + def test_access_locations_requiring_shovel(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.HEY_FREE_DIRT.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SHOVEL.value,)] + ) + + def test_access_locations_requiring_snapdragon(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BOING_BOING_BOING.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SNAPDRAGON.value,)] + ) + + def test_access_locations_requiring_student_id(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.STUDENT_ID.value,)] + ) + + def test_access_locations_requiring_subway_token(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.THE_UNDERGROUND_UNDERGROUND.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SUBWAY_TOKEN.value,)] + ) + + def test_access_locations_requiring_sword(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING.value, + ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE.value, + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.INTO_THE_FOLIAGE.value, + ZorkGrandInquisitorLocations.MAKE_LOVE_NOT_WAR.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.PERMASEAL.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS.value, + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SWORD.value,)] + ) + + def test_access_locations_requiring_zimdor_scroll(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO.value, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.ZIMDOR_SCROLL.value,)] + ) + + def test_access_locations_requiring_zork_rocks(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.ZORK_ROCKS.value,)] + ) + + def test_access_locations_requiring_hotspot_666_mailbox(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_666_MAILBOX.value,)] + ) + + def test_access_locations_requiring_hotspot_alpines_quandry_card_slots(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_ALPINES_QUANDRY_CARD_SLOTS.value,)] + ) + + def test_access_locations_requiring_hotspot_blank_scroll_box(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_BLANK_SCROLL_BOX.value,)] + ) + + def test_access_locations_requiring_hotspot_blinds(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER.value, + ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_BLINDS.value,)] + ) + + def test_access_locations_requiring_hotspot_candy_machine_buttons(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DUNCE_LOCKER.value, + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO.value, + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_BUTTONS.value,)] + ) + + def test_access_locations_requiring_hotspot_candy_machine_coin_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DUNCE_LOCKER.value, + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO.value, + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_COIN_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_candy_machine_vacuum_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.SUCKING_ROCKS.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CANDY_MACHINE_VACUUM_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_change_machine_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.GETTING_SOME_CHANGE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CHANGE_MACHINE_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_closet_door(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorLocations.WHITE_HOUSE_TIME_TUNNEL.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CLOSET_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_closing_the_time_tunnels_hammer_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_HAMMER_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_closing_the_time_tunnels_lever(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_CLOSING_THE_TIME_TUNNELS_LEVER.value,)] + ) + + def test_access_locations_requiring_hotspot_cooking_pot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_COOKING_POT.value,)] + ) + + def test_access_locations_requiring_hotspot_dented_locker(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CRISIS_AVERTED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DENTED_LOCKER.value,)] + ) + + def test_access_locations_requiring_hotspot_dirt_mound(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.HEY_FREE_DIRT.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DIRT_MOUND.value,)] + ) + + def test_access_locations_requiring_hotspot_dock_winch(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE.value, + ZorkGrandInquisitorLocations.NO_BONDAGE.value, + ZorkGrandInquisitorLocations.YOU_WANT_A_PIECE_OF_ME_DOCK_BOY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DOCK_WINCH.value,)] + ) + + def test_access_locations_requiring_hotspot_dragon_claw(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DRAGON_CLAW.value,)] + ) + + def test_access_locations_requiring_hotspot_dragon_nostrils(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DRAGON_NOSTRILS.value,)] + ) + + def test_access_locations_requiring_hotspot_dungeon_masters_lair_entrance(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.INTO_THE_FOLIAGE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_DUNGEON_MASTERS_LAIR_ENTRANCE.value,)] + ) + + def test_access_locations_requiring_hotspot_flood_control_buttons(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_BUTTONS.value,)] + ) + + def test_access_locations_requiring_hotspot_flood_control_doors(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_FLOOD_CONTROL_DOORS.value,)] + ) + + def test_access_locations_requiring_hotspot_frozen_treat_machine_coin_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_COIN_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_frozen_treat_machine_doors(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_FROZEN_TREAT_MACHINE_DOORS.value,)] + ) + + def test_access_locations_requiring_hotspot_glass_case(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.IN_CASE_OF_ADVENTURE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_GLASS_CASE.value,)] + ) + + def test_access_locations_requiring_hotspot_grand_inquisitor_doll(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.ARREST_THE_VANDAL.value, + ZorkGrandInquisitorLocations.DEATH_ARRESTED_WITH_JACK.value, + ZorkGrandInquisitorLocations.FIRE_FIRE.value, + ZorkGrandInquisitorLocations.PLANETFALL.value, + ZorkGrandInquisitorLocations.TALK_TO_ME_GRAND_INQUISITOR.value, + ZorkGrandInquisitorEvents.LANTERN_DALBOZ_ACCESSIBLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value,)] + ) + + def test_access_locations_requiring_hotspot_gue_tech_door(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_gue_tech_grass(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_THROCKED_THE_GRASS.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_GUE_TECH_GRASS.value,)] + ) + + def test_access_locations_requiring_hotspot_hades_phone_buttons(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER.value, + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.HAVE_A_HELL_OF_A_DAY.value, + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorEvents.CHARON_CALLED.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_BUTTONS.value,)] + ) + + def test_access_locations_requiring_hotspot_hades_phone_receiver(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER.value, + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.HAVE_A_HELL_OF_A_DAY.value, + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorEvents.CHARON_CALLED.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_HADES_PHONE_RECEIVER.value,)] + ) + + def test_access_locations_requiring_hotspot_harry(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_HARRY.value,)] + ) + + def test_access_locations_requiring_hotspot_harrys_ashtray(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.NOTHIN_LIKE_A_GOOD_STOGIE.value, + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_HARRYS_ASHTRAY.value,)] + ) + + def test_access_locations_requiring_hotspot_harrys_bird_bath(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO.value, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_HARRYS_BIRD_BATH.value,)] + ) + + def test_access_locations_requiring_hotspot_in_magic_we_trust_door(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.IN_MAGIC_WE_TRUST.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_IN_MAGIC_WE_TRUST_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_jacks_door(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.MEAD_LIGHT.value, + ZorkGrandInquisitorLocations.NO_AUTOGRAPHS.value, + ZorkGrandInquisitorLocations.THATS_A_ROPE.value, + ZorkGrandInquisitorLocations.WHAT_ARE_YOU_STUPID.value, + ZorkGrandInquisitorEvents.CIGAR_ACCESSIBLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_loudspeaker_volume_buttons(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.THATS_THE_SPIRIT.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_LOUDSPEAKER_VOLUME_BUTTONS.value,)] + ) + + def test_access_locations_requiring_hotspot_mailbox_door(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_mailbox_flag(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_MAILBOX_FLAG.value,)] + ) + + def test_access_locations_requiring_hotspot_mirror(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG.value, + ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_MIRROR.value,)] + ) + + def test_access_locations_requiring_hotspot_monastery_vent(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY.value, + ZorkGrandInquisitorLocations.HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING.value, + ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PERMASEAL.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_MONASTERY_VENT.value,)] + ) + + def test_access_locations_requiring_hotspot_mossy_grate(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_MOSSY_GRATE.value,)] + ) + + def test_access_locations_requiring_hotspot_port_foozle_past_tavern_door(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_PORT_FOOZLE_PAST_TAVERN_DOOR.value,)] + ) + + def test_access_locations_requiring_hotspot_purple_words(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_SMALLWAY.value, + ZorkGrandInquisitorLocations.CRISIS_AVERTED.value, + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_PURPLE_WORDS.value,)] + ) + + def test_access_locations_requiring_hotspot_quelbee_hive(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_QUELBEE_HIVE.value,)] + ) + + def test_access_locations_requiring_hotspot_rope_bridge(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_ROPE_BRIDGE.value,)] + ) + + def test_access_locations_requiring_hotspot_skull_cage(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SKULL_CAGE.value,)] + ) + + def test_access_locations_requiring_hotspot_snapdragon(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BONK.value, + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY.value, + ZorkGrandInquisitorLocations.PROZORKED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SNAPDRAGON.value,)] + ) + + def test_access_locations_requiring_hotspot_soda_machine_buttons(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_BUTTONS.value,)] + ) + + def test_access_locations_requiring_hotspot_soda_machine_coin_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SODA_MACHINE_COIN_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_souvenir_coin_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.SOUVENIR.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SOUVENIR_COIN_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_spell_checker(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SPELL_CHECKER.value,)] + ) + + def test_access_locations_requiring_hotspot_spell_lab_chasm(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SPELL_LAB_CHASM.value,)] + ) + + def test_access_locations_requiring_hotspot_spring_mushroom(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BOING_BOING_BOING.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SPRING_MUSHROOM.value,)] + ) + + def test_access_locations_requiring_hotspot_student_id_machine(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_STUDENT_ID_MACHINE.value,)] + ) + + def test_access_locations_requiring_hotspot_subway_token_slot(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.THE_UNDERGROUND_UNDERGROUND.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_SUBWAY_TOKEN_SLOT.value,)] + ) + + def test_access_locations_requiring_hotspot_tavern_fly(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_TAVERN_FLY.value,)] + ) + + def test_access_locations_requiring_hotspot_totemizer_switch(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_SWITCH.value,)] + ) + + def test_access_locations_requiring_hotspot_totemizer_wheels(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_TOTEMIZER_WHEELS.value,)] + ) + + def test_access_locations_requiring_hotspot_well(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.ALARM_SYSTEM_IS_DOWN.value, + ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED.value, + ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER.value, + ZorkGrandInquisitorLocations.A_LETTER_FROM_THE_WHITE_HOUSE.value, + ZorkGrandInquisitorLocations.A_SMALLWAY.value, + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY.value, + ZorkGrandInquisitorLocations.BEBURTT_DEMYSTIFIED.value, + ZorkGrandInquisitorLocations.BETTER_SPELL_MANUFACTURING_IN_UNDER_10_MINUTES.value, + ZorkGrandInquisitorLocations.BOING_BOING_BOING.value, + ZorkGrandInquisitorLocations.BONK.value, + ZorkGrandInquisitorLocations.BRAVE_SOULS_WANTED.value, + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorLocations.CASTLE_WATCHING_A_FIELD_GUIDE.value, + ZorkGrandInquisitorLocations.CAVES_NOTES.value, + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.CRISIS_AVERTED.value, + ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_CLIMBED_OUT_OF_THE_WELL.value, + ZorkGrandInquisitorLocations.DEATH_EATEN_BY_A_GRUE.value, + ZorkGrandInquisitorLocations.DEATH_JUMPED_IN_BOTTOMLESS_PIT.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD.value, + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DEATH_THROCKED_THE_GRASS.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED.value, + ZorkGrandInquisitorLocations.DEATH_TOTEMIZED_PERMANENTLY.value, + ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON.value, + ZorkGrandInquisitorLocations.DEATH_ZORK_ROCKS_EXPLODED.value, + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER.value, + ZorkGrandInquisitorLocations.DESPERATELY_SEEKING_TUTOR.value, + ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY.value, + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.DUNCE_LOCKER.value, + ZorkGrandInquisitorLocations.EGGPLANTS.value, + ZorkGrandInquisitorLocations.EMERGENCY_MAGICATRONIC_MESSAGE.value, + ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP.value, + ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA.value, + ZorkGrandInquisitorLocations.FLOOD_CONTROL_DAM_3_THE_NOT_REMOTELY_BORING_TALE.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.FROBUARY_3_UNDERGROUNDHOG_DAY.value, + ZorkGrandInquisitorLocations.GETTING_SOME_CHANGE.value, + ZorkGrandInquisitorLocations.GUE_TECH_DEANS_LIST.value, + ZorkGrandInquisitorLocations.GUE_TECH_ENTRANCE_EXAM.value, + ZorkGrandInquisitorLocations.GUE_TECH_HEALTH_MEMO.value, + ZorkGrandInquisitorLocations.GUE_TECH_MAGEMEISTERS.value, + ZorkGrandInquisitorLocations.HAVE_A_HELL_OF_A_DAY.value, + ZorkGrandInquisitorLocations.HELLO_THIS_IS_SHONA_FROM_GURTH_PUBLISHING.value, + ZorkGrandInquisitorLocations.HEY_FREE_DIRT.value, + ZorkGrandInquisitorLocations.HI_MY_NAME_IS_DOUG.value, + ZorkGrandInquisitorLocations.HMMM_INFORMATIVE_YET_DEEPLY_DISTURBING.value, + ZorkGrandInquisitorLocations.HOLD_ON_FOR_AN_IMPORTANT_MESSAGE.value, + ZorkGrandInquisitorLocations.HOW_TO_HYPNOTIZE_YOURSELF.value, + ZorkGrandInquisitorLocations.HOW_TO_WIN_AT_DOUBLE_FANUCCI.value, + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY.value, + ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.INTO_THE_FOLIAGE.value, + ZorkGrandInquisitorLocations.IN_CASE_OF_ADVENTURE.value, + ZorkGrandInquisitorLocations.IN_MAGIC_WE_TRUST.value, + ZorkGrandInquisitorLocations.INVISIBLE_FLOWERS.value, + ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE.value, + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.LIT_SUNFLOWERS.value, + ZorkGrandInquisitorLocations.MAGIC_FOREVER.value, + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorLocations.MAKE_LOVE_NOT_WAR.value, + ZorkGrandInquisitorLocations.MIKES_PANTS.value, + ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorLocations.NATURAL_AND_SUPERNATURAL_CREATURES_OF_QUENDOR.value, + ZorkGrandInquisitorLocations.NOOOOOOOOOOOOO.value, + ZorkGrandInquisitorLocations.NOTHIN_LIKE_A_GOOD_STOGIE.value, + ZorkGrandInquisitorLocations.NOW_YOU_LOOK_LIKE_US_WHICH_IS_AN_IMPROVEMENT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.OH_WOW_TALK_ABOUT_DEJA_VU.value, + ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL.value, + ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES.value, + ZorkGrandInquisitorLocations.PERMASEAL.value, + ZorkGrandInquisitorLocations.PLEASE_DONT_THROCK_THE_GRASS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.PROZORKED.value, + ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG.value, + ZorkGrandInquisitorLocations.RESTOCKED_ON_GRUESDAY.value, + ZorkGrandInquisitorLocations.RIGHT_HELLO_YES_UH_THIS_IS_SNEFFLE.value, + ZorkGrandInquisitorLocations.RIGHT_UH_SORRY_ITS_ME_AGAIN_SNEFFLE.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorLocations.SOUVENIR.value, + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.SUCKING_ROCKS.value, + ZorkGrandInquisitorLocations.TAMING_YOUR_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS.value, + ZorkGrandInquisitorLocations.THATS_STILL_A_ROPE.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.THE_UNDERGROUND_UNDERGROUND.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED.value, + ZorkGrandInquisitorLocations.TIME_TRAVEL_FOR_DUMMIES.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorLocations.UMBRELLA_FLOWERS.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.USELESS_BUT_FUN.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorLocations.VOYAGE_OF_CAPTAIN_ZAHAB.value, + ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.WHITE_HOUSE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE.value, + ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF.value, + ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER.value, + ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS.value, + ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY.value, + ZorkGrandInquisitorEvents.CHARON_CALLED.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ZorkGrandInquisitorEvents.DOOR_DRANK_MEAD.value, + ZorkGrandInquisitorEvents.DOOR_SMOKED_CIGAR.value, + ZorkGrandInquisitorEvents.DALBOZ_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.DUNCE_LOCKER_OPENABLE.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_OBIDIL.value, + ZorkGrandInquisitorEvents.HAS_REPAIRABLE_SNAVIG.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ZorkGrandInquisitorEvents.KNOWS_YASTARD.value, + ZorkGrandInquisitorEvents.ROPE_GLORFABLE.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_ACTIVATED.value, + ZorkGrandInquisitorEvents.ZORK_ROCKS_SUCKABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.HOTSPOT_WELL.value,)] + ) + + def test_access_locations_requiring_spell_glorf(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorEvents.ROPE_GLORFABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_GLORF.value,)] + ) + + def test_access_locations_requiring_spell_golgatem(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER.value, + ZorkGrandInquisitorLocations.I_LIKE_YOUR_STYLE.value, + ZorkGrandInquisitorLocations.IMBUE_BEBURTT.value, + ZorkGrandInquisitorLocations.OBIDIL_DRIED_UP.value, + ZorkGrandInquisitorLocations.SNAVIG_REPAIRED.value, + ZorkGrandInquisitorLocations.USELESS_BUT_FUN.value, + ZorkGrandInquisitorEvents.KNOWS_BEBURTT.value, + ZorkGrandInquisitorEvents.KNOWS_OBIDIL.value, + ZorkGrandInquisitorEvents.KNOWS_SNAVIG.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_GOLGATEM.value,)] + ) + + def test_access_locations_requiring_spell_igram(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.A_SMALLWAY.value, + ZorkGrandInquisitorLocations.CRISIS_AVERTED.value, + ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE.value, + ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA.value, + ZorkGrandInquisitorLocations.INVISIBLE_FLOWERS.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_IGRAM.value,)] + ) + + def test_access_locations_requiring_spell_kendall(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BEBURTT_DEMYSTIFIED.value, + ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_KENDALL.value,)] + ) + + def test_access_locations_requiring_spell_narwile(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorLocations.WHITE_HOUSE_TIME_TUNNEL.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ZorkGrandInquisitorEvents.WHITE_HOUSE_LETTER_MAILABLE.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_NARWILE.value,)] + ) + + def test_access_locations_requiring_spell_rezrov(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.IN_MAGIC_WE_TRUST.value, + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_REZROV.value,)] + ) + + def test_access_locations_requiring_spell_throck(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY.value, + ZorkGrandInquisitorLocations.DEATH_THROCKED_THE_GRASS.value, + ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON.value, + ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY.value, + ZorkGrandInquisitorLocations.LIT_SUNFLOWERS.value, + ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SPELL_THROCK.value,)] + ) + + def test_access_locations_requiring_subway_destination_flood_control_dam(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY.value, + ZorkGrandInquisitorLocations.FLOOD_CONTROL_DAM_3_THE_NOT_REMOTELY_BORING_TALE.value, + ZorkGrandInquisitorLocations.NATIONAL_TREASURE.value, + ZorkGrandInquisitorLocations.SOUVENIR.value, + ZorkGrandInquisitorLocations.USELESS_BUT_FUN.value, + ZorkGrandInquisitorEvents.DAM_DESTROYED.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_FLOOD_CONTROL_DAM.value,)] + ) + + def test_access_locations_requiring_subway_destination_hades(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_HADES.value,)] + ) + + def test_access_locations_requiring_subway_destination_monastery(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.SUBWAY_DESTINATION_MONASTERY.value,)] + ) + + def test_access_locations_requiring_teleporter_destination_dm_lair(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_DM_LAIR.value,)] + ) + + def test_access_locations_requiring_teleporter_destination_gue_tech(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_GUE_TECH.value,)] + ) + + def test_access_locations_requiring_teleporter_destination_hades(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_HADES.value,)] + ) + + def test_access_locations_requiring_teleporter_destination_monastery(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_MONASTERY.value,)] + ) + + def test_access_locations_requiring_teleporter_destination_spell_lab(self) -> None: + locations: List[str] = list() + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TELEPORTER_DESTINATION_SPELL_LAB.value,)] + ) + + def test_access_locations_requiring_totemizer_destination_hall_of_inquisition(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.CLOSING_THE_TIME_TUNNELS.value, + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.PORT_FOOZLE_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THE_ALCHEMICAL_DEBACLE.value, + ZorkGrandInquisitorLocations.THE_ENDLESS_FIRE.value, + ZorkGrandInquisitorLocations.THE_FLATHEADIAN_FUDGE_FIASCO.value, + ZorkGrandInquisitorLocations.THE_PERILS_OF_MAGIC.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_HALL_OF_INQUISITION.value,)] + ) + + def test_access_locations_requiring_totemizer_destination_straight_to_hell(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.STRAIGHT_TO_HELL.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TOTEMIZER_DESTINATION_STRAIGHT_TO_HELL.value,)] + ) + + def test_access_locations_requiring_totem_brog(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.BROG_DO_GOOD.value, + ZorkGrandInquisitorLocations.BROG_EAT_ROCKS.value, + ZorkGrandInquisitorLocations.BROG_KNOW_DUMB_THAT_DUMB.value, + ZorkGrandInquisitorLocations.BROG_MUCH_BETTER_AT_THIS_GAME.value, + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.OH_VERY_FUNNY_GUYS.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UH_OH_BROG_CANT_SWIM.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TOTEM_BROG.value,)] + ) + + def test_access_locations_requiring_totem_griff(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON.value, + ZorkGrandInquisitorLocations.DOOOOOOWN.value, + ZorkGrandInquisitorLocations.OH_DEAR_GOD_ITS_A_DRAGON.value, + ZorkGrandInquisitorLocations.THAR_SHE_BLOWS.value, + ZorkGrandInquisitorLocations.UUUUUP.value, + ZorkGrandInquisitorLocations.WE_DONT_SERVE_YOUR_KIND_HERE.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TOTEM_GRIFF.value,)] + ) + + def test_access_locations_requiring_totem_lucy(self) -> None: + locations: List[str] = [ + ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.DOWN.value, + ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER.value, + ZorkGrandInquisitorLocations.THIS_DOESNT_LOOK_ANYTHING_LIKE_THE_BROCHURE.value, + ZorkGrandInquisitorLocations.UP.value, + ZorkGrandInquisitorLocations.WE_GOT_A_HIGH_ROLLER.value, + ZorkGrandInquisitorEvents.VICTORY.value, + ] + + self.assertAccessDependency( + locations, [(ZorkGrandInquisitorItems.TOTEM_LUCY.value,)] + ) diff --git a/worlds/zork_grand_inquisitor/test/test_data_funcs.py b/worlds/zork_grand_inquisitor/test/test_data_funcs.py new file mode 100644 index 000000000000..9d8d5a4ba356 --- /dev/null +++ b/worlds/zork_grand_inquisitor/test/test_data_funcs.py @@ -0,0 +1,132 @@ +import unittest + +from ..data_funcs import location_access_rule_for, entrance_access_rule_for +from ..enums import ZorkGrandInquisitorLocations, ZorkGrandInquisitorRegions + + +class DataFuncsTest(unittest.TestCase): + def test_location_access_rule_for(self) -> None: + # No Requirements + self.assertEqual( + "lambda state: True", + location_access_rule_for(ZorkGrandInquisitorLocations.ALARM_SYSTEM_IS_DOWN, 1), + ) + + # Single Item Requirement + self.assertEqual( + 'lambda state: state.has("Sword", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.DONT_EVEN_START_WITH_US_SPARKY, 1), + ) + + self.assertEqual( + 'lambda state: state.has("Spell: NARWILE", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.DRAGON_ARCHIPELAGO_TIME_TUNNEL, 1), + ) + + # Single Event Requirement + self.assertEqual( + 'lambda state: state.has("Event: Knows OBIDIL", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.A_BIG_FAT_SASSY_2_HEADED_MONSTER, 1), + ) + + self.assertEqual( + 'lambda state: state.has("Event: Dunce Locker Openable", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.BETTER_SPELL_MANUFACTURING_IN_UNDER_10_MINUTES, 1), + ) + + # Multiple Item Requirements + self.assertEqual( + 'lambda state: state.has("Hotspot: Purple Words", 1) and state.has("Spell: IGRAM", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.A_SMALLWAY, 1), + ) + + self.assertEqual( + 'lambda state: state.has("Hotspot: Mossy Grate", 1) and state.has("Spell: THROCK", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.BEAUTIFUL_THATS_PLENTY, 1), + ) + + # Multiple Item Requirements OR + self.assertEqual( + 'lambda state: (state.has("Totem: Griff", 1) or state.has("Totem: Lucy", 1)) and state.has("Hotspot: Mailbox Door", 1) and state.has("Hotspot: Mailbox Flag", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.MAILED_IT_TO_HELL, 1), + ) + + # Multiple Mixed Requirements + self.assertEqual( + 'lambda state: state.has("Event: Cigar Accessible", 1) and state.has("Hotspot: Grand Inquisitor Doll", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.ARREST_THE_VANDAL, 1), + ) + + self.assertEqual( + 'lambda state: state.has("Sword", 1) and state.has("Event: Rope GLORFable", 1) and state.has("Hotspot: Monastery Vent", 1)', + location_access_rule_for(ZorkGrandInquisitorLocations.I_HOPE_YOU_CAN_CLIMB_UP_THERE, 1), + ) + + def test_entrance_access_rule_for(self) -> None: + # No Requirements + self.assertEqual( + "lambda state: True", + entrance_access_rule_for( + ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.PORT_FOOZLE, 1 + ), + ) + + self.assertEqual( + "lambda state: True", + entrance_access_rule_for( + ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.CROSSROADS, 1 + ), + ) + + # Single Requirement + self.assertEqual( + 'lambda state: (state.has("Map", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE, ZorkGrandInquisitorRegions.CROSSROADS, 1 + ), + ) + + self.assertEqual( + 'lambda state: (state.has("Map", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.HADES_SHORE, ZorkGrandInquisitorRegions.CROSSROADS, 1 + ), + ) + + # Multiple Requirements AND + self.assertEqual( + 'lambda state: (state.has("Spell: REZROV", 1) and state.has("Hotspot: In Magic We Trust Door", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.GUE_TECH, 1 + ), + ) + + self.assertEqual( + 'lambda state: (state.has("Event: Door Smoked Cigar", 1) and state.has("Event: Door Drank Mead", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.DM_LAIR, ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, 1 + ), + ) + + self.assertEqual( + 'lambda state: (state.has("Hotspot: Closet Door", 1) and state.has("Spell: NARWILE", 1) and state.has("Event: Knows YASTARD", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR, ZorkGrandInquisitorRegions.WHITE_HOUSE, 1 + ), + ) + + # Multiple Requirements AND + OR + self.assertEqual( + 'lambda state: (state.has("Sword", 1) and state.has("Hotspot: Dungeon Master\'s Lair Entrance", 1)) or (state.has("Map", 1) and state.has("Teleporter Destination: Dungeon Master\'s Lair", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.CROSSROADS, ZorkGrandInquisitorRegions.DM_LAIR, 1 + ), + ) + + # Multiple Requirements Regions + self.assertEqual( + 'lambda state: (state.has("Griff\'s Air Pump", 1) and state.has("Griff\'s Inflatable Raft", 1) and state.has("Griff\'s Inflatable Sea Captain", 1) and state.has("Hotspot: Dragon Nostrils", 1) and state.has("Griff\'s Dragon Tooth", 1) and state.can_reach("Port Foozle Past - Tavern", "Region", 1) and state.has("Lucy\'s Playing Card: 1 Pip", 1) and state.has("Lucy\'s Playing Card: 2 Pips", 1) and state.has("Lucy\'s Playing Card: 3 Pips", 1) and state.has("Lucy\'s Playing Card: 4 Pips", 1) and state.has("Hotspot: Tavern Fly", 1) and state.has("Hotspot: Alpine\'s Quandry Card Slots", 1) and state.can_reach("White House", "Region", 1) and state.has("Totem: Brog", 1) and state.has("Brog\'s Flickering Torch", 1) and state.has("Brog\'s Grue Egg", 1) and state.has("Hotspot: Cooking Pot", 1) and state.has("Brog\'s Plank", 1) and state.has("Hotspot: Skull Cage", 1))', + entrance_access_rule_for( + ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON, ZorkGrandInquisitorRegions.ENDGAME, 1 + ), + ) diff --git a/worlds/zork_grand_inquisitor/test/test_locations.py b/worlds/zork_grand_inquisitor/test/test_locations.py new file mode 100644 index 000000000000..fa576dd510dc --- /dev/null +++ b/worlds/zork_grand_inquisitor/test/test_locations.py @@ -0,0 +1,49 @@ +from typing import Dict, Set + +from . import ZorkGrandInquisitorTestBase + +from ..data_funcs import location_names_to_location, locations_with_tag +from ..enums import ZorkGrandInquisitorLocations, ZorkGrandInquisitorTags + + +class LocationsTestNoDeathsanity(ZorkGrandInquisitorTestBase): + options = { + "deathsanity": "false", + } + + def test_correct_locations_exist(self) -> None: + expected_locations: Set[ZorkGrandInquisitorLocations] = locations_with_tag( + ZorkGrandInquisitorTags.CORE + ) + + self._assert_expected_locations_exist(expected_locations) + + def _assert_expected_locations_exist(self, expected_locations: Set[ZorkGrandInquisitorLocations]) -> None: + location_name_to_location: Dict[str, ZorkGrandInquisitorLocations] = location_names_to_location() + + for location_object in self.multiworld.get_locations(1): + location: ZorkGrandInquisitorLocations = location_name_to_location.get( + location_object.name + ) + + if location is None: + continue + + self.assertIn(location, expected_locations) + + expected_locations.remove(location) + + self.assertEqual(0, len(expected_locations)) + + +class LocationsTestDeathsanity(LocationsTestNoDeathsanity): + options = { + "deathsanity": "true", + } + + def test_correct_locations_exist(self) -> None: + expected_locations: Set[ZorkGrandInquisitorLocations] = ( + locations_with_tag(ZorkGrandInquisitorTags.CORE) | locations_with_tag(ZorkGrandInquisitorTags.DEATHSANITY) + ) + + self._assert_expected_locations_exist(expected_locations) diff --git a/worlds/zork_grand_inquisitor/world.py b/worlds/zork_grand_inquisitor/world.py new file mode 100644 index 000000000000..2dc634e47d8d --- /dev/null +++ b/worlds/zork_grand_inquisitor/world.py @@ -0,0 +1,206 @@ +from typing import Any, Dict, List, Set, Tuple + +from BaseClasses import Item, ItemClassification, Location, Region, Tutorial + +from worlds.AutoWorld import WebWorld, World + +from .data.item_data import item_data, ZorkGrandInquisitorItemData +from .data.location_data import location_data, ZorkGrandInquisitorLocationData +from .data.region_data import region_data + +from .data_funcs import ( + item_names_to_id, + item_names_to_item, + location_names_to_id, + item_groups, + items_with_tag, + location_groups, + locations_by_region, + location_access_rule_for, + entrance_access_rule_for, +) + +from .enums import ( + ZorkGrandInquisitorEvents, + ZorkGrandInquisitorItems, + ZorkGrandInquisitorLocations, + ZorkGrandInquisitorRegions, + ZorkGrandInquisitorTags, +) + +from .options import ZorkGrandInquisitorOptions + + +class ZorkGrandInquisitorItem(Item): + game = "Zork Grand Inquisitor" + + +class ZorkGrandInquisitorLocation(Location): + game = "Zork Grand Inquisitor" + + +class ZorkGrandInquisitorWebWorld(WebWorld): + theme: str = "stone" + + tutorials: List[Tutorial] = [ + Tutorial( + "Multiworld Setup Guide", + "A guide to setting up the Zork Grand Inquisitor randomizer connected to an Archipelago Multiworld", + "English", + "setup_en.md", + "setup/en", + ["Serpent.AI"], + ) + ] + + +class ZorkGrandInquisitorWorld(World): + """ + Zork: Grand Inquisitor is a 1997 point-and-click adventure game for PC. + Magic has been banned from the great Underground Empire of Zork. By edict of the Grand Inquisitor Mir Yannick, the + Empire has been sealed off and the practice of mystic arts declared punishable by "Totemization" (a very bad thing). + The only way to restore magic to the kingdom is to find three hidden artifacts: The Coconut of Quendor, The Cube of + Foundation, and The Skull of Yoruk. + """ + + options_dataclass = ZorkGrandInquisitorOptions + options: ZorkGrandInquisitorOptions + + game = "Zork Grand Inquisitor" + + item_name_to_id = item_names_to_id() + location_name_to_id = location_names_to_id() + + item_name_groups = item_groups() + location_name_groups = location_groups() + + required_client_version: Tuple[int, int, int] = (0, 4, 4) + + web = ZorkGrandInquisitorWebWorld() + + item_name_to_item: Dict[str, ZorkGrandInquisitorItems] = item_names_to_item() + + def create_regions(self) -> None: + deathsanity: bool = bool(self.options.deathsanity) + + region_mapping: Dict[ZorkGrandInquisitorRegions, Region] = dict() + + region_enum_item: ZorkGrandInquisitorRegions + for region_enum_item in region_data.keys(): + region_mapping[region_enum_item] = Region(region_enum_item.value, self.player, self.multiworld) + + region_locations_mapping: Dict[ZorkGrandInquisitorRegions, Set[ZorkGrandInquisitorLocations]] + region_locations_mapping = locations_by_region(include_deathsanity=deathsanity) + + region_enum_item: ZorkGrandInquisitorRegions + region: Region + for region_enum_item, region in region_mapping.items(): + regions_locations: Set[ZorkGrandInquisitorLocations] = region_locations_mapping[region_enum_item] + + # Locations + location_enum_item: ZorkGrandInquisitorLocations + for location_enum_item in regions_locations: + data: ZorkGrandInquisitorLocationData = location_data[location_enum_item] + + location: ZorkGrandInquisitorLocation = ZorkGrandInquisitorLocation( + self.player, + location_enum_item.value, + data.archipelago_id, + region_mapping[data.region], + ) + + location.event = isinstance(location_enum_item, ZorkGrandInquisitorEvents) + + if location.event: + location.place_locked_item( + ZorkGrandInquisitorItem( + data.event_item_name, + ItemClassification.progression, + None, + self.player, + ) + ) + + location_access_rule: str = location_access_rule_for(location_enum_item, self.player) + + if location_access_rule != "lambda state: True": + location.access_rule = eval(location_access_rule) + + region.locations.append(location) + + # Connections + region_exit: ZorkGrandInquisitorRegions + for region_exit in region_data[region_enum_item].exits or tuple(): + entrance_access_rule: str = entrance_access_rule_for(region_enum_item, region_exit, self.player) + + if entrance_access_rule == "lambda state: True": + region.connect(region_mapping[region_exit]) + else: + region.connect(region_mapping[region_exit], rule=eval(entrance_access_rule)) + + self.multiworld.regions.append(region) + + def create_items(self) -> None: + quick_port_foozle: bool = bool(self.options.quick_port_foozle) + start_with_hotspot_items: bool = bool(self.options.start_with_hotspot_items) + + item_pool: List[ZorkGrandInquisitorItem] = list() + + item: ZorkGrandInquisitorItems + data: ZorkGrandInquisitorItemData + for item, data in item_data.items(): + tags: Tuple[ZorkGrandInquisitorTags, ...] = data.tags or tuple() + + if ZorkGrandInquisitorTags.FILLER in tags: + continue + elif ZorkGrandInquisitorTags.HOTSPOT in tags and start_with_hotspot_items: + continue + + item_pool.append(self.create_item(item.value)) + + total_locations: int = len(self.multiworld.get_unfilled_locations(self.player)) + item_pool += [self.create_filler() for _ in range(total_locations - len(item_pool))] + + self.multiworld.itempool += item_pool + + if quick_port_foozle: + self.multiworld.early_items[self.player][ZorkGrandInquisitorItems.ROPE.value] = 1 + self.multiworld.early_items[self.player][ZorkGrandInquisitorItems.LANTERN.value] = 1 + + if not start_with_hotspot_items: + self.multiworld.early_items[self.player][ZorkGrandInquisitorItems.HOTSPOT_WELL.value] = 1 + self.multiworld.early_items[self.player][ZorkGrandInquisitorItems.HOTSPOT_JACKS_DOOR.value] = 1 + + self.multiworld.early_items[self.player][ + ZorkGrandInquisitorItems.HOTSPOT_GRAND_INQUISITOR_DOLL.value + ] = 1 + + if start_with_hotspot_items: + item: ZorkGrandInquisitorItems + for item in items_with_tag(ZorkGrandInquisitorTags.HOTSPOT): + self.multiworld.push_precollected(self.create_item(item.value)) + + def create_item(self, name: str) -> ZorkGrandInquisitorItem: + data: ZorkGrandInquisitorItemData = item_data[self.item_name_to_item[name]] + + return ZorkGrandInquisitorItem( + name, + data.classification, + data.archipelago_id, + self.player, + ) + + def generate_basic(self) -> None: + self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player) + + def fill_slot_data(self) -> Dict[str, Any]: + return self.options.as_dict( + "goal", + "quick_port_foozle", + "start_with_hotspot_items", + "deathsanity", + "grant_missable_location_checks", + ) + + def get_filler_item_name(self) -> str: + return self.random.choice(list(self.item_name_groups["Filler"])) From e6198585c8860f07b07b76d157a711555f16a636 Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Fri, 15 Mar 2024 12:52:05 -0400 Subject: [PATCH 14/22] TUNIC: Implement support for connection plando (#2864) --- worlds/tunic/__init__.py | 2 +- worlds/tunic/docs/en_TUNIC.md | 20 ++- worlds/tunic/er_data.py | 6 - worlds/tunic/er_rules.py | 13 -- worlds/tunic/er_scripts.py | 218 +++++++++++++++++-------------- worlds/tunic/options.py | 10 +- worlds/tunic/test/test_access.py | 2 +- 7 files changed, 150 insertions(+), 121 deletions(-) diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py index b10ccd43af59..c4b1bbec8ea3 100644 --- a/worlds/tunic/__init__.py +++ b/worlds/tunic/__init__.py @@ -226,7 +226,7 @@ def fill_slot_data(self) -> Dict[str, Any]: "logic_rules": self.options.logic_rules.value, "lanternless": self.options.lanternless.value, "maskless": self.options.maskless.value, - "entrance_rando": self.options.entrance_rando.value, + "entrance_rando": bool(self.options.entrance_rando.value), "Hexagon Quest Prayer": self.ability_unlocks["Pages 24-25 (Prayer)"], "Hexagon Quest Holy Cross": self.ability_unlocks["Pages 42-43 (Holy Cross)"], "Hexagon Quest Icebolt": self.ability_unlocks["Pages 52-53 (Icebolt)"], diff --git a/worlds/tunic/docs/en_TUNIC.md b/worlds/tunic/docs/en_TUNIC.md index 1204f2ef4ca2..5921d0ed092d 100644 --- a/worlds/tunic/docs/en_TUNIC.md +++ b/worlds/tunic/docs/en_TUNIC.md @@ -67,4 +67,22 @@ For the Entrance Randomizer: Bombs, consumables (non-bomb ones), weapons, melee weapons (stick and sword), keys, hexagons, offerings, hero relics, cards, golden treasures, money, pages, and abilities (the three ability pages). There are also a few groups being used for singular items: laurels, orb, dagger, magic rod, holy cross, prayer, icebolt, and progressive sword. ## What location groups are there? -Holy cross (for all holy cross checks), fairies (for the two fairy checks), well (for the coin well checks), and shop. Additionally, for checks that do not fall into the above categories, the name of the region is the name of the location group. \ No newline at end of file +Holy cross (for all holy cross checks), fairies (for the two fairy checks), well (for the coin well checks), and shop. Additionally, for checks that do not fall into the above categories, the name of the region is the name of the location group. + +## Is Connection Plando supported? +Yes. The host needs to enable it in their `host.yaml`, and the player's yaml needs to contain a plando_connections block. +Example: +``` +plando_connections: + - entrance: Stick House Entrance + exit: Stick House Exit + - entrance: Special Shop Exit + exit: Stairs to Top of the Mountain +``` +Notes: +- The Entrance Randomizer option must be enabled for it to work. +- The `direction` field is not supported. Connections are always coupled. +- For a list of entrance names, check `er_data.py` in the TUNIC world folder or generate a game with the Entrance Randomizer option enabled and check the spoiler log. +- There is no limit to the number of Shops hard-coded into place. +- If you have more than one shop in a scene, you may be wrong warped when exiting a shop. +- If you have a shop in every scene, and you have an odd number of shops, it will error out. diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py index 7678d77fe034..8d8db426f67d 100644 --- a/worlds/tunic/er_data.py +++ b/worlds/tunic/er_data.py @@ -682,12 +682,6 @@ class Hint(IntEnum): "Hero Relic - Library": RegionInfo("RelicVoid", dead_end=DeadEnd.all_cats, hint=Hint.region), "Hero Relic - Swamp": RegionInfo("RelicVoid", dead_end=DeadEnd.all_cats, hint=Hint.region), "Purgatory": RegionInfo("Purgatory"), - "Shop Entrance 1": RegionInfo("Shop", dead_end=DeadEnd.all_cats), - "Shop Entrance 2": RegionInfo("Shop", dead_end=DeadEnd.all_cats), - "Shop Entrance 3": RegionInfo("Shop", dead_end=DeadEnd.all_cats), - "Shop Entrance 4": RegionInfo("Shop", dead_end=DeadEnd.all_cats), - "Shop Entrance 5": RegionInfo("Shop", dead_end=DeadEnd.all_cats), - "Shop Entrance 6": RegionInfo("Shop", dead_end=DeadEnd.all_cats), "Shop": RegionInfo("Shop", dead_end=DeadEnd.all_cats), "Spirit Arena": RegionInfo("Spirit Arena", dead_end=DeadEnd.all_cats, hint=Hint.region), "Spirit Arena Victory": RegionInfo("Spirit Arena", dead_end=DeadEnd.all_cats) diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py index a7d0543c3f17..fec6635422ac 100644 --- a/worlds/tunic/er_rules.py +++ b/worlds/tunic/er_rules.py @@ -619,19 +619,6 @@ def set_er_region_rules(world: "TunicWorld", ability_unlocks: Dict[str, int], re connecting_region=regions["Far Shore"]) # Misc - regions["Shop Entrance 1"].connect( - connecting_region=regions["Shop"]) - regions["Shop Entrance 2"].connect( - connecting_region=regions["Shop"]) - regions["Shop Entrance 3"].connect( - connecting_region=regions["Shop"]) - regions["Shop Entrance 4"].connect( - connecting_region=regions["Shop"]) - regions["Shop Entrance 5"].connect( - connecting_region=regions["Shop"]) - regions["Shop Entrance 6"].connect( - connecting_region=regions["Shop"]) - regions["Spirit Arena"].connect( connecting_region=regions["Spirit Arena Victory"], rule=lambda state: (state.has(gold_hexagon, player, world.options.hexagon_goal.value) if diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py index d2b854f5df0e..291cd7b3310e 100644 --- a/worlds/tunic/er_scripts.py +++ b/worlds/tunic/er_scripts.py @@ -5,6 +5,7 @@ dependent_regions_restricted, dependent_regions_nmg, dependent_regions_ur from .er_rules import set_er_region_rules from worlds.generic import PlandoConnection +from random import Random if TYPE_CHECKING: from . import TunicWorld @@ -185,9 +186,14 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: portal_pairs: Dict[Portal, Portal] = {} dead_ends: List[Portal] = [] two_plus: List[Portal] = [] - plando_connections: List[PlandoConnection] = [] - fixed_shop = False logic_rules = world.options.logic_rules.value + player_name = world.multiworld.get_player_name(world.player) + + shop_scenes: Set[str] = set() + shop_count = 6 + if world.options.fixed_shop.value: + shop_count = 1 + shop_scenes.add("Overworld Redux") if not logic_rules: dependent_regions = dependent_regions_restricted @@ -215,19 +221,17 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: start_region = "Overworld" connected_regions.update(add_dependent_regions(start_region, logic_rules)) + plando_connections = world.multiworld.plando_connections[world.player] + # universal tracker support stuff, don't need to care about region dependency if hasattr(world.multiworld, "re_gen_passthrough"): if "TUNIC" in world.multiworld.re_gen_passthrough: + plando_connections.clear() # universal tracker stuff, won't do anything in normal gen for portal1, portal2 in world.multiworld.re_gen_passthrough["TUNIC"]["Entrance Rando"].items(): portal_name1 = "" portal_name2 = "" - # skip this if 10 fairies laurels location is on, it can be handled normally - if portal1 == "Overworld Redux, Waterfall_" and portal2 == "Waterfall, Overworld Redux_" \ - and world.options.laurels_location == "10_fairies": - continue - for portal in portal_mapping: if portal.scene_destination() == portal1: portal_name1 = portal.name @@ -240,9 +244,78 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: portal_name2 = "Shop Portal" plando_connections.append(PlandoConnection(portal_name1, portal_name2, "both")) + non_dead_end_regions = set() + for region_name, region_info in tunic_er_regions.items(): + if not region_info.dead_end: + non_dead_end_regions.add(region_name) + elif region_info.dead_end == 2 and logic_rules: + non_dead_end_regions.add(region_name) + if plando_connections: - portal_pairs, dependent_regions, dead_ends, two_plus = \ - create_plando_connections(plando_connections, dependent_regions, dead_ends, two_plus) + for connection in plando_connections: + p_entrance = connection.entrance + p_exit = connection.exit + + if p_entrance.startswith("Shop"): + p_entrance = p_exit + p_exit = "Shop Portal" + + portal1 = None + portal2 = None + + # search two_plus for both at once + for portal in two_plus: + if p_entrance == portal.name: + portal1 = portal + if p_exit == portal.name: + portal2 = portal + + # search dead_ends individually since we can't really remove items from two_plus during the loop + if not portal1: + for portal in dead_ends: + if p_entrance == portal.name: + portal1 = portal + break + if not portal1: + raise Exception(f"Could not find entrance named {p_entrance} for " + f"plando connections in {player_name}'s YAML.") + dead_ends.remove(portal1) + else: + two_plus.remove(portal1) + + if not portal2: + for portal in dead_ends: + if p_exit == portal.name: + portal2 = portal + break + if p_exit in ["Shop Portal", "Shop"]: + portal2 = Portal(name="Shop Portal", region=f"Shop", + destination="Previous Region_") + shop_count -= 1 + if shop_count < 0: + shop_count += 2 + for p in portal_mapping: + if p.name == p_entrance: + shop_scenes.add(p.scene()) + break + else: + if not portal2: + raise Exception(f"Could not find entrance named {p_exit} for " + f"plando connections in {player_name}'s YAML.") + dead_ends.remove(portal2) + else: + two_plus.remove(portal2) + + portal_pairs[portal1] = portal2 + + # update dependent regions based on the plando'd connections, to ensure the portals connect well, logically + for origins, destinations in dependent_regions.items(): + if portal1.region in origins: + if portal2.region in non_dead_end_regions: + destinations.append(portal2.region) + if portal2.region in origins: + if portal1.region in non_dead_end_regions: + destinations.append(portal1.region) # if we have plando connections, our connected regions may change somewhat while True: @@ -255,7 +328,7 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: # need to plando fairy cave, or it could end up laurels locked # fix this later to be random after adding some item logic to dependent regions - if world.options.laurels_location == "10_fairies": + if world.options.laurels_location == "10_fairies" and not hasattr(world.multiworld, "re_gen_passthrough"): portal1 = None portal2 = None for portal in two_plus: @@ -266,41 +339,59 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: if portal.scene_destination() == "Waterfall, Overworld Redux_": portal2 = portal break + if not portal1: + raise Exception(f"Failed to do Laurels Location at 10 Fairies option. " + f"Did {player_name} plando connection the Secret Gathering Place Entrance?") + if not portal2: + raise Exception(f"Failed to do Laurels Location at 10 Fairies option. " + f"Did {player_name} plando connection the Secret Gathering Place Exit?") portal_pairs[portal1] = portal2 two_plus.remove(portal1) dead_ends.remove(portal2) if world.options.fixed_shop and not hasattr(world.multiworld, "re_gen_passthrough"): - fixed_shop = True portal1 = None for portal in two_plus: if portal.scene_destination() == "Overworld Redux, Windmill_": portal1 = portal break - portal2 = Portal(name="Shop Portal", region=f"Shop Entrance 2", destination="Previous Region_") + portal2 = Portal(name="Shop Portal", region="Shop", destination="Previous Region_") + if not portal1: + raise Exception(f"Failed to do Fixed Shop option. " + f"Did {player_name} plando connection the Windmill Shop entrance?") portal_pairs[portal1] = portal2 two_plus.remove(portal1) + random_object: Random = world.random + if world.options.entrance_rando.value != 1: + random_object = Random(world.options.entrance_rando.value) # we want to start by making sure every region is accessible - non_dead_end_regions = set() - for region_name, region_info in tunic_er_regions.items(): - if not region_info.dead_end: - non_dead_end_regions.add(region_name) - elif region_info.dead_end == 2 and logic_rules: - non_dead_end_regions.add(region_name) - - world.random.shuffle(two_plus) + random_object.shuffle(two_plus) check_success = 0 portal1 = None portal2 = None + previous_conn_num = 0 + fail_count = 0 while len(connected_regions) < len(non_dead_end_regions): + # if the connected regions length stays unchanged for too long, it's stuck in a loop + # should, hopefully, only ever occur if someone plandos connections poorly + if hasattr(world.multiworld, "re_gen_passthrough"): + break + if previous_conn_num == len(connected_regions): + fail_count += 1 + if fail_count >= 500: + raise Exception(f"Failed to pair regions. Check plando connections for {player_name} for loops.") + else: + fail_count = 0 + previous_conn_num = len(connected_regions) + # find a portal in an inaccessible region if check_success == 0: for portal in two_plus: if portal.region in connected_regions: # if there's risk of self-locking, start over if gate_before_switch(portal, two_plus): - world.random.shuffle(two_plus) + random_object.shuffle(two_plus) break portal1 = portal two_plus.remove(portal) @@ -313,7 +404,7 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: if portal.region not in connected_regions: # if there's risk of self-locking, shuffle and try again if gate_before_switch(portal, two_plus): - world.random.shuffle(two_plus) + random_object.shuffle(two_plus) break portal2 = portal two_plus.remove(portal) @@ -325,16 +416,7 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: connected_regions.update(add_dependent_regions(portal2.region, logic_rules)) portal_pairs[portal1] = portal2 check_success = 0 - world.random.shuffle(two_plus) - - # add 6 shops, connect them to unique scenes - # this is due to a limitation in Tunic -- you wrong warp if there's multiple shops - shop_scenes: Set[str] = set() - shop_count = 6 - - if fixed_shop: - shop_count = 1 - shop_scenes.add("Overworld Redux") + random_object.shuffle(two_plus) # for universal tracker, we want to skip shop gen if hasattr(world.multiworld, "re_gen_passthrough"): @@ -350,13 +432,15 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: two_plus.remove(portal) break if portal1 is None: - raise Exception("Too many shops in the pool, or something else went wrong") - portal2 = Portal(name="Shop Portal", region=f"Shop Entrance {i + 1}", destination="Previous Region_") + raise Exception("Too many shops in the pool, or something else went wrong.") + portal2 = Portal(name="Shop Portal", region="Shop", destination="Previous Region_") portal_pairs[portal1] = portal2 # connect dead ends to random non-dead ends # none of the key events are in dead ends, so we don't need to do gate_before_switch while len(dead_ends) > 0: + if hasattr(world.multiworld, "re_gen_passthrough"): + break portal1 = two_plus.pop() portal2 = dead_ends.pop() portal_pairs[portal1] = portal2 @@ -364,6 +448,8 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: # then randomly connect the remaining portals to each other # every region is accessible, so gate_before_switch is not necessary while len(two_plus) > 1: + if hasattr(world.multiworld, "re_gen_passthrough"): + break portal1 = two_plus.pop() portal2 = two_plus.pop() portal_pairs[portal1] = portal2 @@ -381,7 +467,7 @@ def create_randomized_entrances(portal_pairs: Dict[Portal, Portal], regions: Dic region2 = regions[portal2.region] region1.connect(region2, f"{portal1.name} -> {portal2.name}") # prevent the logic from thinking you can get to any shop-connected region from the shop - if portal2.name != "Shop": + if not portal2.name.startswith("Shop"): region2.connect(region1, f"{portal2.name} -> {portal1.name}") @@ -507,65 +593,3 @@ def gate_before_switch(check_portal: Portal, two_plus: List[Portal]) -> bool: # false means you're good to place the portal return False - - -# this is for making the connections themselves -def create_plando_connections(plando_connections: List[PlandoConnection], - dependent_regions: Dict[Tuple[str, ...], List[str]], dead_ends: List[Portal], - two_plus: List[Portal]) \ - -> Tuple[Dict[Portal, Portal], Dict[Tuple[str, ...], List[str]], List[Portal], List[Portal]]: - - portal_pairs: Dict[Portal, Portal] = {} - shop_num = 1 - for connection in plando_connections: - p_entrance = connection.entrance - p_exit = connection.exit - - portal1 = None - portal2 = None - - # search two_plus for both at once - for portal in two_plus: - if p_entrance == portal.name: - portal1 = portal - if p_exit == portal.name: - portal2 = portal - - # search dead_ends individually since we can't really remove items from two_plus during the loop - if not portal1: - for portal in dead_ends: - if p_entrance == portal.name: - portal1 = portal - break - dead_ends.remove(portal1) - else: - two_plus.remove(portal1) - - if not portal2: - for portal in dead_ends: - if p_exit == portal.name: - portal2 = portal - break - if p_exit == "Shop Portal": - portal2 = Portal(name="Shop Portal", region=f"Shop Entrance {shop_num}", destination="Previous Region_") - shop_num += 1 - else: - dead_ends.remove(portal2) - else: - two_plus.remove(portal2) - - if not portal1: - raise Exception("could not find entrance named " + p_entrance + " for Tunic player's plando") - if not portal2: - raise Exception("could not find entrance named " + p_exit + " for Tunic player's plando") - - portal_pairs[portal1] = portal2 - - # update dependent regions based on the plando'd connections, to make sure the portals connect well, logically - for origins, destinations in dependent_regions.items(): - if portal1.region in origins: - destinations.append(portal2.region) - if portal2.region in origins: - destinations.append(portal1.region) - - return portal_pairs, dependent_regions, dead_ends, two_plus diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py index ee42b1cfc480..779e632326db 100644 --- a/worlds/tunic/options.py +++ b/worlds/tunic/options.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from Options import DefaultOnToggle, Toggle, StartInventoryPool, Choice, Range, PerGameCommonOptions +from Options import DefaultOnToggle, Toggle, StartInventoryPool, Choice, Range, TextChoice, PerGameCommonOptions class SwordProgression(DefaultOnToggle): @@ -104,11 +104,17 @@ class ExtraHexagonPercentage(Range): default = 50 -class EntranceRando(Toggle): +class EntranceRando(TextChoice): """Randomize the connections between scenes. + You can choose a custom seed by editing this option. A small, very lost fox on a big adventure.""" internal_name = "entrance_rando" display_name = "Entrance Rando" + alias_false = 0 + option_no = 0 + alias_true = 1 + option_yes = 1 + default = 0 class FixedShop(Toggle): diff --git a/worlds/tunic/test/test_access.py b/worlds/tunic/test/test_access.py index d74858bd27ef..1c4f06d50461 100644 --- a/worlds/tunic/test/test_access.py +++ b/worlds/tunic/test/test_access.py @@ -59,7 +59,7 @@ def test_normal_goal(self): class TestER(TunicTestBase): - options = {options.EntranceRando.internal_name: options.EntranceRando.option_true, + options = {options.EntranceRando.internal_name: options.EntranceRando.option_yes, options.AbilityShuffling.internal_name: options.AbilityShuffling.option_true, options.HexagonQuest.internal_name: options.HexagonQuest.option_false} From 9efc7bae406821d5b0ebfd2c81a32c3c57e7ea70 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 15 Mar 2024 17:54:21 +0100 Subject: [PATCH 15/22] The Witness: Add junk hint for Zork: Grand Inquisitor (#2961) --- worlds/witness/hints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index 0c84dbc94da9..6ebf8eeec00d 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -72,6 +72,7 @@ "Have you tried Wargroove?\nI'm glad that for every abandoned series, enough people are yearning for its return that one of them will know how to code.", "Have you tried The Witness?\nOh. I guess you already have. Thanks for playing!", "Have you tried Zillion?\nMe neither. But it looks fun. So, let's try something new together?", + "Have you tried Zork: Grand Inquisitor?\nThis 1997 game uses Z-Vision technology to simulate 3D environments.\nCome on, I know you wanna find out what \"Z-Vision\" is.", "Quaternions break my brain", "Eclipse has nothing, but you should do it anyway.", From 8a8263fa61a6f996667ac2fc4472384c83cfb59d Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:02:25 -0400 Subject: [PATCH 16/22] SMW: Increment Required Client Version (#2962) --- worlds/smw/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py index 191610810203..875491a8d022 100644 --- a/worlds/smw/__init__.py +++ b/worlds/smw/__init__.py @@ -58,7 +58,7 @@ class SMWWorld(World): options: SMWOptions topology_present = False - required_client_version = (0, 4, 4) + required_client_version = (0, 4, 5) item_name_to_id = {name: data.code for name, data in item_table.items()} location_name_to_id = all_locations From 94650a02de62956eee8e7e41f61e8a41506b5842 Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Tue, 19 Mar 2024 17:08:29 -0500 Subject: [PATCH 17/22] Core: implement APProcedurePatch and APTokenMixin (#2536) * initial work on procedure patch * more flexibility load default procedure for version 5 patches add args for procedure add default extension for tokens and bsdiff allow specifying additional required extensions for generation * pushing current changes to go fix tloz bug * move tokens into a separate inheritable class * forgot the commit to remove token from ProcedurePatch * further cleaning from bad commit * start on docstrings * further work on docstrings and typing * improve docstrings * fix incorrect docstring * cleanup * clean defaults and docstring * define interface that has only the bare minimum required for `Patch.create_rom_file` * change to dictionary.get * remove unnecessary if statement * update to explicitly check for procedure, restore compatible version and manual override * Update Files.py * remove struct uses * ensure returning bytes, add token type checking * Apply suggestions from code review Co-authored-by: Doug Hoskisson * pep8 --------- Co-authored-by: beauxq Co-authored-by: Doug Hoskisson --- worlds/Files.py | 284 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 248 insertions(+), 36 deletions(-) diff --git a/worlds/Files.py b/worlds/Files.py index b2ecb9afb880..6fee582c872d 100644 --- a/worlds/Files.py +++ b/worlds/Files.py @@ -3,10 +3,11 @@ import abc import json import zipfile +from enum import IntEnum import os import threading -from typing import ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO +from typing import ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO, overload import bsdiff4 @@ -38,6 +39,32 @@ def get_handler(file: str) -> Optional[AutoPatchRegister]: return None +class AutoPatchExtensionRegister(abc.ABCMeta): + extension_types: ClassVar[Dict[str, AutoPatchExtensionRegister]] = {} + required_extensions: List[str] = [] + + def __new__(mcs, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]) -> AutoPatchExtensionRegister: + # construct class + new_class = super().__new__(mcs, name, bases, dct) + if "game" in dct: + AutoPatchExtensionRegister.extension_types[dct["game"]] = new_class + return new_class + + @staticmethod + def get_handler(game: str) -> Union[AutoPatchExtensionRegister, List[AutoPatchExtensionRegister]]: + handler = AutoPatchExtensionRegister.extension_types.get(game, APPatchExtension) + if handler.required_extensions: + handlers = [handler] + for required in handler.required_extensions: + ext = AutoPatchExtensionRegister.extension_types.get(required) + if not ext: + raise NotImplementedError(f"No handler for {required}.") + handlers.append(ext) + return handlers + else: + return handler + + container_version: int = 6 @@ -157,27 +184,14 @@ def patch(self, target: str) -> None: """ create the output file with the file name `target` """ -class APDeltaPatch(APAutoPatchInterface): - """An implementation of `APAutoPatchInterface` that additionally - has delta.bsdiff4 containing a delta patch to get the desired file.""" - +class APProcedurePatch(APAutoPatchInterface): + """ + An APPatch that defines a procedure to produce the desired file. + """ hash: Optional[str] # base checksum of source file - patch_file_ending: str = "" - delta: Optional[bytes] = None source_data: bytes - procedure = None # delete this line when APPP is added - - def __init__(self, *args: Any, patched_path: str = "", **kwargs: Any) -> None: - self.patched_path = patched_path - super(APDeltaPatch, self).__init__(*args, **kwargs) - - def get_manifest(self) -> Dict[str, Any]: - manifest = super(APDeltaPatch, self).get_manifest() - manifest["base_checksum"] = self.hash - manifest["result_file_ending"] = self.result_file_ending - manifest["patch_file_ending"] = self.patch_file_ending - manifest["compatible_version"] = 5 # delete this line when APPP is added - return manifest + patch_file_ending: str = "" + files: Dict[str, bytes] = {} @classmethod def get_source_data(cls) -> bytes: @@ -190,21 +204,219 @@ def get_source_data_with_cache(cls) -> bytes: cls.source_data = cls.get_source_data() return cls.source_data + def __init__(self, *args: Any, **kwargs: Any): + super(APProcedurePatch, self).__init__(*args, **kwargs) + + def get_manifest(self) -> Dict[str, Any]: + manifest = super(APProcedurePatch, self).get_manifest() + manifest["base_checksum"] = self.hash + manifest["result_file_ending"] = self.result_file_ending + manifest["patch_file_ending"] = self.patch_file_ending + manifest["procedure"] = self.procedure + if self.procedure == APDeltaPatch.procedure: + manifest["compatible_version"] = 5 + return manifest + + def read_contents(self, opened_zipfile: zipfile.ZipFile) -> None: + super(APProcedurePatch, self).read_contents(opened_zipfile) + with opened_zipfile.open("archipelago.json", "r") as f: + manifest = json.load(f) + if "procedure" not in manifest: + # support patching files made before moving to procedures + self.procedure = [("apply_bsdiff4", ["delta.bsdiff4"])] + else: + self.procedure = manifest["procedure"] + for file in opened_zipfile.namelist(): + if file not in ["archipelago.json"]: + self.files[file] = opened_zipfile.read(file) + + def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None: + super(APProcedurePatch, self).write_contents(opened_zipfile) + for file in self.files: + opened_zipfile.writestr(file, self.files[file], + compress_type=zipfile.ZIP_STORED if file.endswith(".bsdiff4") else None) + + def get_file(self, file: str) -> bytes: + """ Retrieves a file from the patch container.""" + if file not in self.files: + self.read() + return self.files[file] + + def write_file(self, file_name: str, file: bytes) -> None: + """ Writes a file to the patch container, to be retrieved upon patching. """ + self.files[file_name] = file + + def patch(self, target: str) -> None: + self.read() + base_data = self.get_source_data_with_cache() + patch_extender = AutoPatchExtensionRegister.get_handler(self.game) + assert not isinstance(self.procedure, str), f"{type(self)} must define procedures" + for step, args in self.procedure: + if isinstance(patch_extender, list): + extension = next((item for item in [getattr(extender, step, None) for extender in patch_extender] + if item is not None), None) + else: + extension = getattr(patch_extender, step, None) + if extension is not None: + base_data = extension(self, base_data, *args) + else: + raise NotImplementedError(f"Unknown procedure {step} for {self.game}.") + with open(target, 'wb') as f: + f.write(base_data) + + +class APDeltaPatch(APProcedurePatch): + """An APProcedurePatch that additionally has delta.bsdiff4 + containing a delta patch to get the desired file, often a rom.""" + + procedure = [ + ("apply_bsdiff4", ["delta.bsdiff4"]) + ] + + def __init__(self, *args: Any, patched_path: str = "", **kwargs: Any) -> None: + super(APDeltaPatch, self).__init__(*args, **kwargs) + self.patched_path = patched_path + def write_contents(self, opened_zipfile: zipfile.ZipFile): + self.write_file("delta.bsdiff4", + bsdiff4.diff(self.get_source_data_with_cache(), open(self.patched_path, "rb").read())) super(APDeltaPatch, self).write_contents(opened_zipfile) - # write Delta - opened_zipfile.writestr("delta.bsdiff4", - bsdiff4.diff(self.get_source_data_with_cache(), open(self.patched_path, "rb").read()), - compress_type=zipfile.ZIP_STORED) # bsdiff4 is a format with integrated compression - - def read_contents(self, opened_zipfile: zipfile.ZipFile): - super(APDeltaPatch, self).read_contents(opened_zipfile) - self.delta = opened_zipfile.read("delta.bsdiff4") - - def patch(self, target: str): - """Base + Delta -> Patched""" - if not self.delta: - self.read() - result = bsdiff4.patch(self.get_source_data_with_cache(), self.delta) - with open(target, "wb") as f: - f.write(result) + + +class APTokenTypes(IntEnum): + WRITE = 0 + COPY = 1 + RLE = 2 + AND_8 = 3 + OR_8 = 4 + XOR_8 = 5 + + +class APTokenMixin: + """ + A class that defines functions for generating a token binary, for use in patches. + """ + tokens: List[ + Tuple[APTokenTypes, int, Union[ + bytes, # WRITE + Tuple[int, int], # COPY, RLE + int # AND_8, OR_8, XOR_8 + ]]] = [] + + def get_token_binary(self) -> bytes: + """ + Returns the token binary created from stored tokens. + :return: A bytes object representing the token data. + """ + data = bytearray() + data.extend(len(self.tokens).to_bytes(4, "little")) + for token_type, offset, args in self.tokens: + data.append(token_type) + data.extend(offset.to_bytes(4, "little")) + if token_type in [APTokenTypes.AND_8, APTokenTypes.OR_8, APTokenTypes.XOR_8]: + assert isinstance(args, int), f"Arguments to AND/OR/XOR must be of type int, not {type(args)}" + data.extend(int.to_bytes(1, 4, "little")) + data.append(args) + elif token_type in [APTokenTypes.COPY, APTokenTypes.RLE]: + assert isinstance(args, tuple), f"Arguments to COPY/RLE must be of type tuple, not {type(args)}" + data.extend(int.to_bytes(4, 4, "little")) + data.extend(args[0].to_bytes(4, "little")) + data.extend(args[1].to_bytes(4, "little")) + elif token_type == APTokenTypes.WRITE: + assert isinstance(args, bytes), f"Arguments to WRITE must be of type bytes, not {type(args)}" + data.extend(len(args).to_bytes(4, "little")) + data.extend(args) + else: + raise ValueError(f"Unknown token type {token_type}") + return bytes(data) + + @overload + def write_token(self, + token_type: Literal[APTokenTypes.AND_8, APTokenTypes.OR_8, APTokenTypes.XOR_8], + offset: int, + data: int) -> None: + ... + + @overload + def write_token(self, + token_type: Literal[APTokenTypes.COPY, APTokenTypes.RLE], + offset: int, + data: Tuple[int, int]) -> None: + ... + + @overload + def write_token(self, + token_type: Literal[APTokenTypes.WRITE], + offset: int, + data: bytes) -> None: + ... + + def write_token(self, token_type: APTokenTypes, offset: int, data: Union[bytes, Tuple[int, int], int]): + """ + Stores a token to be used by patching. + """ + self.tokens.append((token_type, offset, data)) + + +class APPatchExtension(metaclass=AutoPatchExtensionRegister): + """Class that defines patch extension functions for a given game. + Patch extension functions must have the following two arguments in the following order: + + caller: APProcedurePatch (used to retrieve files from the patch container) + + rom: bytes (the data to patch) + + Further arguments are passed in from the procedure as defined. + + Patch extension functions must return the changed bytes. + """ + game: str + required_extensions: List[str] = [] + + @staticmethod + def apply_bsdiff4(caller: APProcedurePatch, rom: bytes, patch: str): + """Applies the given bsdiff4 from the patch onto the current file.""" + return bsdiff4.patch(rom, caller.get_file(patch)) + + @staticmethod + def apply_tokens(caller: APProcedurePatch, rom: bytes, token_file: str) -> bytes: + """Applies the given token file from the patch onto the current file.""" + token_data = caller.get_file(token_file) + rom_data = bytearray(rom) + token_count = int.from_bytes(token_data[0:4], "little") + bpr = 4 + for _ in range(token_count): + token_type = token_data[bpr:bpr + 1][0] + offset = int.from_bytes(token_data[bpr + 1:bpr + 5], "little") + size = int.from_bytes(token_data[bpr + 5:bpr + 9], "little") + data = token_data[bpr + 9:bpr + 9 + size] + if token_type in [APTokenTypes.AND_8, APTokenTypes.OR_8, APTokenTypes.XOR_8]: + arg = data[0] + if token_type == APTokenTypes.AND_8: + rom_data[offset] = rom_data[offset] & arg + elif token_type == APTokenTypes.OR_8: + rom_data[offset] = rom_data[offset] | arg + else: + rom_data[offset] = rom_data[offset] ^ arg + elif token_type in [APTokenTypes.COPY, APTokenTypes.RLE]: + length = int.from_bytes(data[:4], "little") + value = int.from_bytes(data[4:], "little") + if token_type == APTokenTypes.COPY: + rom_data[offset: offset + length] = rom_data[value: value + length] + else: + rom_data[offset: offset + length] = bytes([value] * length) + else: + rom_data[offset:offset + len(data)] = data + bpr += 9 + size + return bytes(rom_data) + + @staticmethod + def calc_snes_crc(caller: APProcedurePatch, rom: bytes): + """Calculates and applies a valid CRC for the SNES rom header.""" + rom_data = bytearray(rom) + if len(rom) < 0x8000: + raise Exception("Tried to calculate SNES CRC on file too small to be a SNES ROM.") + crc = (sum(rom_data[:0x7FDC] + rom_data[0x7FE0:]) + 0x01FE) & 0xFFFF + inv = crc ^ 0xFFFF + rom_data[0x7FDC:0x7FE0] = [inv & 0xFF, (inv >> 8) & 0xFF, crc & 0xFF, (crc >> 8) & 0xFF] + return bytes(rom_data) From d0a9d0e2d1df641668f4f806b45f9577e69229f6 Mon Sep 17 00:00:00 2001 From: Bryce Wilson Date: Wed, 20 Mar 2024 06:43:13 -0600 Subject: [PATCH 18/22] Pokemon Emerald: Bump required client version (#2963) --- worlds/pokemon_emerald/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py index c17fd1bc197c..384bec9f4501 100644 --- a/worlds/pokemon_emerald/__init__.py +++ b/worlds/pokemon_emerald/__init__.py @@ -87,7 +87,7 @@ class PokemonEmeraldWorld(World): location_name_groups = LOCATION_GROUPS data_version = 2 - required_client_version = (0, 4, 3) + required_client_version = (0, 4, 5) badge_shuffle_info: Optional[List[Tuple[PokemonEmeraldLocation, PokemonEmeraldItem]]] hm_shuffle_info: Optional[List[Tuple[PokemonEmeraldLocation, PokemonEmeraldItem]]] From 6f64bb98693556ac2635791381cc9651c365b324 Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Wed, 20 Mar 2024 08:46:31 -0400 Subject: [PATCH 19/22] Noita: Remove newline from option description so it doesn't look bad on webhost (#2969) --- worlds/noita/options.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worlds/noita/options.py b/worlds/noita/options.py index 7d987571a589..2c99e9dd2f38 100644 --- a/worlds/noita/options.py +++ b/worlds/noita/options.py @@ -78,8 +78,7 @@ class VictoryCondition(Choice): class ExtraOrbs(Range): - """Add extra orbs to your item pool, to prevent you from needing to wait as long - for the last orb you need for your victory condition. + """Add extra orbs to your item pool, to prevent you from needing to wait as long for the last orb you need for your victory condition. Extra orbs received past your victory condition's amount will be received as hearts instead. Can be turned on for the Greed Ending goal, but will only really make it harder.""" display_name = "Extra Orbs" From 8f7b63a787a0ef05625ae2fad1768251aced0c87 Mon Sep 17 00:00:00 2001 From: TheLX5 Date: Wed, 20 Mar 2024 05:56:04 -0700 Subject: [PATCH 20/22] SMW: Blocksanity logic fixes (#2988) --- worlds/smw/Regions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/worlds/smw/Regions.py b/worlds/smw/Regions.py index 2f8a128a5660..249604987401 100644 --- a/worlds/smw/Regions.py +++ b/worlds/smw/Regions.py @@ -975,7 +975,7 @@ def create_regions(world: World, active_locations): add_location_to_region(multiworld, player, active_locations, LocationName.donut_plains_2_region, LocationName.donut_plains_2_yellow_block_2, lambda state: state.has(ItemName.yellow_switch_palace, player)) add_location_to_region(multiworld, player, active_locations, LocationName.donut_plains_2_region, LocationName.donut_plains_2_vine_block_1, - lambda state:( ((state.has(ItemName.mario_climb, player) and state.has(ItemName.progressive_powerup, player, 1) and state.has(ItemName.mario_spin_jump, player))) or (state.has(ItemName.yoshi_activate, player)))) + lambda state:( ((state.has(ItemName.mario_carry, player) and state.has(ItemName.progressive_powerup, player, 1) and state.has(ItemName.mario_spin_jump, player))) or (state.has(ItemName.yoshi_activate, player)))) add_location_to_region(multiworld, player, active_locations, LocationName.donut_secret_1_region, LocationName.donut_secret_1_coin_block_1, lambda state: state.has(ItemName.mario_swim, player)) add_location_to_region(multiworld, player, active_locations, LocationName.donut_secret_1_region, LocationName.donut_secret_1_coin_block_2, @@ -1118,7 +1118,7 @@ def create_regions(world: World, active_locations): add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_castle_region, LocationName.chocolate_castle_yellow_block_2, lambda state: (state.has(ItemName.progressive_powerup, player, 1) and state.has(ItemName.yellow_switch_palace, player))) add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_castle_region, LocationName.chocolate_castle_green_block_1, - lambda state: (state.has(ItemName.progressive_powerup, player, 1) and state.has(ItemName.yellow_switch_palace, player))) + lambda state: (state.has(ItemName.progressive_powerup, player, 1) and state.has(ItemName.green_switch_palace, player))) add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_fortress_region, LocationName.chocolate_fortress_powerup_block_1) add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_fortress_region, LocationName.chocolate_fortress_powerup_block_2) add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_fortress_region, LocationName.chocolate_fortress_coin_block_1) @@ -1468,7 +1468,7 @@ def create_regions(world: World, active_locations): add_location_to_region(multiworld, player, active_locations, LocationName.forest_of_illusion_4_region, LocationName.forest_of_illusion_4_coin_block_9) add_location_to_region(multiworld, player, active_locations, LocationName.forest_of_illusion_4_region, LocationName.forest_of_illusion_4_coin_block_10) add_location_to_region(multiworld, player, active_locations, LocationName.forest_of_illusion_2_region, LocationName.forest_of_illusion_2_green_block_1, - lambda state: (state.has(ItemName.green_switch_palace, player) and state.has(ItemName.mario_carry, player))) + lambda state: (state.has(ItemName.green_switch_palace, player) and state.has(ItemName.mario_swim, player))) add_location_to_region(multiworld, player, active_locations, LocationName.forest_of_illusion_2_region, LocationName.forest_of_illusion_2_powerup_block_1, lambda state: state.has(ItemName.mario_swim, player)) add_location_to_region(multiworld, player, active_locations, LocationName.forest_of_illusion_2_region, LocationName.forest_of_illusion_2_invis_coin_block_1, @@ -1762,7 +1762,7 @@ def create_regions(world: World, active_locations): add_location_to_region(multiworld, player, active_locations, LocationName.star_road_4_region, LocationName.star_road_4_green_block_7, lambda state: (state.has(ItemName.green_switch_palace, player) and state.has(ItemName.yoshi_activate, player) and state.has(ItemName.mario_carry, player))) add_location_to_region(multiworld, player, active_locations, LocationName.star_road_4_region, LocationName.star_road_4_key_block_1, - lambda state:( ((state.has(ItemName.mario_climb, player) and state.has(ItemName.mario_carry, player))) or ((state.has(ItemName.green_switch_palace, player) and state.has(ItemName.red_switch_palace, player) and state.has(ItemName.mario_climb, player))))) + lambda state:( ((state.has(ItemName.mario_carry, player) and state.has(ItemName.yoshi_activate, player))) or ((state.has(ItemName.green_switch_palace, player) and state.has(ItemName.red_switch_palace, player) and state.has(ItemName.mario_carry, player))))) add_location_to_region(multiworld, player, active_locations, LocationName.star_road_5_region, LocationName.star_road_5_directional_coin_block_1) add_location_to_region(multiworld, player, active_locations, LocationName.star_road_5_region, LocationName.star_road_5_life_block_1, lambda state: state.has(ItemName.p_switch, player)) From fcaaa197a19a3be03965c504ca78dd2c21ce1f84 Mon Sep 17 00:00:00 2001 From: TheLX5 Date: Wed, 20 Mar 2024 05:56:19 -0700 Subject: [PATCH 21/22] SMW: Fixes for Bowser being defeatable on Egg Hunt and CI2 DC room access (#2981) --- worlds/smw/Client.py | 13 ++++++++----- worlds/smw/Rom.py | 37 +++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/worlds/smw/Client.py b/worlds/smw/Client.py index eb9b4ec3d3a9..33a74b3dc80f 100644 --- a/worlds/smw/Client.py +++ b/worlds/smw/Client.py @@ -65,11 +65,12 @@ SMW_BLOCKSANITY_BLOCK_COUNT = 582 -SMW_GOAL_LEVELS = [0x28, 0x31, 0x32] -SMW_INVALID_MARIO_STATES = [0x05, 0x06, 0x0A, 0x0C, 0x0D] -SMW_BAD_TEXT_BOX_LEVELS = [0x00, 0x26, 0x02, 0x4B] -SMW_BOSS_STATES = [0x80, 0xC0, 0xC1] -SMW_UNCOLLECTABLE_LEVELS = [0x25, 0x07, 0x0B, 0x40, 0x0E, 0x1F, 0x20, 0x1B, 0x1A, 0x35, 0x34, 0x31, 0x32] +SMW_GOAL_LEVELS = [0x28, 0x31, 0x32] +SMW_INVALID_MARIO_STATES = [0x05, 0x06, 0x0A, 0x0C, 0x0D] +SMW_BAD_TEXT_BOX_LEVELS = [0x00, 0x26, 0x02, 0x4B] +SMW_BOSS_STATES = [0x80, 0xC0, 0xC1] +SMW_UNCOLLECTABLE_LEVELS = [0x25, 0x07, 0x0B, 0x40, 0x0E, 0x1F, 0x20, 0x1B, 0x1A, 0x35, 0x34, 0x31, 0x32] +SMW_UNCOLLECTABLE_DRAGON_COINS = [0x24] class SMWSNIClient(SNIClient): @@ -604,6 +605,8 @@ async def game_watcher(self, ctx): if level_data[1] == 2: # Dragon Coins Check + if level_data[0] in SMW_UNCOLLECTABLE_DRAGON_COINS: + continue progress_byte = (level_data[0] // 8) progress_bit = 7 - (level_data[0] % 8) diff --git a/worlds/smw/Rom.py b/worlds/smw/Rom.py index 66226d503685..36078d4622b9 100644 --- a/worlds/smw/Rom.py +++ b/worlds/smw/Rom.py @@ -587,18 +587,17 @@ def handle_yoshi_box(rom): def handle_bowser_damage(rom): - rom.write_bytes(0x1A509, bytearray([0x20, 0x50, 0xBC])) # JSR $03BC50 + rom.write_bytes(0x1A509, bytearray([0x5C, 0x50, 0xBC, 0x03])) # JML $03BC50 BOWSER_BALLS_SUB_ADDR = 0x01BC50 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x00, bytearray([0x08])) # PHP - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x01, bytearray([0xAD, 0x48, 0x0F])) # LDA $F48 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x04, bytearray([0xCF, 0xA1, 0xBF, 0x03])) # CMP $03BFA1 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x08, bytearray([0x90, 0x06])) # BCC +0x06 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0A, bytearray([0x28])) # PLP - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0B, bytearray([0xEE, 0xB8, 0x14])) # INC $14B8 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0E, bytearray([0x80, 0x01])) # BRA +0x01 - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x10, bytearray([0x28])) # PLP - rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x11, bytearray([0x60])) # RTS + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0000, bytearray([0xAF, 0xA0, 0xBF, 0x03])) # bowser_infinite_balls: lda.l goal_setting + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0004, bytearray([0xD0, 0x0C])) # bne .nope + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0006, bytearray([0xAD, 0x48, 0x0F])) # lda $0F48 + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0009, bytearray([0xCF, 0xA1, 0xBF, 0x03])) # cmp.l required_bosses_setting + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x000D, bytearray([0x90, 0x03])) # bcc .nope + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x000F, bytearray([0xEE, 0xB8, 0x14])) # inc $14B8 + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0012, bytearray([0xAD, 0xB8, 0x14])) # .nope lda $14B8 + rom.write_bytes(BOWSER_BALLS_SUB_ADDR + 0x0015, bytearray([0x5C, 0x0F, 0xA5, 0x03])) # jml $03A50F return @@ -2729,6 +2728,22 @@ def handle_uncompressed_player_gfx(rom): ]) rom.write_bytes(0x87F80, vram_targets) + +def handle_chocolate_island_2(rom): + FIX_CHOCOISLAND2_ADDR = 0x87200 + rom.write_bytes(0x2DB3E, bytearray([0x5C, 0x00, 0xF2, 0x10])) # jml fix_choco_island_2 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0000, bytearray([0xAD, 0x33, 0x1F])) # fix_choco_island_2 lda $1F2F+$04 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0003, bytearray([0x29, 0x08])) # and #$08 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0005, bytearray([0xD0, 0x0D])) # bne .dc_room + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0007, bytearray([0xAD, 0x22, 0x14])) # lda $1422 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x000A, bytearray([0xC9, 0x04])) # cmp #$04 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x000C, bytearray([0xF0, 0x06])) # beq .dc_room + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x000E, bytearray([0xA2, 0x02])) # .rex_room ldx #$02 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0010, bytearray([0x5C, 0x49, 0xDB, 0x05])) # jml $05DB49 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0014, bytearray([0xA2, 0x00])) # .dc_room ldx #$00 + rom.write_bytes(FIX_CHOCOISLAND2_ADDR + 0x0016, bytearray([0x5C, 0x49, 0xDB, 0x05])) # jml $05DB49 + + def decompress_gfx(compressed_graphics): # This code decompresses graphics in LC_LZ2 format in order to be able to swap player and yoshi's graphics with ease. decompressed_gfx = bytearray([]) @@ -3050,6 +3065,8 @@ def patch_rom(world: World, rom, player, active_level_dict): rom.write_bytes(0x09C13, bytearray([0x7E, 0x7E, 0x7F, 0x7F])) rom.write_byte(0x3F425, 0x32) + handle_chocolate_island_2(rom) + handle_ability_code(rom) handle_yoshi_box(rom) From 183ca35bbaf6c805fdb53396d21d0cba34f9cc5e Mon Sep 17 00:00:00 2001 From: qwint Date: Wed, 20 Mar 2024 08:39:37 -0500 Subject: [PATCH 22/22] CommonClient: Port Casting Bug (#2975) --- CommonClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonClient.py b/CommonClient.py index b6f8e43b181b..085a48a4b74b 100644 --- a/CommonClient.py +++ b/CommonClient.py @@ -643,13 +643,13 @@ async def server_loop(ctx: CommonContext, address: typing.Optional[str] = None) ctx.username = server_url.username if server_url.password: ctx.password = server_url.password - port = server_url.port or 38281 def reconnect_hint() -> str: return ", type /connect to reconnect" if ctx.server_address else "" logger.info(f'Connecting to Archipelago server at {address}') try: + port = server_url.port or 38281 # raises ValueError if invalid socket = await websockets.connect(address, port=port, ping_timeout=None, ping_interval=None, ssl=get_ssl_context() if address.startswith("wss://") else None) if ctx.ui is not None: