RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-07 08:03:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tidying

Browse Source
This commit is contained in:
Eric Froemling 2020-04-11 13:47:37 -07:00
parent 08653c00e4
commit c654830c50
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/src/ba_data/python/ba/_teambasesession.py
View File

@ -53,7 +53,7 @@ class TeamBaseSession(Session):
def __init__(self) -> None: def __init__(self) -> None:
"""Set up playlists and launches a ba.Activity to accept joiners.""" """Set up playlists and launches a ba.Activity to accept joiners."""
# pylint: disable=cyclic-import # pylint: disable=cyclic-import
from ba import _playlist as bsplaylist from ba import _playlist
from bastd.activity import multiteamjoinscreen from bastd.activity import multiteamjoinscreen
app = _ba.app app = _ba.app
cfg = app.config cfg = app.config
@ -67,6 +67,7 @@ class TeamBaseSession(Session):
# print('FIXME: TEAM BASE SESSION WOULD CALC DEPS.') # print('FIXME: TEAM BASE SESSION WOULD CALC DEPS.')
depsets: Sequence[ba.DependencySet] = [] depsets: Sequence[ba.DependencySet] = []
super().__init__(depsets, super().__init__(depsets,
team_names=team_names, team_names=team_names,
team_colors=team_colors, team_colors=team_colors,
@ -105,17 +106,17 @@ class TeamBaseSession(Session):
playlist = copy.deepcopy(playlists[self._playlist_name]) playlist = copy.deepcopy(playlists[self._playlist_name])
else: else:
if self._use_teams: if self._use_teams:
playlist = bsplaylist.get_default_teams_playlist() playlist = _playlist.get_default_teams_playlist()
else: else:
playlist = bsplaylist.get_default_free_for_all_playlist() playlist = _playlist.get_default_free_for_all_playlist()
# Resolve types and whatnot to get our final playlist. # Resolve types and whatnot to get our final playlist.
playlist_resolved = bsplaylist.filter_playlist(playlist, playlist_resolved = _playlist.filter_playlist(playlist,
sessiontype=type(self), sessiontype=type(self),
add_resolved_type=True) add_resolved_type=True)
if not playlist_resolved: if not playlist_resolved:
raise Exception("playlist contains no valid games") raise RuntimeError("Playlist contains no valid games.")
self._playlist = ShuffleList(playlist_resolved, self._playlist = ShuffleList(playlist_resolved,
shuffle=self._playlist_randomize) shuffle=self._playlist_randomize)