mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-25 08:23:35 +08:00
commit
69e7eca075
@ -32,3 +32,6 @@
|
||||
|
||||
### Droopy
|
||||
- Fixes in some minigames
|
||||
|
||||
### Easy10781
|
||||
- Added feature
|
||||
|
||||
@ -853,12 +853,16 @@ class GameActivity(Activity[PlayerType, TeamType]):
|
||||
color = player.color
|
||||
highlight = player.highlight
|
||||
|
||||
playerspaztype = getattr(player, 'playerspaztype', PlayerSpaz)
|
||||
if not issubclass(playerspaztype, PlayerSpaz):
|
||||
playerspaztype = PlayerSpaz
|
||||
|
||||
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 = playerspaztype(color=color,
|
||||
highlight=highlight,
|
||||
character=player.character,
|
||||
player=player)
|
||||
|
||||
player.actor = spaz
|
||||
assert spaz.node
|
||||
|
||||
@ -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: Optional[type[PlayerSpaz]]
|
||||
|
||||
_team: TeamType
|
||||
_sessionplayer: ba.SessionPlayer
|
||||
_nodeactor: Optional[ba.NodeActor]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user