Merge pull request #8 from Dliwk/master

Fix football description
This commit is contained in:
Eric Froemling 2020-04-08 12:10:09 -07:00 committed by GitHub
commit 0852be3f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,6 +27,7 @@ from __future__ import annotations
import random
from typing import TYPE_CHECKING
import math
import ba
from bastd.actor import bomb as stdbomb
@ -135,12 +136,17 @@ class FootballTeamGame(ba.TeamGameActivity):
def get_instance_description(self) -> Union[str, Sequence]:
touchdowns = self.settings['Score to Win'] / 7
# NOTE: if use just touchdowns = self.settings['Score to Win'] // 7
# and we will need to score, for example, 27 points,
# we will be required to score 3 (not 4) goals ..
touchdowns = math.ceil(touchdowns)
if touchdowns > 1:
return 'Score ${ARG1} touchdowns.', touchdowns
return 'Score a touchdown.'
def get_instance_scoreboard_description(self) -> Union[str, Sequence]:
touchdowns = self.settings['Score to Win'] / 7
touchdowns = math.ceil(touchdowns)
if touchdowns > 1:
return 'score ${ARG1} touchdowns', touchdowns
return 'score a touchdown'
@ -335,12 +341,14 @@ class FootballCoopGame(ba.CoopGameActivity):
def get_instance_description(self) -> Union[str, Sequence]:
touchdowns = self._score_to_win / 7
touchdowns = math.ceil(touchdowns)
if touchdowns > 1:
return 'Score ${ARG1} touchdowns.', touchdowns
return 'Score a touchdown.'
def get_instance_scoreboard_description(self) -> Union[str, Sequence]:
touchdowns = self._score_to_win / 7
touchdowns = math.ceil(touchdowns)
if touchdowns > 1:
return 'score ${ARG1} touchdowns', touchdowns
return 'score a touchdown'