From dc46e96e3f2c0f534b28d1825024da7021270126 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Mon, 26 Jun 2023 00:38:39 +0200 Subject: [PATCH] Witness: APworld compatibility, but for real this time (#1896) * removed relative imports from outside the witness package * Remove Witness from the apworld shame list --- setup.py | 1 - worlds/witness/__init__.py | 2 +- worlds/witness/rules.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 35b903f25920..cea486fee15b 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,6 @@ "Starcraft 2 Wings of Liberty", "Sudoku", "Super Mario 64", - "The Witness", "VVVVVV", "Wargroove", "Zillion", diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 339130777fd0..c9f4ca043f73 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -6,7 +6,7 @@ from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial, ItemClassification from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \ get_priority_hint_items, make_hints, generate_joke_hints -from ..AutoWorld import World, WebWorld +from worlds.AutoWorld import World, WebWorld from .player_logic import WitnessPlayerLogic from .static_logic import StaticWitnessLogic from .locations import WitnessPlayerLocations, StaticWitnessLocations diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py index 409a86ee43cd..b8b8d2e80390 100644 --- a/worlds/witness/rules.py +++ b/worlds/witness/rules.py @@ -10,8 +10,8 @@ from .Options import is_option_enabled, get_option_value from .locations import WitnessPlayerLocations from . import StaticWitnessLogic -from ..AutoWorld import LogicMixin -from ..generic.Rules import set_rule +from worlds.AutoWorld import LogicMixin +from worlds.generic.Rules import set_rule class WitnessLogic(LogicMixin):