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

Merge pull request #18 from Dliwk/fix-ffa-session

Browse Source 
Fix FFA session
This commit is contained in:
Eric Froemling 2020-04-11 13:46:54 -07:00 committed by GitHub
commit 6b25fed8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/src/ba_data/python/ba/_session.py
View File

@ -97,7 +97,6 @@ class Session:
instances; one for each ba.Activity the session may potentially run. instances; one for each ba.Activity the session may potentially run.
""" """
# pylint: disable=too-many-statements # pylint: disable=too-many-statements
# pylint: disable=too-many-branches
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
# pylint: disable=cyclic-import # pylint: disable=cyclic-import
from ba._lobby import Lobby from ba._lobby import Lobby
@ -146,11 +145,6 @@ class Session:
# print('Would set host-session asset-reqs to:', # print('Would set host-session asset-reqs to:',
# required_asset_packages) # required_asset_packages)
if team_names is None:
team_names = ['Good Guys']
if team_colors is None:
team_colors = [(0.6, 0.2, 1.0)]
# First thing, wire up our internal engine data. # First thing, wire up our internal engine data.
self._sessiondata = _ba.register_session(self) self._sessiondata = _ba.register_session(self)
@ -197,6 +191,8 @@ class Session:
self.max_players = max_players self.max_players = max_players
if self._use_teams: if self._use_teams:
assert team_names is not None
assert team_colors is not None
for i, color in enumerate(team_colors): for i, color in enumerate(team_colors):
team = Team(team_id=self._next_team_id, team = Team(team_id=self._next_team_id,
name=GameActivity.get_team_display_string( name=GameActivity.get_team_display_string(