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

Fixed coop race (team game still need to be fixed)

Browse Source
This commit is contained in:
indev 2020-04-09 11:56:18 +03:00
parent 03204dc86d
commit e1521316cb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
assets/src/ba_data/python/bastd/game/race.py
View File

@ -285,11 +285,13 @@ class RaceGame(ba.TeamGameActivity):
ba.playsound(self._score_sound) ba.playsound(self._score_sound)
player.team.gamedata['finished'] = True player.team.gamedata['finished'] = True
assert self._timer is not None assert self._timer is not None
_cur_time = ba.time(
timeformat=ba.TimeFormat.MILLISECONDS)
_start_time = self._timer.getstarttime(
timeformat=ba.TimeFormat.MILLISECONDS)
self._last_team_time = ( self._last_team_time = (
player.team.gamedata['time']) = ( player.team.gamedata['time']) = (_cur_time -
ba.time( _start_time)
timeformat=ba.TimeFormat.MILLISECONDS) - \
self._timer.getstarttime(timeformat=ba.TimeFormat.MILLISECONDS))
self._check_end_game() self._check_end_game()
# Team has yet to finish. # Team has yet to finish.
@ -547,7 +549,10 @@ class RaceGame(ba.TeamGameActivity):
# Sort players by distance and update their ranks. # Sort players by distance and update their ranks.
p_list = [[player.gamedata['distance'], player] p_list = [[player.gamedata['distance'], player]
for player in self.players] for player in self.players]
p_list.sort(reverse=True)
p_list.sort(reverse=True)
# FIXME - need another way to sort p_list.
# It tries to compare ba.Player objects.
for i, plr in enumerate(p_list): for i, plr in enumerate(p_list):
try: try:
plr[1].gamedata['rank'] = i plr[1].gamedata['rank'] = i
@ -702,18 +707,19 @@ class RaceGame(ba.TeamGameActivity):
# final time differs from what they see onscreen by a tiny bit) # final time differs from what they see onscreen by a tiny bit)
assert self._timer is not None assert self._timer is not None
if self._timer.has_started(): if self._timer.has_started():
_cur_time = self._timer.getstarttime(
timeformat=ba.TimeFormat.MILLISECONDS)
self._timer.stop( self._timer.stop(
endtime=None if self._last_team_time is None else ( endtime=None if self._last_team_time is None else (
self._timer.getstarttime() + self._last_team_time)) _cur_time + self._last_team_time))
results = ba.TeamGameResults() results = ba.TeamGameResults()
for team in self.teams: for team in self.teams:
if team.gamedata['time'] is not None: if team.gamedata['time'] is not None:
results.set_team_score(team, team.gamedata['time']) results.set_team_score(team, team.gamedata['time'])
else: # If game have ended before we
# If game have ended before we get any result, use 'fail' screen # get any result, use 'fail' screen
results.set_team_score(team, None)
# We don't announce a winner in ffa mode since its probably been a # We don't announce a winner in ffa mode since its probably been a
# while since the first place guy crossed the finish line so it seems # while since the first place guy crossed the finish line so it seems