From fe606ced907541be1b93e9674a9874e632b66b9c Mon Sep 17 00:00:00 2001 From: indev Date: Thu, 9 Apr 2020 19:36:35 +0300 Subject: [PATCH 1/8] Fix elimination --- assets/src/ba_data/python/bastd/game/elimination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/game/elimination.py b/assets/src/ba_data/python/bastd/game/elimination.py index f17a116c..89700e30 100644 --- a/assets/src/ba_data/python/bastd/game/elimination.py +++ b/assets/src/ba_data/python/bastd/game/elimination.py @@ -59,7 +59,7 @@ class Icon(ba.Actor): icon = player.get_icon() self.node = ba.newnode('image', - owner=self, + delegate=self, attrs={ 'texture': icon['texture'], 'tint_texture': icon['tint_texture'], From 193cabf3c4bc1d6a1776ff1a36769e520eb412bb Mon Sep 17 00:00:00 2001 From: indev Date: Sat, 11 Apr 2020 11:15:46 +0300 Subject: [PATCH 2/8] Fix some spawn-points (Top -> top, Bottom -> bottom) --- assets/src/ba_data/python/bastd/game/onslaught.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/game/onslaught.py b/assets/src/ba_data/python/bastd/game/onslaught.py index d2379e7c..dca402c2 100644 --- a/assets/src/ba_data/python/bastd/game/onslaught.py +++ b/assets/src/ba_data/python/bastd/game/onslaught.py @@ -430,11 +430,11 @@ class OnslaughtGame(ba.CoopGameActivity): {'entries': [ {'type': spazbot.ChargerBotProShielded, 'point': 'bottom_right'}, - {'type': spazbot.ChargerBotProShielded, 'point': 'Bottom'} + {'type': spazbot.ChargerBotProShielded, 'point': 'bottom'} if player_count > 2 else None, {'type': spazbot.ChargerBotProShielded, 'point': 'bottom_left'}, - {'type': spazbot.ChargerBotProShielded, 'point': 'Top'} + {'type': spazbot.ChargerBotProShielded, 'point': 'top'} if hard else None, {'type': spazbot.BomberBotProStatic, 'point': 'turret_top_middle'}, From 3029979a592151648cd1c6366b48b222c123ab01 Mon Sep 17 00:00:00 2001 From: indev Date: Sat, 11 Apr 2020 12:08:58 +0300 Subject: [PATCH 3/8] Hockey puck is visible now --- assets/src/ba_data/python/bastd/game/hockey.py | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/src/ba_data/python/bastd/game/hockey.py b/assets/src/ba_data/python/bastd/game/hockey.py index 7fae6d79..95705d6d 100644 --- a/assets/src/ba_data/python/bastd/game/hockey.py +++ b/assets/src/ba_data/python/bastd/game/hockey.py @@ -69,6 +69,7 @@ class Puck(ba.Actor): 'position': self._spawn_pos, 'materials': pmats }) + ba.animate(self.node, "model_scale", {0: 0, 0.2: 1.3, 0.26: 1}) def handlemessage(self, msg: Any) -> Any: if isinstance(msg, ba.DieMessage): From 3b50b6ee9dd271133ce685cbb0f5815613b488a7 Mon Sep 17 00:00:00 2001 From: indev Date: Sat, 11 Apr 2020 12:11:21 +0300 Subject: [PATCH 4/8] Fixed one minor exception --- assets/src/ba_data/python/bastd/game/capturetheflag.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py index c32526f9..c23a5dd3 100644 --- a/assets/src/ba_data/python/bastd/game/capturetheflag.py +++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py @@ -290,6 +290,8 @@ class CaptureTheFlagGame(ba.TeamGameActivity): if (not team.gamedata['home_flag_at_base'] and flag.held_count == 0): time_out_counting_down = True + if flag.time_out_respawn_time is None: + flag.reset_return_times() flag.time_out_respawn_time -= 1 if flag.time_out_respawn_time <= 0: flag.handlemessage(ba.DieMessage()) From 17273e90d85a7dc12a8597ea57f0fb4aff783875 Mon Sep 17 00:00:00 2001 From: indev Date: Sat, 11 Apr 2020 12:23:25 +0300 Subject: [PATCH 5/8] Mypy tests passed --- assets/src/ba_data/python/bastd/game/capturetheflag.py | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py index c23a5dd3..c123eaa7 100644 --- a/assets/src/ba_data/python/bastd/game/capturetheflag.py +++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py @@ -292,6 +292,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity): time_out_counting_down = True if flag.time_out_respawn_time is None: flag.reset_return_times() + assert flag.time_out_respawn_time is not None flag.time_out_respawn_time -= 1 if flag.time_out_respawn_time <= 0: flag.handlemessage(ba.DieMessage()) From f6802dfed0f15510942620cff6ca4b6282e9ffb9 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Sat, 11 Apr 2020 15:02:46 +0300 Subject: [PATCH 6/8] fix ffa session --- assets/src/ba_data/python/ba/_session.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py index 52671049..10d43c76 100644 --- a/assets/src/ba_data/python/ba/_session.py +++ b/assets/src/ba_data/python/ba/_session.py @@ -146,11 +146,6 @@ class Session: # print('Would set host-session asset-reqs to:', # required_asset_packages) - if team_names is None: - team_names = ['Good Guys'] - if team_colors is None: - team_colors = [(0.6, 0.2, 1.0)] - # First thing, wire up our internal engine data. self._sessiondata = _ba.register_session(self) From 337045c9f84d10027f108f76f6091f1f983f38a5 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Sat, 11 Apr 2020 15:35:45 +0300 Subject: [PATCH 7/8] type-checking --- assets/src/ba_data/python/ba/_session.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py index 10d43c76..c5f774ca 100644 --- a/assets/src/ba_data/python/ba/_session.py +++ b/assets/src/ba_data/python/ba/_session.py @@ -192,6 +192,8 @@ class Session: self.max_players = max_players if self._use_teams: + assert team_names is not None + assert team_colors is not None for i, color in enumerate(team_colors): team = Team(team_id=self._next_team_id, name=GameActivity.get_team_display_string( From 8f9a7c4ac61e410d085159d4fff366c12b679772 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Sat, 11 Apr 2020 15:54:58 +0300 Subject: [PATCH 8/8] enable pylint: too-many-branches --- assets/src/ba_data/python/ba/_session.py | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py index c5f774ca..b1b56d4a 100644 --- a/assets/src/ba_data/python/ba/_session.py +++ b/assets/src/ba_data/python/ba/_session.py @@ -97,7 +97,6 @@ class Session: instances; one for each ba.Activity the session may potentially run. """ # pylint: disable=too-many-statements - # pylint: disable=too-many-branches # pylint: disable=too-many-locals # pylint: disable=cyclic-import from ba._lobby import Lobby