From b2652a2748c151683d49340c1e6914de7a149a8b Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:22:11 +0900 Subject: [PATCH 01/14] Update _gameactivity.py --- assets/src/ba_data/python/ba/_gameactivity.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index 419eae0f..18a09b94 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -855,10 +855,10 @@ class GameActivity(Activity[PlayerType, TeamType]): light_color = _math.normalized_color(color) display_color = _ba.safecolor(color, target_intensity=0.75) - spaz = PlayerSpaz(color=color, - highlight=highlight, - character=player.character, - player=player) + spaz = player.playerspaztype(color=color, + highlight=highlight, + character=player.character, + player=player) player.actor = spaz assert spaz.node From 68a388c1d5cc69f23391181d5c6296642775cdcd Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:24:52 +0900 Subject: [PATCH 02/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 965213dd..86818f30 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -15,6 +15,7 @@ from ba._messages import DeathType, DieMessage if TYPE_CHECKING: from typing import Optional, Sequence, Any, Union, Callable import ba + from bastd.actor.playerspaz import PlayerSpaz # pylint: disable=invalid-name PlayerType = TypeVar('PlayerType', bound='ba.Player') @@ -62,6 +63,8 @@ class Player(Generic[TeamType]): color: Sequence[float] highlight: Sequence[float] + playerspaztype: type['PlayerSpaz'] + _team: TeamType _sessionplayer: ba.SessionPlayer _nodeactor: Optional[ba.NodeActor] From c82f6ab88972ba4e84a09095bf44b1244c0ceee6 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:30:04 +0900 Subject: [PATCH 03/14] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 79d65c64..ae0de83b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -32,3 +32,6 @@ ### Droopy - Fixes in some minigames + +### Easy10781 +- Added feature From 7516211136f6498910d33be9f1ffd3f3d85546b2 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:44:21 +0900 Subject: [PATCH 04/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 86818f30..5c77609c 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -96,6 +96,7 @@ class Player(Generic[TeamType]): f' in the class decorator.') self.actor = None + self.playerspaztype = None self.character = '' self._nodeactor: Optional[ba.NodeActor] = None self._sessionplayer = sessionplayer From 58f222d8dc0a8c155fc8f9d936fabb1efb30a957 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:46:34 +0900 Subject: [PATCH 05/14] Update _gameactivity.py --- assets/src/ba_data/python/ba/_gameactivity.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index 18a09b94..86b2f605 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -852,6 +852,10 @@ class GameActivity(Activity[PlayerType, TeamType]): name = player.getname() color = player.color highlight = player.highlight + + playerspaztype = player.playerspaztype + if playerspaztype is None: + playerspaztype = PlayerSpaz light_color = _math.normalized_color(color) display_color = _ba.safecolor(color, target_intensity=0.75) From b111d4ed66a5a16d66dec415e5d557c0188a2bc2 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:47:17 +0900 Subject: [PATCH 06/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 5c77609c..95bb4904 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -63,7 +63,7 @@ class Player(Generic[TeamType]): color: Sequence[float] highlight: Sequence[float] - playerspaztype: type['PlayerSpaz'] + playerspaztype: Optional[type['PlayerSpaz']] _team: TeamType _sessionplayer: ba.SessionPlayer From 9215e5afd0c9e678838e873d56e70b14171a80fa Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:48:13 +0900 Subject: [PATCH 07/14] Update _gameactivity.py --- assets/src/ba_data/python/ba/_gameactivity.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index 86b2f605..00a337c1 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -859,10 +859,10 @@ class GameActivity(Activity[PlayerType, TeamType]): light_color = _math.normalized_color(color) display_color = _ba.safecolor(color, target_intensity=0.75) - spaz = player.playerspaztype(color=color, - highlight=highlight, - character=player.character, - player=player) + spaz = playerspaztype(color=color, + highlight=highlight, + character=player.character, + player=player) player.actor = spaz assert spaz.node From 5d8f8ec81950938921a326ee49e7e89b2d1fbc38 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:53:23 +0900 Subject: [PATCH 08/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 95bb4904..88c717e9 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -96,7 +96,7 @@ class Player(Generic[TeamType]): f' in the class decorator.') self.actor = None - self.playerspaztype = None + self.playerspaztype = getattr(self, 'playerspaztype'): self.character = '' self._nodeactor: Optional[ba.NodeActor] = None self._sessionplayer = sessionplayer From ee4b797d71df8c472840acceba581d49d611a853 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:57:14 +0900 Subject: [PATCH 09/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 88c717e9..f6f2ba49 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -96,7 +96,10 @@ class Player(Generic[TeamType]): f' in the class decorator.') self.actor = None - self.playerspaztype = getattr(self, 'playerspaztype'): + try: + self.playerspaztype = getattr(self, 'playerspaztype') + except AttributeError: + self.playerspaztype = None self.character = '' self._nodeactor: Optional[ba.NodeActor] = None self._sessionplayer = sessionplayer From 52d0c97b772831f87c38f14e68a448c43a0c4acf Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 22:07:46 +0900 Subject: [PATCH 10/14] Fix ci --- assets/src/ba_data/python/ba/_player.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index f6f2ba49..653b5f5b 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -63,7 +63,7 @@ class Player(Generic[TeamType]): color: Sequence[float] highlight: Sequence[float] - playerspaztype: Optional[type['PlayerSpaz']] + playerspaztype: Optional[type[PlayerSpaz]] _team: TeamType _sessionplayer: ba.SessionPlayer From 8aae99fa48255d3ebd809c32c31826a32c23a018 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Thu, 16 Jun 2022 22:14:53 +0900 Subject: [PATCH 11/14] Try fix ci --- assets/src/ba_data/python/ba/_gameactivity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index 00a337c1..518c59ef 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -852,7 +852,7 @@ class GameActivity(Activity[PlayerType, TeamType]): name = player.getname() color = player.color highlight = player.highlight - + playerspaztype = player.playerspaztype if playerspaztype is None: playerspaztype = PlayerSpaz From ed731c0a4a108613a5a7650514e607fc732f1a5a Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Fri, 17 Jun 2022 09:02:19 +0900 Subject: [PATCH 12/14] Update _gameactivity.py --- assets/src/ba_data/python/ba/_gameactivity.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index 518c59ef..eb5748eb 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -853,8 +853,8 @@ class GameActivity(Activity[PlayerType, TeamType]): color = player.color highlight = player.highlight - playerspaztype = player.playerspaztype - if playerspaztype is None: + playerspaztype = getattr(player, 'playerspaztype', None) + if not issubclass(playerspaztype, PlayerSpaz): playerspaztype = PlayerSpaz light_color = _math.normalized_color(color) From c059ddac1c3beebabfcda51cf58fa8fb7d38a5d6 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Fri, 17 Jun 2022 09:03:00 +0900 Subject: [PATCH 13/14] Update _player.py --- assets/src/ba_data/python/ba/_player.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py index 653b5f5b..04a4673a 100644 --- a/assets/src/ba_data/python/ba/_player.py +++ b/assets/src/ba_data/python/ba/_player.py @@ -96,10 +96,6 @@ class Player(Generic[TeamType]): f' in the class decorator.') self.actor = None - try: - self.playerspaztype = getattr(self, 'playerspaztype') - except AttributeError: - self.playerspaztype = None self.character = '' self._nodeactor: Optional[ba.NodeActor] = None self._sessionplayer = sessionplayer From ee3eb6c944d33b4baa107633c7702481df3a03c8 Mon Sep 17 00:00:00 2001 From: Sasha <82557920+Easy10781@users.noreply.github.com> Date: Fri, 17 Jun 2022 09:07:58 +0900 Subject: [PATCH 14/14] Try fix ci --- assets/src/ba_data/python/ba/_gameactivity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py index eb5748eb..2580e4c0 100644 --- a/assets/src/ba_data/python/ba/_gameactivity.py +++ b/assets/src/ba_data/python/ba/_gameactivity.py @@ -853,7 +853,7 @@ class GameActivity(Activity[PlayerType, TeamType]): color = player.color highlight = player.highlight - playerspaztype = getattr(player, 'playerspaztype', None) + playerspaztype = getattr(player, 'playerspaztype', PlayerSpaz) if not issubclass(playerspaztype, PlayerSpaz): playerspaztype = PlayerSpaz