Compare commits

..

3 Commits

Author SHA1 Message Date
3d8bcc0efb Ocliam fixed this a typo or something 2025-07-16 12:06:06 +01:00
23aea1777f Improved the error handling 2025-07-08 16:36:58 -04:00
d16567ea18 Cleaned up some import settings 2025-07-08 16:19:05 -04:00
2 changed files with 13 additions and 10 deletions

View File

@ -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:
@ -130,7 +130,7 @@ class serialShocker(Expansion):
super().__init__(ID, expansionsManager)
if self.config["COM_port"] not in serialShocker._api:
self._assignApi()
self.shocker = serialShocker._api[self.config["COM_port"]].shocker(["shocker_ID"])
self.shocker = serialShocker._api[self.config["COM_port"]].shocker(self.config["shocker_ID"])
def _assignApi(self):
from pishock import SerialAPI

View File

@ -6,7 +6,7 @@ import copy
import json
import logging
from pathlib import Path
import expansionsLib
from . import expansionsLib
_log = logging.getLogger('NoPE-Lib')
@ -328,6 +328,7 @@ class ExpansionsManager:
return possiblyValidExpansions
def _createExpansion(self, expansionID):
terminalErrors = SystemExit, KeyboardInterrupt, GeneratorExit
try:
# Create the expansion
expansionClass = self._getClassFillMissing(expansionID)
@ -340,6 +341,8 @@ class ExpansionsManager:
else:
self._playersLookUp[player] = [expansionID]
return expansion
except terminalErrors as e:
raise e
except Exception as e:
return e