RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-05 15:03:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #429 from Easy10781/master

Browse Source 
Own PlayerSpaz
This commit is contained in:
Eric Froemling 2022-06-22 10:51:39 -07:00 committed by GitHub
commit 69e7eca075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.md
View File

@ -32,3 +32,6 @@
### Droopy ### Droopy
- Fixes in some minigames - Fixes in some minigames
### Easy10781
- Added feature

12
assets/src/ba_data/python/ba/_gameactivity.py
View File

@ -853,12 +853,16 @@ class GameActivity(Activity[PlayerType, TeamType]):
color = player.color color = player.color
highlight = player.highlight highlight = player.highlight
playerspaztype = getattr(player, 'playerspaztype', PlayerSpaz)
if not issubclass(playerspaztype, PlayerSpaz):
playerspaztype = PlayerSpaz
light_color = _math.normalized_color(color) light_color = _math.normalized_color(color)
display_color = _ba.safecolor(color, target_intensity=0.75) display_color = _ba.safecolor(color, target_intensity=0.75)
spaz = PlayerSpaz(color=color, spaz = playerspaztype(color=color,
highlight=highlight, highlight=highlight,
character=player.character, character=player.character,
player=player) player=player)
player.actor = spaz player.actor = spaz
assert spaz.node assert spaz.node

3
assets/src/ba_data/python/ba/_player.py
View File

@ -15,6 +15,7 @@ from ba._messages import DeathType, DieMessage
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Optional, Sequence, Any, Union, Callable from typing import Optional, Sequence, Any, Union, Callable
import ba import ba
from bastd.actor.playerspaz import PlayerSpaz
# pylint: disable=invalid-name # pylint: disable=invalid-name
PlayerType = TypeVar('PlayerType', bound='ba.Player') PlayerType = TypeVar('PlayerType', bound='ba.Player')
@ -62,6 +63,8 @@ class Player(Generic[TeamType]):
color: Sequence[float] color: Sequence[float]
highlight: Sequence[float] highlight: Sequence[float]
playerspaztype: Optional[type[PlayerSpaz]]
_team: TeamType _team: TeamType
_sessionplayer: ba.SessionPlayer _sessionplayer: ba.SessionPlayer
_nodeactor: Optional[ba.NodeActor] _nodeactor: Optional[ba.NodeActor]