From 5c3b7077103b71f095faaded746913647c4e2987 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Sat, 10 Jul 2021 22:47:40 +0300 Subject: [PATCH] tidying --- .idea/dictionaries/roman.xml | 1 + assets/src/ba_data/python/ba/_coopsession.py | 1 - assets/src/ba_data/python/ba/_servermode.py | 4 +++- assets/src/ba_data/python/bastd/activity/coopscore.py | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.idea/dictionaries/roman.xml b/.idea/dictionaries/roman.xml index 240cd39e..d594223f 100644 --- a/.idea/dictionaries/roman.xml +++ b/.idea/dictionaries/roman.xml @@ -1,6 +1,7 @@ + gamename maxlen pagename diff --git a/assets/src/ba_data/python/ba/_coopsession.py b/assets/src/ba_data/python/ba/_coopsession.py index d0534e3c..3435569e 100644 --- a/assets/src/ba_data/python/ba/_coopsession.py +++ b/assets/src/ba_data/python/ba/_coopsession.py @@ -158,7 +158,6 @@ class CoopSession(Session): if _ba.app.server is not None: # If we're in server mode, end game and show results. - activity = self.getactivity() _ba.timer(2.0, WeakCall(self._end_activity_if_empty)) else: # Otherwise, if all our players leave diff --git a/assets/src/ba_data/python/ba/_servermode.py b/assets/src/ba_data/python/ba/_servermode.py index 7c87af63..0f03d4c5 100644 --- a/assets/src/ba_data/python/ba/_servermode.py +++ b/assets/src/ba_data/python/ba/_servermode.py @@ -299,6 +299,7 @@ class ServerController: def _launch_server_session(self) -> None: """Kick off a host-session based on the current server config.""" + # pylint: disable=too-many-branches app = _ba.app appcfg = app.config sessiontype = self._get_session_type() @@ -348,7 +349,8 @@ class ServerController: appcfg['Team Tournament Playlist Randomize'] = ( self._config.playlist_shuffle) elif sessiontype is CoopSession: - campaignname, levelname = self._coop_game_name.split(':') + gamename = self._coop_game_name or 'Default:Onslaught Training' + campaignname, levelname = gamename.split(':') app.coop_session_args = { 'campaign': campaignname, 'level': levelname, diff --git a/assets/src/ba_data/python/bastd/activity/coopscore.py b/assets/src/ba_data/python/bastd/activity/coopscore.py index fa4165db..dc201f55 100644 --- a/assets/src/ba_data/python/bastd/activity/coopscore.py +++ b/assets/src/ba_data/python/bastd/activity/coopscore.py @@ -510,7 +510,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]): with ba.Context(self): self.end({'outcome': 'restart'}) - def _safe_assign(self, player: EmptyPlayer) -> None: + def _safe_assign(self, player: ba.Player) -> None: # (Only for headless builds). # Just to be extra careful, don't assign if we're transitioning out. @@ -521,7 +521,7 @@ class CoopScoreScreen(ba.Activity[ba.Player, ba.Team]): ba.InputType.BOMB_PRESS, ba.InputType.PICK_UP_PRESS), self._player_press) - def on_player_join(self, player: PlayerType) -> None: + def on_player_join(self, player: ba.Player) -> None: super().on_player_join(player) if ba.app.server is not None: