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

Latest public/internal sync.

Browse Source
This commit is contained in:
Eric 2024-03-01 20:11:05 -08:00
parent 1f811a2f52
commit 4a9dd247b6
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/assets/ba_data/python/baclassic/_servermode.py
View File

@ -310,9 +310,7 @@ class ServerController:
typename = ( typename = (
'teams' 'teams'
if result['playlistType'] == 'Team Tournament' if result['playlistType'] == 'Team Tournament'
else 'ffa' else 'ffa' if result['playlistType'] == 'Free-for-All' else '??'
if result['playlistType'] == 'Free-for-All'
else '??'
) )
plistname = result['playlistName'] plistname = result['playlistName']
print(f'{Clr.SBLU}Got playlist: "{plistname}" ({typename}).{Clr.RST}') print(f'{Clr.SBLU}Got playlist: "{plistname}" ({typename}).{Clr.RST}')
@ -390,14 +388,14 @@ class ServerController:
if sessiontype is bascenev1.FreeForAllSession: if sessiontype is bascenev1.FreeForAllSession:
appcfg['Free-for-All Playlist Selection'] = self._playlist_name appcfg['Free-for-All Playlist Selection'] = self._playlist_name
appcfg[ appcfg['Free-for-All Playlist Randomize'] = (
'Free-for-All Playlist Randomize' self._config.playlist_shuffle
] = self._config.playlist_shuffle )
elif sessiontype is bascenev1.DualTeamSession: elif sessiontype is bascenev1.DualTeamSession:
appcfg['Team Tournament Playlist Selection'] = self._playlist_name appcfg['Team Tournament Playlist Selection'] = self._playlist_name
appcfg[ appcfg['Team Tournament Playlist Randomize'] = (
'Team Tournament Playlist Randomize' self._config.playlist_shuffle
] = self._config.playlist_shuffle )
elif sessiontype is bascenev1.CoopSession: elif sessiontype is bascenev1.CoopSession:
classic.coop_session_args = { classic.coop_session_args = {
'campaign': self._config.coop_campaign, 'campaign': self._config.coop_campaign,

4
src/assets/ba_data/python/bascenev1/__init__.py
View File

@ -232,7 +232,9 @@ from bascenev1._settings import (
Setting, Setting,
) )
from bascenev1._session import ( from bascenev1._session import (
Session, set_player_rejoin_cooldown, set_max_players_override Session,
set_player_rejoin_cooldown,
set_max_players_override,
) )
from bascenev1._stats import PlayerScoredMessage, PlayerRecord, Stats from bascenev1._stats import PlayerScoredMessage, PlayerRecord, Stats
from bascenev1._team import SessionTeam, Team, EmptyTeam from bascenev1._team import SessionTeam, Team, EmptyTeam

16
src/assets/ba_data/python/bauiv1lib/playoptions.py
View File

@ -146,9 +146,7 @@ class PlayOptionsWindow(PopupWindow):
scale = ( scale = (
1.69 1.69
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.1 else 1.1 if uiscale is bui.UIScale.MEDIUM else 0.85
if uiscale is bui.UIScale.MEDIUM
else 0.85
) )
# Creates our _root_widget. # Creates our _root_widget.
super().__init__( super().__init__(
@ -285,9 +283,11 @@ class PlayOptionsWindow(PopupWindow):
position=(100, 200 + y_offs + y_offs2), position=(100, 200 + y_offs + y_offs2),
configkey=( configkey=(
'FFA' if self._sessiontype is bs.FreeForAllSession else 'Teams' 'FFA' if self._sessiontype is bs.FreeForAllSession else 'Teams'
) + ' Series Length', )
+ ' Series Length',
displayname=bui.Lstr( displayname=bui.Lstr(
resource=self._r + ( resource=self._r
+ (
'.pointsToWinText' '.pointsToWinText'
if self._sessiontype is bs.FreeForAllSession if self._sessiontype is bs.FreeForAllSession
else '.seriesLengthText' else '.seriesLengthText'
@ -329,9 +329,9 @@ class PlayOptionsWindow(PopupWindow):
def _cb_callback(val: bool) -> None: def _cb_callback(val: bool) -> None:
self._do_randomize_val = val self._do_randomize_val = val
cfg = bui.app.config cfg = bui.app.config
cfg[ cfg[self._pvars.config_name + ' Playlist Randomize'] = (
self._pvars.config_name + ' Playlist Randomize' self._do_randomize_val
] = self._do_randomize_val )
cfg.commit() cfg.commit()
if show_shuffle_check_box: if show_shuffle_check_box: