From ae8fc85647b2e1c7c92e813353e63048352cd77e Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 8 Apr 2020 13:02:15 +0300 Subject: [PATCH 1/4] fix football description Score 3.0 (?!) touchdowns -> Score 3 touchdowns. 'Score to Win' / 7 rounds up. --- assets/src/ba_data/python/bastd/game/football.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py index d74fd9e1..f2acc1d3 100644 --- a/assets/src/ba_data/python/bastd/game/football.py +++ b/assets/src/ba_data/python/bastd/game/football.py @@ -135,12 +135,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' From b52583db049b75e3bfdb11711fdf424d1ad0995f Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 8 Apr 2020 13:12:48 +0300 Subject: [PATCH 2/4] fix football description (co-op) --- assets/src/ba_data/python/bastd/game/football.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py index f2acc1d3..0a595fdb 100644 --- a/assets/src/ba_data/python/bastd/game/football.py +++ b/assets/src/ba_data/python/bastd/game/football.py @@ -340,12 +340,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' From ca446acbd19ccfe707c459ace6bd208f5c48261a Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 8 Apr 2020 13:20:03 +0300 Subject: [PATCH 3/4] import math for math.ceil() --- assets/src/ba_data/python/bastd/game/football.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py index 0a595fdb..6d57cd5e 100644 --- a/assets/src/ba_data/python/bastd/game/football.py +++ b/assets/src/ba_data/python/bastd/game/football.py @@ -35,6 +35,8 @@ from bastd.actor import playerspaz from bastd.actor import spazbot from bastd.actor.scoreboard import Scoreboard +import math + if TYPE_CHECKING: from typing import (Any, List, Tuple, Type, Dict, Sequence, Optional, Union) From f07adbfdf86f61c47ea69292d1785eed0b19d54f Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 8 Apr 2020 14:34:05 +0300 Subject: [PATCH 4/4] fix pylint: wrong OCimport order --- assets/src/ba_data/python/bastd/game/football.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py index 6d57cd5e..ff8b3cc6 100644 --- a/assets/src/ba_data/python/bastd/game/football.py +++ b/assets/src/ba_data/python/bastd/game/football.py @@ -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 @@ -35,8 +36,6 @@ from bastd.actor import playerspaz from bastd.actor import spazbot from bastd.actor.scoreboard import Scoreboard -import math - if TYPE_CHECKING: from typing import (Any, List, Tuple, Type, Dict, Sequence, Optional, Union)