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

Minor tidying on tourney entry popup and more language updates

Browse Source
This commit is contained in:
Eric Froemling 2021-01-20 16:22:04 -08:00
parent d322673acd
commit ebaf83c502
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.efrocachemap
View File

@ -420,7 +420,7 @@
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/a9/71/9286d55c45c37877f3267850f90b", "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/a9/71/9286d55c45c37877f3267850f90b",
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/2f/09/36e691de67eb8f155449a7170861", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/2f/09/36e691de67eb8f155449a7170861",
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/fd/a8/ad50785ce206e8dc3dcc7358b173", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/fd/a8/ad50785ce206e8dc3dcc7358b173",
"assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/4f/b2/9208b315c0f27099a80167eab90b", "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/34/93/4989950b5dd035da056a0291dbb2",
"assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/0d/25/26de912f111de8189f40aeeddee6", "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/0d/25/26de912f111de8189f40aeeddee6",
"assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/44/ed/5b972fa848cffb73723533c2ccb7", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/44/ed/5b972fa848cffb73723533c2ccb7",
"assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/6a/20/57d91c24e0aeb1fe6b7d6dbbcac9", "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/6a/20/57d91c24e0aeb1fe6b7d6dbbcac9",
@ -440,7 +440,7 @@
"assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a4/01/1fcc28b303858b3d028d26516907", "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a4/01/1fcc28b303858b3d028d26516907",
"assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/20/ca/d675783cd094030a625e7ce023cf", "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/20/ca/d675783cd094030a625e7ce023cf",
"assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/0a/84/bbb6ed2abf66509406f534cbbb52", "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/0a/84/bbb6ed2abf66509406f534cbbb52",
"assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/e4/81/d3fdd1931b4a1e8b17affc95729c", "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/f8/e6/773d3da1cbdb2215956f9d99c348",
"assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/29/72/bcf75316f71373a47739a72ad6da", "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/29/72/bcf75316f71373a47739a72ad6da",
"assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/3d/ba/7f4c8846babc5ef59187e87efa3d", "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/3d/ba/7f4c8846babc5ef59187e87efa3d",
"assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf", "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf",

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
### 1.5.30 (20263) ### 1.5.30 (20263)
- The meta subsystem now enables new plugins by default in headless builds. - The meta subsystem now enables new plugins by default in headless builds.
- Added option to save party in Manual tab - Added option to save party in Manual tab
- Slight tidying on the tourney entry popup
### 1.5.29 (20246) ### 1.5.29 (20246)
- Exposed ba method/class initing in public C++ layer. - Exposed ba method/class initing in public C++ layer.

44
assets/src/ba_data/python/bastd/ui/tournamententry.py
View File

@ -27,7 +27,6 @@ class TournamentEntryWindow(popup.PopupWindow):
on_close_call: Callable[[], Any] = None): on_close_call: Callable[[], Any] = None):
# Needs some tidying. # Needs some tidying.
# pylint: disable=too-many-branches # pylint: disable=too-many-branches
# pylint: disable=too-many-locals
# pylint: disable=too-many-statements # pylint: disable=too-many-statements
ba.set_analytics_screen('Tournament Entry Window') ba.set_analytics_screen('Tournament Entry Window')
@ -70,7 +69,7 @@ class TournamentEntryWindow(popup.PopupWindow):
self._tournament_activity = tournament_activity self._tournament_activity = tournament_activity
self._width = 340 self._width = 340
self._height = 220 self._height = 225
bg_color = (0.5, 0.4, 0.6) bg_color = (0.5, 0.4, 0.6)
@ -94,8 +93,8 @@ class TournamentEntryWindow(popup.PopupWindow):
x_offs = 0 if self._do_ad_btn else 85 x_offs = 0 if self._do_ad_btn else 85
self._cancel_button = ba.buttonwidget(parent=self.root_widget, self._cancel_button = ba.buttonwidget(parent=self.root_widget,
position=(20, self._height - 30), position=(20, self._height - 34),
size=(50, 50), size=(60, 60),
scale=0.5, scale=0.5,
label='', label='',
color=bg_color, color=bg_color,
@ -112,7 +111,7 @@ class TournamentEntryWindow(popup.PopupWindow):
v_align='center', v_align='center',
scale=0.6, scale=0.6,
text=ba.Lstr(resource='tournamentEntryText'), text=ba.Lstr(resource='tournamentEntryText'),
maxwidth=200, maxwidth=180,
color=(1, 1, 1, 0.4)) color=(1, 1, 1, 0.4))
btn = self._pay_with_tickets_button = ba.buttonwidget( btn = self._pay_with_tickets_button = ba.buttonwidget(
@ -221,18 +220,19 @@ class TournamentEntryWindow(popup.PopupWindow):
if ba.app.allow_ticket_purchases: if ba.app.allow_ticket_purchases:
self._get_tickets_button = ba.buttonwidget( self._get_tickets_button = ba.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
position=(self._width - 190 + 110, 15), position=(self._width - 190 + 125, self._height - 34),
autoselect=True, autoselect=True,
scale=0.6, scale=0.5,
size=(120, 60), size=(120, 60),
textcolor=(0.2, 1, 0.2), textcolor=(0.2, 1, 0.2),
label=ba.charstr(ba.SpecialChar.TICKET), label=ba.charstr(ba.SpecialChar.TICKET),
color=(0.6, 0.4, 0.7), color=(0.65, 0.5, 0.8),
on_activate_call=self._on_get_tickets_press) on_activate_call=self._on_get_tickets_press)
else: else:
self._ticket_count_text = ba.textwidget( self._ticket_count_text = ba.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(self._width - 190 + 110, 15), scale=0.5,
position=(self._width - 190 + 125, self._height - 34),
color=(0.2, 1, 0.2), color=(0.2, 1, 0.2),
h_align='center', h_align='center',
v_align='center') v_align='center')
@ -245,20 +245,22 @@ class TournamentEntryWindow(popup.PopupWindow):
# Let's also ask the server for info about this tournament # Let's also ask the server for info about this tournament
# (time remaining, etc) so we can show the user time remaining, # (time remaining, etc) so we can show the user time remaining,
# disallow entry if time has run out, etc. # disallow entry if time has run out, etc.
xoffs = 104 if ba.app.ui.use_toolbars else 0 # xoffs = 104 if ba.app.ui.use_toolbars else 0
self._time_remaining_text = ba.textwidget(parent=self.root_widget, self._time_remaining_text = ba.textwidget(
position=(70 + xoffs, 23), parent=self.root_widget,
size=(0, 0), position=(self._width / 2, 28),
h_align='center', size=(0, 0),
v_align='center', h_align='center',
text='-', v_align='center',
scale=0.65, text='-',
maxwidth=100, scale=0.65,
flatness=1.0, maxwidth=100,
color=(0.7, 0.7, 0.7)) flatness=1.0,
color=(0.7, 0.7, 0.7),
)
self._time_remaining_label_text = ba.textwidget( self._time_remaining_label_text = ba.textwidget(
parent=self.root_widget, parent=self.root_widget,
position=(70 + xoffs, 40), position=(self._width / 2, 45),
size=(0, 0), size=(0, 0),
h_align='center', h_align='center',
v_align='center', v_align='center',