From 7760034ff7573bdb928768660353e8d7ee136378 Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Sun, 19 Feb 2023 03:10:32 -0500 Subject: [PATCH] DKC3 and SMW: Remove relative imports (#1472) --- worlds/dkc3/Rules.py | 4 ++-- worlds/dkc3/__init__.py | 2 +- worlds/smw/Regions.py | 2 +- worlds/smw/Rules.py | 4 ++-- worlds/smw/__init__.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/worlds/dkc3/Rules.py b/worlds/dkc3/Rules.py index dcfc9124..dc90eefd 100644 --- a/worlds/dkc3/Rules.py +++ b/worlds/dkc3/Rules.py @@ -2,8 +2,8 @@ import math from BaseClasses import MultiWorld from .Names import LocationName, ItemName -from ..AutoWorld import LogicMixin -from ..generic.Rules import add_rule, set_rule +from worlds.AutoWorld import LogicMixin +from worlds.generic.Rules import add_rule, set_rule def set_rules(world: MultiWorld, player: int): diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py index 4b54d67e..adbb2306 100644 --- a/worlds/dkc3/__init__.py +++ b/worlds/dkc3/__init__.py @@ -12,7 +12,7 @@ from .Levels import level_list from .Rules import set_rules from .Names import ItemName, LocationName from .Client import DKC3SNIClient -from ..AutoWorld import WebWorld, World +from worlds.AutoWorld import WebWorld, World from .Rom import LocalRom, patch_rom, get_base_rom_path, DKC3DeltaPatch import Patch diff --git a/worlds/smw/Regions.py b/worlds/smw/Regions.py index 3b45abb9..885f209a 100644 --- a/worlds/smw/Regions.py +++ b/worlds/smw/Regions.py @@ -4,7 +4,7 @@ from BaseClasses import MultiWorld, Region, Entrance from .Locations import SMWLocation from .Levels import level_info_dict from .Names import LocationName, ItemName -from ..generic.Rules import add_rule, set_rule +from worlds.generic.Rules import add_rule, set_rule def create_regions(world, player: int, active_locations): diff --git a/worlds/smw/Rules.py b/worlds/smw/Rules.py index bf9fedb8..82f22c3a 100644 --- a/worlds/smw/Rules.py +++ b/worlds/smw/Rules.py @@ -2,8 +2,8 @@ import math from BaseClasses import MultiWorld from .Names import LocationName, ItemName -from ..AutoWorld import LogicMixin -from ..generic.Rules import add_rule, set_rule +from worlds.AutoWorld import LogicMixin +from worlds.generic.Rules import add_rule, set_rule def set_rules(world: MultiWorld, player: int): diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py index 6365bd11..014b9af5 100644 --- a/worlds/smw/__init__.py +++ b/worlds/smw/__init__.py @@ -10,10 +10,10 @@ from .Options import smw_options from .Regions import create_regions, connect_regions from .Levels import full_level_list, generate_level_list, location_id_to_level_id from .Rules import set_rules -from ..generic.Rules import add_rule, exclusion_rules +from worlds.generic.Rules import add_rule, exclusion_rules from .Names import ItemName, LocationName from .Client import SMWSNIClient -from ..AutoWorld import WebWorld, World +from worlds.AutoWorld import WebWorld, World from .Rom import LocalRom, patch_rom, get_base_rom_path, SMWDeltaPatch