From 853ec6b8df7d00902d4347ef519e792a18b16d0d Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 09:24:28 +0300 Subject: [PATCH 1/7] Changed impact bomb --- assets/src/ba_data/python/bastd/actor/bomb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/actor/bomb.py b/assets/src/ba_data/python/bastd/actor/bomb.py index 30cf1b21..7ed0e05e 100644 --- a/assets/src/ba_data/python/bastd/actor/bomb.py +++ b/assets/src/ba_data/python/bastd/actor/bomb.py @@ -776,7 +776,7 @@ class Bomb(ba.Actor): self.arm_timer = ba.Timer( 0.2, ba.WeakCall(self.handlemessage, ArmMessage())) self.warn_timer = ba.Timer( - 0.001 * (fuse_time - 1700), + 0.001 * (fuse_time - 1.7), ba.WeakCall(self.handlemessage, WarnMessage())) else: From 7a7f5e74ee4649ae1916bb2951202c3edab23784 Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 18:41:47 +0300 Subject: [PATCH 2/7] "suppress_format_warning=True" added in formating remaining time If time was too big, it caused warning --- assets/src/ba_data/python/bastd/activity/coopscorescreen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/activity/coopscorescreen.py b/assets/src/ba_data/python/bastd/activity/coopscorescreen.py index b0fb56f8..326828d7 100644 --- a/assets/src/ba_data/python/bastd/activity/coopscorescreen.py +++ b/assets/src/ba_data/python/bastd/activity/coopscorescreen.py @@ -1157,7 +1157,7 @@ class CoopScoreScreen(ba.Activity): self._tournament_time_remaining = max( 0, self._tournament_time_remaining - 1) if self._tournament_time_remaining_text is not None: - val = ba.timestring(self._tournament_time_remaining, centi=False) + val = ba.timestring(self._tournament_time_remaining, suppress_format_warning=True, centi=False) self._tournament_time_remaining_text.node.text = val def _show_world_rank(self, offs_x: float) -> None: From 4891e60cf409b5b6d80da98d4434a8ba42c23389 Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 18:50:17 +0300 Subject: [PATCH 3/7] Fixed easter egg hunt --- assets/src/ba_data/python/bastd/game/easteregghunt.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/game/easteregghunt.py b/assets/src/ba_data/python/bastd/game/easteregghunt.py index 4d0abeeb..b9237279 100644 --- a/assets/src/ba_data/python/bastd/game/easteregghunt.py +++ b/assets/src/ba_data/python/bastd/game/easteregghunt.py @@ -147,7 +147,7 @@ class EasterEggHuntGame(ba.TeamGameActivity): player = (spaz.getplayer() if hasattr(spaz, 'getplayer') else None) if player and egg: - player.get_team().gamedata['score'] += 1 + player.team.gamedata['score'] += 1 # Displays a +1 (and adds to individual player score in # teams mode). @@ -186,9 +186,13 @@ class EasterEggHuntGame(ba.TeamGameActivity): xpos = random.uniform(-7.1, 6.0) ypos = random.uniform(3.5, 3.5) zpos = random.uniform(-8.2, 3.7) + def _is_exists(egg): + if egg.node is None: + return False + return egg.node.exists() # Prune dead eggs from our list. - self._eggs = [e for e in self._eggs if e] + self._eggs = [e for e in self._eggs if _is_exists(e)] # Spawn more eggs if we've got space. if len(self._eggs) < int(self._max_eggs): From 46cbb492f6586a12c32d7508451f87458cb73cbb Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 18:55:24 +0300 Subject: [PATCH 4/7] Tried to fix --- assets/src/ba_data/python/bastd/game/runaround.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/runaround.py b/assets/src/ba_data/python/bastd/game/runaround.py index 07eea612..88601355 100644 --- a/assets/src/ba_data/python/bastd/game/runaround.py +++ b/assets/src/ba_data/python/bastd/game/runaround.py @@ -1051,6 +1051,8 @@ class RunaroundGame(ba.CoopGameActivity): # Yup; that's a lot of return statements right there. # pylint: disable=too-many-return-statements assert bot.node + if not bot.is_alive() or not bot.node.exists(): + return True # FIXME: Do this in a type safe way. r_walk_speed: float = bot.r_walk_speed # type: ignore From 18133ac216a5909d0ba8c885a974cadcdf08eeaa Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 19:18:54 +0300 Subject: [PATCH 5/7] Fixed some spawnpoints (Left -> left, Right -> right etc) --- assets/src/ba_data/python/bastd/game/onslaught.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/src/ba_data/python/bastd/game/onslaught.py b/assets/src/ba_data/python/bastd/game/onslaught.py index fed8a4d2..94c53c3e 100644 --- a/assets/src/ba_data/python/bastd/game/onslaught.py +++ b/assets/src/ba_data/python/bastd/game/onslaught.py @@ -258,7 +258,7 @@ class OnslaughtGame(ba.CoopGameActivity): {'entries': [ {'type': spazbot.BomberBotStaticLite, 'point': 'turret_bottom_left'}, - {'type': spazbot.TriggerBot, 'point': 'Left'}, + {'type': spazbot.TriggerBot, 'point': 'left'}, {'type': spazbot.TriggerBot, 'point': 'left_lower'} if player_count > 1 else None, {'type': spazbot.TriggerBot, 'point': 'left_upper'} @@ -405,8 +405,8 @@ class OnslaughtGame(ba.CoopGameActivity): {'type': spazbot.ExplodeyBot, 'point': 'top_left'}, ]}, {'entries': [ - {'type': spazbot.ChargerBot, 'point': 'Left'}, - {'type': spazbot.ChargerBot, 'point': 'Right'}, + {'type': spazbot.ChargerBot, 'point': 'left'}, + {'type': spazbot.ChargerBot, 'point': 'right'}, {'type': spazbot.ChargerBot, 'point': 'right_upper_more'} if player_count > 2 else None, {'type': spazbot.BomberBotProStatic, @@ -454,9 +454,9 @@ class OnslaughtGame(ba.CoopGameActivity): {'type': spazbot.BrawlerBotProShielded, 'point': 'right_upper_more'}, {'type': 'delay', 'duration': 4.0}, - {'type': spazbot.ExplodeyBot, 'point': 'Left'}, + {'type': spazbot.ExplodeyBot, 'point': 'left'}, {'type': 'delay', 'duration': 5.0}, - {'type': spazbot.ExplodeyBot, 'point': 'Right'}, + {'type': spazbot.ExplodeyBot, 'point': 'right'}, ]}, {'entries': [ {'type': spazbot.BomberBotProStatic, From 1fe3c69551ec09f03ab31efcc6e8634f4ed512eb Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 20:10:17 +0300 Subject: [PATCH 6/7] Added type annotations for _is_exists function in EasterEggHuntGame._update --- assets/src/ba_data/python/bastd/game/easteregghunt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/game/easteregghunt.py b/assets/src/ba_data/python/bastd/game/easteregghunt.py index b9237279..e839c4d4 100644 --- a/assets/src/ba_data/python/bastd/game/easteregghunt.py +++ b/assets/src/ba_data/python/bastd/game/easteregghunt.py @@ -186,7 +186,7 @@ class EasterEggHuntGame(ba.TeamGameActivity): xpos = random.uniform(-7.1, 6.0) ypos = random.uniform(3.5, 3.5) zpos = random.uniform(-8.2, 3.7) - def _is_exists(egg): + def _is_exists(egg: Egg) -> bool: if egg.node is None: return False return egg.node.exists() From a38a6629fbad3f85415cf7c5ec2f419ce5271c21 Mon Sep 17 00:00:00 2001 From: indev Date: Tue, 7 Apr 2020 20:32:43 +0300 Subject: [PATCH 7/7] Now all tests passed --- assets/src/ba_data/python/bastd/activity/coopscorescreen.py | 4 +++- assets/src/ba_data/python/bastd/game/easteregghunt.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/activity/coopscorescreen.py b/assets/src/ba_data/python/bastd/activity/coopscorescreen.py index 326828d7..e90a65d5 100644 --- a/assets/src/ba_data/python/bastd/activity/coopscorescreen.py +++ b/assets/src/ba_data/python/bastd/activity/coopscorescreen.py @@ -1157,7 +1157,9 @@ class CoopScoreScreen(ba.Activity): self._tournament_time_remaining = max( 0, self._tournament_time_remaining - 1) if self._tournament_time_remaining_text is not None: - val = ba.timestring(self._tournament_time_remaining, suppress_format_warning=True, centi=False) + val = ba.timestring(self._tournament_time_remaining, + suppress_format_warning=True, + centi=False) self._tournament_time_remaining_text.node.text = val def _show_world_rank(self, offs_x: float) -> None: diff --git a/assets/src/ba_data/python/bastd/game/easteregghunt.py b/assets/src/ba_data/python/bastd/game/easteregghunt.py index e839c4d4..9b40f101 100644 --- a/assets/src/ba_data/python/bastd/game/easteregghunt.py +++ b/assets/src/ba_data/python/bastd/game/easteregghunt.py @@ -187,7 +187,7 @@ class EasterEggHuntGame(ba.TeamGameActivity): ypos = random.uniform(3.5, 3.5) zpos = random.uniform(-8.2, 3.7) def _is_exists(egg: Egg) -> bool: - if egg.node is None: + if egg.node is None: return False return egg.node.exists()