diff --git a/worlds/adventure/Options.py b/worlds/adventure/Options.py index e6a8e4c2..4b3f30df 100644 --- a/worlds/adventure/Options.py +++ b/worlds/adventure/Options.py @@ -1,9 +1,8 @@ from __future__ import annotations -from typing import Dict - from dataclasses import dataclass -from Options import Choice, Option, DefaultOnToggle, DeathLink, Range, Toggle, PerGameCommonOptions + +from Options import Choice, DefaultOnToggle, DeathLink, Range, Toggle, PerGameCommonOptions class FreeincarnateMax(Range): diff --git a/worlds/adventure/Regions.py b/worlds/adventure/Regions.py index 4e4dd1e7..a0a04be2 100644 --- a/worlds/adventure/Regions.py +++ b/worlds/adventure/Regions.py @@ -1,6 +1,6 @@ from BaseClasses import MultiWorld, Region, Entrance, LocationProgressType from Options import PerGameCommonOptions -from .Locations import location_table, LocationData, AdventureLocation, dragon_room_to_region +from .Locations import location_table, AdventureLocation, dragon_room_to_region def connect(world: MultiWorld, player: int, source: str, target: str, rule: callable = lambda state: True, diff --git a/worlds/adventure/Rom.py b/worlds/adventure/Rom.py index 643f7a6c..4d56cd19 100644 --- a/worlds/adventure/Rom.py +++ b/worlds/adventure/Rom.py @@ -2,15 +2,15 @@ import hashlib import json import os import zipfile -from typing import Optional, Any - -import Utils -from .Locations import AdventureLocation, LocationData -from settings import get_settings -from worlds.Files import APPatch, AutoPatchRegister +from typing import Any import bsdiff4 +import Utils +from settings import get_settings +from worlds.Files import APPatch, AutoPatchRegister +from .Locations import LocationData + ADVENTUREHASH: str = "157bddb7192754a45372be196797f284" diff --git a/worlds/adventure/__init__.py b/worlds/adventure/__init__.py index 4fde1482..9dab2ffc 100644 --- a/worlds/adventure/__init__.py +++ b/worlds/adventure/__init__.py @@ -1,35 +1,24 @@ -import base64 import copy -import itertools import math import os -import settings import typing -from enum import IntFlag -from typing import Any, ClassVar, Dict, List, Optional, Set, Tuple +from typing import ClassVar, Dict, Optional, Tuple -from BaseClasses import Entrance, Item, ItemClassification, MultiWorld, Region, Tutorial, \ - LocationProgressType +import settings +from BaseClasses import Item, ItemClassification, MultiWorld, Tutorial, LocationProgressType from Utils import __version__ -from Options import AssembleOptions from worlds.AutoWorld import WebWorld, World -from Fill import fill_restrictive -from worlds.generic.Rules import add_rule, set_rule -from .Options import DragonRandoType, DifficultySwitchA, DifficultySwitchB, \ - AdventureOptions -from .Rom import get_base_rom_bytes, get_base_rom_path, AdventureDeltaPatch, apply_basepatch, \ - AdventureAutoCollectLocation +from worlds.LauncherComponents import Component, components, SuffixIdentifier from .Items import item_table, ItemData, nothing_item_id, event_table, AdventureItem, standard_item_max from .Locations import location_table, base_location_id, LocationData, get_random_room_in_regions from .Offsets import static_item_data_location, items_ram_start, static_item_element_size, item_position_table, \ static_first_dragon_index, connector_port_offset, yorgle_speed_data_location, grundle_speed_data_location, \ rhindle_speed_data_location, item_ram_addresses, start_castle_values, start_castle_offset +from .Options import DragonRandoType, DifficultySwitchA, DifficultySwitchB, AdventureOptions from .Regions import create_regions +from .Rom import get_base_rom_bytes, get_base_rom_path, AdventureDeltaPatch, apply_basepatch, AdventureAutoCollectLocation from .Rules import set_rules - -from worlds.LauncherComponents import Component, components, SuffixIdentifier - # Adventure components.append(Component('Adventure Client', 'AdventureClient', file_identifier=SuffixIdentifier('.apadvn')))