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

Fixed a timing issue with final cymbal on coop score screen

Browse Source
This commit is contained in:
Eric Froemling 2020-04-13 21:03:10 -07:00
parent da61158f8a
commit 0dbec6ffa4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/src/ba_data/python/bastd/activity/coopscorescreen.py
View File

@ -144,7 +144,7 @@ class CoopScoreScreen(ba.Activity):
self._fail_message: Optional[ba.Lstr] = settings['fail_message'] self._fail_message: Optional[ba.Lstr] = settings['fail_message']
assert isinstance(self._fail_message, (ba.Lstr, type(None))) assert isinstance(self._fail_message, (ba.Lstr, type(None)))
self._begin_time = ba.time() self._begin_time: Optional[float] = None
self._score_order: str self._score_order: str
if 'score_order' in settings: if 'score_order' in settings:
@ -517,6 +517,8 @@ class CoopScoreScreen(ba.Activity):
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
super().on_begin() super().on_begin()
self._begin_time = ba.time()
# Calc whether the level is complete and other stuff. # Calc whether the level is complete and other stuff.
levels = self._campaign.get_levels() levels = self._campaign.get_levels()
level = self._campaign.get_level(self._level_name) level = self._campaign.get_level(self._level_name)
@ -891,6 +893,7 @@ class CoopScoreScreen(ba.Activity):
# pylint: disable=too-many-branches # pylint: disable=too-many-branches
# pylint: disable=too-many-statements # pylint: disable=too-many-statements
# delay a bit if results come in too fast # delay a bit if results come in too fast
assert self._begin_time is not None
base_delay = max(0, 1.9 - (ba.time() - self._begin_time)) base_delay = max(0, 1.9 - (ba.time() - self._begin_time))
ts_height = 300 ts_height = 300
ts_h_offs = -550 ts_h_offs = -550
@ -1011,6 +1014,7 @@ class CoopScoreScreen(ba.Activity):
return return
with ba.Context(self): with ba.Context(self):
# Delay a bit if results come in too fast. # Delay a bit if results come in too fast.
assert self._begin_time is not None
base_delay = max(0, 2.7 - (ba.time() - self._begin_time)) base_delay = max(0, 2.7 - (ba.time() - self._begin_time))
v_offs = 20 v_offs = 20
if results is None: if results is None: