From d16567ea187f7b3c3bbffd4a0960cdb4058c3b44 Mon Sep 17 00:00:00 2001 From: oclaim Date: Tue, 8 Jul 2025 16:19:05 -0400 Subject: [PATCH] Cleaned up some import settings --- src/NoPELib/expansionsLib.py | 14 +++++++------- src/NoPELib/player_settings.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/NoPELib/expansionsLib.py b/src/NoPELib/expansionsLib.py index 86e472d..fff75de 100644 --- a/src/NoPELib/expansionsLib.py +++ b/src/NoPELib/expansionsLib.py @@ -6,7 +6,7 @@ import copy from typing import TYPE_CHECKING if TYPE_CHECKING: - from NoPELib.player_settings import ExpansionsManager + from .player_settings import ExpansionsManager class Hook: @@ -56,7 +56,7 @@ class Expansion: self._manager = expansionsManager self.midStepError = Hook() self.midStepError.connect(expansionsManager._midStepError) - + def __call__(self, action): try: assert not self._closed, "Can't use an expansion that has been closed." @@ -70,7 +70,7 @@ class Expansion: } self.midStepError(self._ID) return step_info - + @property def config(self): """ @@ -131,11 +131,11 @@ class serialShocker(Expansion): if self.config["COM_port"] not in serialShocker._api: self._assignApi() self.shocker = serialShocker._api[self.config["COM_port"]].shocker(["shocker_ID"]) - + def _assignApi(self): from pishock import SerialAPI serialShocker._api[self.config["COM_port"]] = SerialAPI(self.config["COM_port"]) - + def step(self, action): """ Arguments: @@ -155,11 +155,11 @@ class serialShocker(Expansion): "error": None, "done": True } - return step_info + return step_info def close(self): pass - + def reset(self): if self.config["COM_port"] not in serialShocker._api: serialShocker._api[self.config["COM_port"]].restart() diff --git a/src/NoPELib/player_settings.py b/src/NoPELib/player_settings.py index 4c1ccd7..d7abc3c 100644 --- a/src/NoPELib/player_settings.py +++ b/src/NoPELib/player_settings.py @@ -6,7 +6,7 @@ import copy import json import logging from pathlib import Path -import expansionsLib +from . import expansionsLib _log = logging.getLogger('NoPE-Lib') @@ -437,7 +437,7 @@ class ExpansionsManager: self._playersLookUp[playerName].pop(expansionID) for playerName in addedPlayers: self._playersLookUp[playerName].append(expansionID) - + def lookupPlayer(self, playerName): """ Get a tuple of all expansions available to a player.