PainJam/NoPELib
Archived
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up some import settings

Browse Source
This commit is contained in:
oclaim
2025-07-08 16:19:05 -04:00
parent 63f44aacec
commit d16567ea18
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/NoPELib/expansionsLib.py
View File

@ -6,7 +6,7 @@ import copy
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from NoPELib.player_settings import ExpansionsManager from .player_settings import ExpansionsManager
class Hook: class Hook:
@ -56,7 +56,7 @@ class Expansion:
self._manager = expansionsManager self._manager = expansionsManager
self.midStepError = Hook() self.midStepError = Hook()
self.midStepError.connect(expansionsManager._midStepError) self.midStepError.connect(expansionsManager._midStepError)
def __call__(self, action): def __call__(self, action):
try: try:
assert not self._closed, "Can't use an expansion that has been closed." assert not self._closed, "Can't use an expansion that has been closed."
@ -70,7 +70,7 @@ class Expansion:
} }
self.midStepError(self._ID) self.midStepError(self._ID)
return step_info return step_info
@property @property
def config(self): def config(self):
""" """
@ -131,11 +131,11 @@ class serialShocker(Expansion):
if self.config["COM_port"] not in serialShocker._api: if self.config["COM_port"] not in serialShocker._api:
self._assignApi() self._assignApi()
self.shocker = serialShocker._api[self.config["COM_port"]].shocker(["shocker_ID"]) self.shocker = serialShocker._api[self.config["COM_port"]].shocker(["shocker_ID"])
def _assignApi(self): def _assignApi(self):
from pishock import SerialAPI from pishock import SerialAPI
serialShocker._api[self.config["COM_port"]] = SerialAPI(self.config["COM_port"]) serialShocker._api[self.config["COM_port"]] = SerialAPI(self.config["COM_port"])
def step(self, action): def step(self, action):
""" """
Arguments: Arguments:
@ -155,11 +155,11 @@ class serialShocker(Expansion):
"error": None, "error": None,
"done": True "done": True
} }
return step_info return step_info
def close(self): def close(self):
pass pass
def reset(self): def reset(self):
if self.config["COM_port"] not in serialShocker._api: if self.config["COM_port"] not in serialShocker._api:
serialShocker._api[self.config["COM_port"]].restart() serialShocker._api[self.config["COM_port"]].restart()

4
src/NoPELib/player_settings.py
View File

@ -6,7 +6,7 @@ import copy
import json import json
import logging import logging
from pathlib import Path from pathlib import Path
import expansionsLib from . import expansionsLib
_log = logging.getLogger('NoPE-Lib') _log = logging.getLogger('NoPE-Lib')
@ -437,7 +437,7 @@ class ExpansionsManager:
self._playersLookUp[playerName].pop(expansionID) self._playersLookUp[playerName].pop(expansionID)
for playerName in addedPlayers: for playerName in addedPlayers:
self._playersLookUp[playerName].append(expansionID) self._playersLookUp[playerName].append(expansionID)
def lookupPlayer(self, playerName): def lookupPlayer(self, playerName):
""" """
Get a tuple of all expansions available to a player. Get a tuple of all expansions available to a player.