From a5ddfb68a3abbb539e8b5661124f3aea882ee6a0 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 10 Nov 2024 17:14:44 -0800
Subject: [PATCH] sc2: Fixing more imports to be relative in sc2 world

---
 worlds/sc2/__init__.py | 1 -
 worlds/sc2/client.py   | 4 ++--
 worlds/sc2/options.py  | 4 +++-
 worlds/sc2/rules.py    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/worlds/sc2/__init__.py b/worlds/sc2/__init__.py
index 3ee72f65f3b4..4a73f9c6db07 100644
--- a/worlds/sc2/__init__.py
+++ b/worlds/sc2/__init__.py
@@ -11,7 +11,6 @@
     ItemData, kerrigan_actives, kerrigan_passives,
     not_balanced_starting_units, WEAPON_ARMOR_UPGRADE_MAX_LEVEL, ZergItemType,
 )
-from . import item
 from . import location_groups
 from .item import FilterItem, ItemFilterFlags, StarcraftItem, item_groups, item_names, item_tables
 from .locations import get_locations, DEFAULT_LOCATION_LIST, get_location_types, get_location_flags, get_plando_locations
diff --git a/worlds/sc2/client.py b/worlds/sc2/client.py
index 9b4b7f21f783..ce66776eb71e 100644
--- a/worlds/sc2/client.py
+++ b/worlds/sc2/client.py
@@ -23,8 +23,8 @@
 # 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.item import item_names
-from worlds.sc2.item.item_groups import item_name_groups, unlisted_item_name_groups
+from .item import item_names
+from .item.item_groups import item_name_groups, unlisted_item_name_groups
 from . import options
 from .options import (
     MissionOrder, KerriganPrimalStatus, kerrigan_unit_available, KerriganPresence, EnableMorphling,
diff --git a/worlds/sc2/options.py b/worlds/sc2/options.py
index 27e9bb91f3fb..7b39394d3b64 100644
--- a/worlds/sc2/options.py
+++ b/worlds/sc2/options.py
@@ -4,8 +4,10 @@
 from Options import *
 from Utils import get_fuzzy_results
 from BaseClasses import PlandoOptions
-from .mission_tables import SC2Campaign, SC2Mission, lookup_name_to_mission, MissionPools, get_missions_with_any_flags_in_list, \
+from .mission_tables import (
+    SC2Campaign, SC2Mission, lookup_name_to_mission, MissionPools, get_missions_with_any_flags_in_list,
     campaign_mission_table, SC2Race, MissionFlag
+)
 from .mission_groups import mission_groups, MissionGroupNames
 from .mission_order.options import CustomMissionOrder
 from .item import item_names
diff --git a/worlds/sc2/rules.py b/worlds/sc2/rules.py
index 70404aebfeff..9db9a7131ead 100644
--- a/worlds/sc2/rules.py
+++ b/worlds/sc2/rules.py
@@ -7,7 +7,7 @@
     GrantStoryTech, GrantStoryLevels, TakeOverAIAllies, SpearOfAdunAutonomouslyCastAbilityPresence,
     get_enabled_campaigns, MissionOrder, EnableMorphling, get_enabled_races
 )
-from worlds.sc2.item.item_tables import (
+from .item.item_tables import (
     tvx_defense_ratings, tvz_defense_ratings, kerrigan_actives, tvx_air_defense_ratings,
     kerrigan_levels, get_full_item_list, zvx_air_defense_ratings, zvx_defense_ratings, pvx_defense_ratings,
     pvz_defense_ratings, no_logic_basic_units, advanced_basic_units, basic_units, upgrade_bundle_inverted_lookup, WEAPON_ARMOR_UPGRADE_MAX_LEVEL