' in case anyone asks.
- self._player.set_name(
- _lang.Lstr(resource='choosingPlayerText').evaluate(), real=False)
+ def _select_initial_profile(self) -> int:
+ app = _ba.app
+ profilenames = self._profilenames
+ inputdevice = self._player.inputdevice
- self.update_from_player_profiles()
- self.update_position()
- self._inited = True
+ # If we've got a set profile name for this device, work backwards
+ # from that to get our index.
+ dprofilename = (app.config.get('Default Player Profiles',
+ {}).get(inputdevice.name + ' ' +
+ inputdevice.unique_identifier))
+ if dprofilename is not None and dprofilename in profilenames:
+ # If we got '__account__' and its local and we haven't marked
+ # anyone as the 'account profile' device yet, mark this guy as
+ # it. (prevents the next joiner from getting the account
+ # profile too).
+ if (dprofilename == '__account__'
+ and not inputdevice.is_remote_client
+ and app.lobby_account_profile_device_id is None):
+ app.lobby_account_profile_device_id = inputdevice.id
+ return profilenames.index(dprofilename)
+
+ # We want to mark the first local input-device in the game
+ # as the 'account profile' device.
+ if (not inputdevice.is_remote_client
+ and not inputdevice.is_controller_app):
+ if (app.lobby_account_profile_device_id is None
+ and '__account__' in profilenames):
+ app.lobby_account_profile_device_id = inputdevice.id
+
+ # If this is the designated account-profile-device, try to default
+ # to the account profile.
+ if (inputdevice.id == app.lobby_account_profile_device_id
+ and '__account__' in profilenames):
+ return profilenames.index('__account__')
+
+ # If this is the controller app, it defaults to using a random
+ # profile (since we can pull the random name from the app).
+ if inputdevice.is_controller_app and '_random' in profilenames:
+ return profilenames.index('_random')
+
+ # If its a client connection, for now just force
+ # the account profile if possible.. (need to provide a
+ # way for clients to specify/remember their default
+ # profile on remote servers that do not already know them).
+ if inputdevice.is_remote_client and '__account__' in profilenames:
+ return profilenames.index('__account__')
+
+ # Cycle through our non-random profiles once; after
+ # that, everyone gets random.
+ while (app.lobby_random_profile_index < len(profilenames)
+ and profilenames[app.lobby_random_profile_index]
+ in ('_random', '__account__', '_edit')):
+ app.lobby_random_profile_index += 1
+ if app.lobby_random_profile_index < len(profilenames):
+ profileindex = app.lobby_random_profile_index
+ app.lobby_random_profile_index += 1
+ return profileindex
+ assert '_random' in profilenames
+ return profilenames.index('_random')
@property
def player(self) -> ba.SessionPlayer:
@@ -353,44 +333,39 @@ class Chooser:
"""The chooser's ba.Lobby."""
lobby = self._lobby()
if lobby is None:
- from ba import _error
- raise _error.NotFoundError('Lobby does not exist.')
+ raise NotFoundError('Lobby does not exist.')
return lobby
def get_lobby(self) -> Optional[ba.Lobby]:
"""Return this chooser's lobby if it still exists; otherwise None."""
return self._lobby()
- def update_from_player_profiles(self) -> None:
- """Set character based on profile; otherwise use pre-picked random."""
- try:
- from ba import _profile
-
- # Store the name even though we usually use index (in case
- # the profile list changes)
- self._profilename = self._profilenames[self._profileindex]
- character = self.profiles[self._profilename]['character']
+ def update_from_profile(self) -> None:
+ """Set character/colors based on the current profile."""
+ self._profilename = self._profilenames[self._profileindex]
+ if self._profilename == '_edit':
+ pass
+ elif self._profilename == '_random':
+ self._character_index = self._random_character_index
+ self._color = self._random_color
+ self._highlight = self._random_highlight
+ else:
+ character = self._profiles[self._profilename]['character']
# At the moment we're not properly pulling the list
# of available characters from clients, so profiles might use a
# character not in their list. For now, just go ahead and add
# a character name to their list as long as we're aware of it.
# This just means they won't always be able to override their
- # character to others they own, but profile characters should work
- # (and we validate profiles on the master server so no exploit
- # opportunities)
- if (character not in self.character_names
+ # character to others they own, but profile characters
+ # should work (and we validate profiles on the master server
+ # so no exploit opportunities)
+ if (character not in self._character_names
and character in _ba.app.spaz_appearances):
- self.character_names.append(character)
- self.character_index = self.character_names.index(character)
- self._color, self._highlight = (_profile.get_player_profile_colors(
- self._profilename, profiles=self.profiles))
- except Exception:
- # FIXME: Should never use top level Exception for logic; only
- # error catching (and they should always be logged).
- self.character_index = self._random_character_index
- self._color = self._random_color
- self._highlight = self._random_highlight
+ self._character_names.append(character)
+ self._character_index = self._character_names.index(character)
+ self._color, self._highlight = (get_player_profile_colors(
+ self._profilename, profiles=self._profiles))
self._update_icon()
self._update_text()
@@ -401,52 +376,51 @@ class Chooser:
# Re-construct our profile index and other stuff since the profile
# list might have changed.
- input_device = self._player.get_input_device()
+ input_device = self._player.inputdevice
is_remote = input_device.is_remote_client
is_test_input = input_device.name.startswith('TestInput')
# Pull this player's list of unlocked characters.
if is_remote:
- # FIXME: Pull this from remote player (but make sure to
- # filter it to ones we've got).
- self.character_names = ['Spaz']
+ # TODO: Pull this from the remote player.
+ # (but make sure to filter it to the ones we've got).
+ self._character_names = ['Spaz']
else:
- self.character_names = self.lobby.character_names_local_unlocked
+ self._character_names = self.lobby.character_names_local_unlocked
# If we're a local player, pull our local profiles from the config.
# Otherwise ask the remote-input-device for its profile list.
if is_remote:
- self.profiles = input_device.get_player_profiles()
+ self._profiles = input_device.get_player_profiles()
else:
- self.profiles = app.config.get('Player Profiles', {})
+ self._profiles = app.config.get('Player Profiles', {})
# These may have come over the wire from an older
# (non-unicode/non-json) version.
# Make sure they conform to our standards
# (unicode strings, no tuples, etc)
- self.profiles = json_prep(self.profiles)
+ self._profiles = json_prep(self._profiles)
# Filter out any characters we're unaware of.
- for profile in list(self.profiles.items()):
+ for profile in list(self._profiles.items()):
if profile[1].get('character', '') not in app.spaz_appearances:
profile[1]['character'] = 'Spaz'
- # Add in a random one so we're ok even if there's no
- # user-created profiles.
- self.profiles['_random'] = {}
+ # Add in a random one so we're ok even if there's no user profiles.
+ self._profiles['_random'] = {}
# In kiosk mode we disable account profiles to force random.
if app.kiosk_mode:
- if '__account__' in self.profiles:
- del self.profiles['__account__']
+ if '__account__' in self._profiles:
+ del self._profiles['__account__']
# For local devices, add it an 'edit' option which will pop up
# the profile window.
if not is_remote and not is_test_input and not app.kiosk_mode:
- self.profiles['_edit'] = {}
+ self._profiles['_edit'] = {}
# Build a sorted name list we can iterate through.
- self._profilenames = list(self.profiles.keys())
+ self._profilenames = list(self._profiles.keys())
self._profilenames.sort(key=lambda x: x.lower())
if self._profilename in self._profilenames:
@@ -457,90 +431,66 @@ class Chooser:
def update_position(self) -> None:
"""Update this chooser's position."""
- from ba import _gameutils
- # Hmmm this shouldn't be happening.
- if not self._text_node:
- print('Error: chooser text nonexistent..')
- import traceback
- traceback.print_stack()
- return
+ assert self._text_node
spacing = 350
teams = self.lobby.teams
offs = (spacing * -0.5 * len(teams) +
spacing * self._selected_team_index + 250)
if len(teams) > 1:
offs -= 35
- _gameutils.animate_array(self._text_node, 'position', 2, {
+ animate_array(self._text_node, 'position', 2, {
0: self._text_node.position,
0.1: (-100 + offs, self._vpos + 23)
})
- _gameutils.animate_array(self.icon, 'position', 2, {
+ animate_array(self.icon, 'position', 2, {
0: self.icon.position,
0.1: (-130 + offs, self._vpos + 22)
})
def get_character_name(self) -> str:
"""Return the selected character name."""
- return self.character_names[self.character_index]
+ return self._character_names[self._character_index]
def _do_nothing(self) -> None:
"""Does nothing! (hacky way to disable callbacks)"""
def _get_name(self, full: bool = False) -> str:
- # FIXME: Needs cleanup.
- # pylint: disable=too-many-branches
- from ba._lang import Lstr
- from ba._enums import SpecialChar
name_raw = name = self._profilenames[self._profileindex]
clamp = False
if name == '_random':
- input_device: Optional[ba.InputDevice]
try:
- input_device = self._player.get_input_device()
+ name = (self._player.inputdevice.get_default_player_name())
except Exception:
- input_device = None
- if input_device is not None:
- name = input_device.get_default_player_name()
- else:
+ print_exception('Error getting _random chooser name.')
name = 'Invalid'
- if not full:
- clamp = True
+ clamp = not full
elif name == '__account__':
try:
- input_device = self._player.get_input_device()
+ name = self._player.inputdevice.get_account_name(full)
except Exception:
- input_device = None
- if input_device is not None:
- name = input_device.get_account_name(full)
- else:
+ print_exception('Error getting account name for chooser.')
name = 'Invalid'
- if not full:
- clamp = True
+ clamp = not full
elif name == '_edit':
- # FIXME: This causes problems as an Lstr, but its ok to
- # explicitly translate for now since this is only shown on the
- # host. (also should elaborate; don't remember what problems this
- # caused)
+ # Explicitly flattening this to a str; it's only relevant on
+ # the host so that's ok.
name = (Lstr(
resource='createEditPlayerText',
fallback_resource='editProfileWindow.titleNewText').evaluate())
else:
-
# If we have a regular profile marked as global with an icon,
# use it (for full only).
if full:
try:
- if self.profiles[name_raw].get('global', False):
- icon = (self.profiles[name_raw]['icon']
- if 'icon' in self.profiles[name_raw] else
+ if self._profiles[name_raw].get('global', False):
+ icon = (self._profiles[name_raw]['icon']
+ if 'icon' in self._profiles[name_raw] else
_ba.charstr(SpecialChar.LOGO))
name = icon + name
except Exception:
- from ba import _error
- _error.print_exception('Error applying global icon')
+ print_exception('Error applying global icon.')
else:
-
# We now clamp non-full versions of names so there's at
# least some hope of reading them in-game.
clamp = True
@@ -561,9 +511,9 @@ class Chooser:
with _ba.Context('ui'):
pbrowser.ProfileBrowserWindow(in_main_menu=False)
- # give their input-device UI ownership too
+ # Give their input-device UI ownership too
# (prevent someone else from snatching it in crowded games)
- _ba.set_ui_input_device(self._player.get_input_device())
+ _ba.set_ui_input_device(self._player.inputdevice)
return
if not ready:
@@ -597,7 +547,7 @@ class Chooser:
Call(self.handlemessage, ChangeMessage('ready', 0)))
# Store the last profile picked by this input for reuse.
- input_device = self._player.get_input_device()
+ input_device = self._player.inputdevice
name = input_device.name
unique_id = input_device.unique_identifier
device_profiles = _ba.app.config.setdefault(
@@ -607,7 +557,8 @@ class Chooser:
# to random; in that case we'll want to start picking up custom
# profiles if/when one is made so keep our setting cleared.
special = ('_random', '_edit', '__account__')
- have_custom_profiles = any(p not in special for p in self.profiles)
+ have_custom_profiles = any(p not in special
+ for p in self._profiles)
profilekey = name + ' ' + unique_id
if profilename == '_random' and not have_custom_profiles:
@@ -643,7 +594,7 @@ class Chooser:
# choosers that have been marked as ready.
team_player_counts = {}
for team in teams:
- team_player_counts[team.id] = (len(team.players))
+ team_player_counts[team.id] = len(team.players)
for chooser in lobby.choosers:
if chooser.ready:
team_player_counts[chooser.get_team().id] += 1
@@ -668,15 +619,14 @@ class Chooser:
# TODO: should handle this at the engine layer so this is unnecessary.
def _handle_repeat_message_attack(self) -> None:
now = _ba.time()
- count = self.last_change[1]
- if now - self.last_change[0] < QUICK_CHANGE_INTERVAL:
+ count = self._last_change[1]
+ if now - self._last_change[0] < QUICK_CHANGE_INTERVAL:
count += 1
if count > MAX_QUICK_CHANGE_COUNT:
- _ba.disconnect_client(
- self._player.get_input_device().client_id)
- elif now - self.last_change[0] > QUICK_CHANGE_RESET_INTERVAL:
+ _ba.disconnect_client(self._player.inputdevice.client_id)
+ elif now - self._last_change[0] > QUICK_CHANGE_RESET_INTERVAL:
count = 0
- self.last_change = (now, count)
+ self._last_change = (now, count)
def handlemessage(self, msg: Any) -> Any:
"""Standard generic message handler."""
@@ -686,13 +636,11 @@ class Chooser:
# If we've been removed from the lobby, ignore this stuff.
if self._dead:
- from ba import _error
- _error.print_error('chooser got ChangeMessage after dying')
+ print_error('chooser got ChangeMessage after dying')
return
if not self._text_node:
- from ba import _error
- _error.print_error('got ChangeMessage after nodes died')
+ print_error('got ChangeMessage after nodes died')
return
if msg.what == 'team':
@@ -718,13 +666,13 @@ class Chooser:
_ba.playsound(self._deek_sound)
self._profileindex = ((self._profileindex + msg.value) %
len(self._profilenames))
- self.update_from_player_profiles()
+ self.update_from_profile()
elif msg.what == 'character':
_ba.playsound(self._click_sound)
# update our index in our local list of characters
- self.character_index = ((self.character_index + msg.value) %
- len(self.character_names))
+ self._character_index = ((self._character_index + msg.value) %
+ len(self._character_names))
self._update_text()
self._update_icon()
@@ -732,8 +680,6 @@ class Chooser:
self._handle_ready_msg(bool(msg.value))
def _update_text(self) -> None:
- from ba import _gameutils
- from ba._lang import Lstr
assert self._text_node is not None
if self._ready:
@@ -751,7 +697,7 @@ class Chooser:
# Flash as we're coming in.
fin_color = _ba.safecolor(self.get_color()) + (1, )
if not self._inited:
- _gameutils.animate_array(self._text_node, 'color', 4, {
+ animate_array(self._text_node, 'color', 4, {
0.15: fin_color,
0.25: (2, 2, 2, 1),
0.35: fin_color
@@ -760,7 +706,7 @@ class Chooser:
# Blend if we're in teams mode; switch instantly otherwise.
if can_switch_teams:
- _gameutils.animate_array(self._text_node, 'color', 4, {
+ animate_array(self._text_node, 'color', 4, {
0: self._text_node.color,
0.1: fin_color
})
@@ -772,8 +718,6 @@ class Chooser:
def get_color(self) -> Sequence[float]:
"""Return the currently selected color."""
val: Sequence[float]
- # if self._profilenames[self._profileindex] == '_edit':
- # val = (0, 1, 0)
if self.lobby.use_team_colors:
val = self.lobby.teams[self._selected_team_index].color
else:
@@ -819,7 +763,6 @@ class Chooser:
return self._player
def _update_icon(self) -> None:
- from ba import _gameutils
if self._profilenames[self._profileindex] == '_edit':
tex = _ba.gettexture('black')
tint_tex = _ba.gettexture('black')
@@ -830,13 +773,12 @@ class Chooser:
return
try:
- tex_name = (_ba.app.spaz_appearances[self.character_names[
- self.character_index]].icon_texture)
- tint_tex_name = (_ba.app.spaz_appearances[self.character_names[
- self.character_index]].icon_mask_texture)
+ tex_name = (_ba.app.spaz_appearances[self._character_names[
+ self._character_index]].icon_texture)
+ tint_tex_name = (_ba.app.spaz_appearances[self._character_names[
+ self._character_index]].icon_mask_texture)
except Exception:
- from ba import _error
- _error.print_exception('Error updating char icon list')
+ print_exception('Error updating char icon list')
tex_name = 'neoSpazIcon'
tint_tex_name = 'neoSpazIconColorMask'
@@ -853,7 +795,7 @@ class Chooser:
# If we're initing, flash.
if not self._inited:
- _gameutils.animate_array(self.icon, 'color', 3, {
+ animate_array(self.icon, 'color', 3, {
0.15: (1, 1, 1),
0.25: (2, 2, 2),
0.35: (1, 1, 1)
@@ -861,7 +803,7 @@ class Chooser:
# Blend in teams mode; switch instantly in ffa-mode.
if can_switch_teams:
- _gameutils.animate_array(self.icon, 'tint_color', 3, {
+ animate_array(self.icon, 'tint_color', 3, {
0: self.icon.tint_color,
0.1: clr
})
@@ -963,10 +905,9 @@ class Lobby:
for chooser in self.choosers:
try:
chooser.reload_profiles()
- chooser.update_from_player_profiles()
+ chooser.update_from_profile()
except Exception:
- from ba import _error
- _error.print_exception('error reloading profiles')
+ print_exception('Error reloading profiles.')
def update_positions(self) -> None:
"""Update positions for all choosers."""
@@ -1005,11 +946,9 @@ class Lobby:
self.choosers.remove(chooser)
break
if not found:
- from ba import _error
- _error.print_error(f'remove_chooser did not find player {player}')
+ print_error(f'remove_chooser did not find player {player}')
elif chooser in self.choosers:
- from ba import _error
- _error.print_error(f'chooser remains after removal for {player}')
+ print_error(f'chooser remains after removal for {player}')
self.update_positions()
def remove_all_choosers(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_powerup.py b/assets/src/ba_data/python/ba/_powerup.py
index 0e3d2d83..950cc9ce 100644
--- a/assets/src/ba_data/python/ba/_powerup.py
+++ b/assets/src/ba_data/python/ba/_powerup.py
@@ -44,14 +44,14 @@ class PowerupMessage:
The type of powerup to be granted (a string).
See ba.Powerup.poweruptype for available type values.
- source_node
+ sourcenode
The node the powerup game from, or None otherwise.
If a powerup is accepted, a ba.PowerupAcceptMessage should be sent
- back to the source_node to inform it of the fact. This will generally
+ back to the sourcenode to inform it of the fact. This will generally
cause the powerup box to make a sound and disappear or whatnot.
"""
poweruptype: str
- source_node: Optional[ba.Node] = None
+ sourcenode: Optional[ba.Node] = None
@dataclass
diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py
index e46d7a10..cf9fb06a 100644
--- a/assets/src/ba_data/python/ba/_session.py
+++ b/assets/src/ba_data/python/ba/_session.py
@@ -224,12 +224,12 @@ class Session:
# Print a rejection message *only* to the client trying to
# join (prevents spamming everyone else in the game).
_ba.playsound(_ba.getsound('error'))
- _ba.screenmessage(
- Lstr(resource='playerLimitReachedText',
- subs=[('${COUNT}', str(self.max_players))]),
- color=(0.8, 0.0, 0.0),
- clients=[player.get_input_device().client_id],
- transient=True)
+ _ba.screenmessage(Lstr(resource='playerLimitReachedText',
+ subs=[('${COUNT}',
+ str(self.max_players))]),
+ color=(0.8, 0.0, 0.0),
+ clients=[player.inputdevice.client_id],
+ transient=True)
return False
_ba.playsound(_ba.getsound('dripity'))
diff --git a/assets/src/ba_data/python/bastd/actor/bomb.py b/assets/src/ba_data/python/bastd/actor/bomb.py
index 068dd7c9..cb2e9025 100644
--- a/assets/src/ba_data/python/bastd/actor/bomb.py
+++ b/assets/src/ba_data/python/bastd/actor/bomb.py
@@ -601,7 +601,7 @@ class Blast(ba.Actor):
self.node.delete()
elif isinstance(msg, ExplodeHitMessage):
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
assert self.node
nodepos = self.node.position
mag = 2000.0
@@ -843,7 +843,7 @@ class Bomb(ba.Actor):
self.handlemessage(ba.DieMessage())
def _handle_impact(self) -> None:
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
# If we're an impact bomb and we came from this node, don't explode...
# alternately if we're hitting another impact-bomb from the same
@@ -875,7 +875,7 @@ class Bomb(ba.Actor):
lambda: _safesetattr(self.node, 'stick_to_owner', True))
def _handle_splat(self) -> None:
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
if (node is not self.owner
and ba.time() - self._last_sticky_sound_time > 1.0):
self._last_sticky_sound_time = ba.time()
diff --git a/assets/src/ba_data/python/bastd/actor/controlsguide.py b/assets/src/ba_data/python/bastd/actor/controlsguide.py
index 3b54729d..a149ba75 100644
--- a/assets/src/ba_data/python/bastd/actor/controlsguide.py
+++ b/assets/src/ba_data/python/bastd/actor/controlsguide.py
@@ -264,16 +264,14 @@ class ControlsGuide(ba.Actor):
# If we have a touchscreen, we only fade in if we have a player with
# an input device that is *not* the touchscreen.
- touchscreen: Optional[ba.InputDevice] = _ba.get_input_device(
+ touchscreen: Optional[ba.InputDevice] = _ba.getinputdevice(
'TouchScreen', '#1', doraise=False)
if touchscreen is not None:
# We look at the session's players; not the activity's.
# We want to get ones who are still in the process of
# selecting a character, etc.
- input_devices = [
- p.get_input_device() for p in ba.getsession().players
- ]
+ input_devices = [p.inputdevice for p in ba.getsession().players]
input_devices = [
i for i in input_devices if i and i is not touchscreen
]
@@ -325,13 +323,13 @@ class ControlsGuide(ba.Actor):
# We look at the session's players; not the activity's - we want to
# get ones who are still in the process of selecting a character, etc.
- input_devices = [p.get_input_device() for p in ba.getsession().players]
+ input_devices = [p.inputdevice for p in ba.getsession().players]
input_devices = [i for i in input_devices if i]
# If there's no players with input devices yet, try to default to
# showing keyboard controls.
if not input_devices:
- kbd = _ba.get_input_device('Keyboard', '#1', doraise=False)
+ kbd = _ba.getinputdevice('Keyboard', '#1', doraise=False)
if kbd is not None:
input_devices.append(kbd)
diff --git a/assets/src/ba_data/python/bastd/actor/powerupbox.py b/assets/src/ba_data/python/bastd/actor/powerupbox.py
index 2bbe156b..77dc6ab9 100644
--- a/assets/src/ba_data/python/bastd/actor/powerupbox.py
+++ b/assets/src/ba_data/python/bastd/actor/powerupbox.py
@@ -305,9 +305,9 @@ class PowerupBox(ba.Actor):
elif isinstance(msg, _TouchedMessage):
if not self._powersgiven:
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
node.handlemessage(
- ba.PowerupMessage(self.poweruptype, source_node=self.node))
+ ba.PowerupMessage(self.poweruptype, sourcenode=self.node))
elif isinstance(msg, ba.DieMessage):
if self.node:
diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py
index ba314e21..cf710b07 100644
--- a/assets/src/ba_data/python/bastd/actor/spaz.py
+++ b/assets/src/ba_data/python/bastd/actor/spaz.py
@@ -851,8 +851,8 @@ class Spaz(ba.Actor):
self._num_times_hit = 0
self.node.handlemessage('flash')
- if msg.source_node:
- msg.source_node.handlemessage(ba.PowerupAcceptMessage())
+ if msg.sourcenode:
+ msg.sourcenode.handlemessage(ba.PowerupAcceptMessage())
return True
elif isinstance(msg, ba.FreezeMessage):
@@ -1143,7 +1143,7 @@ class Spaz(ba.Actor):
elif isinstance(msg, PunchHitMessage):
if not self.node:
return None
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
# Only allow one hit per node per punch.
if node and (node not in self._punched_nodes):
@@ -1204,23 +1204,23 @@ class Spaz(ba.Actor):
try:
collision = ba.getcollision()
- opposing_node = collision.opposing_node
- opposing_body = collision.opposing_body
+ opposingnode = collision.opposingnode
+ opposingbody = collision.opposingbody
except ba.NotFoundError:
return True
# Don't allow picking up of invincible dudes.
try:
- if opposing_node.invincible:
+ if opposingnode.invincible:
return True
except Exception:
pass
# If we're grabbing the pelvis of a non-shattered spaz, we wanna
# grab the torso instead.
- if (opposing_node.getnodetype() == 'spaz'
- and not opposing_node.shattered and opposing_body == 4):
- opposing_body = 1
+ if (opposingnode.getnodetype() == 'spaz'
+ and not opposingnode.shattered and opposingbody == 4):
+ opposingbody = 1
# Special case - if we're holding a flag, don't replace it
# (hmm - should make this customizable or more low level).
@@ -1229,8 +1229,8 @@ class Spaz(ba.Actor):
return True
# Note: hold_body needs to be set before hold_node.
- self.node.hold_body = opposing_body
- self.node.hold_node = opposing_node
+ self.node.hold_body = opposingbody
+ self.node.hold_node = opposingnode
elif isinstance(msg, ba.CelebrateMessage):
if self.node:
self.node.handlemessage('celebrate', int(msg.duration * 1000))
diff --git a/assets/src/ba_data/python/bastd/game/assault.py b/assets/src/ba_data/python/bastd/game/assault.py
index 7f2d814d..0020bb0c 100644
--- a/assets/src/ba_data/python/bastd/game/assault.py
+++ b/assets/src/ba_data/python/bastd/game/assault.py
@@ -179,7 +179,7 @@ class AssaultGame(ba.TeamGameActivity[Player, Team]):
ba.timer(length, light.delete)
def _handle_base_collide(self, team: Team) -> None:
- player = ba.getcollision().opposing_node.getdelegate(
+ player = ba.getcollision().opposingnode.getdelegate(
PlayerSpaz, True).getplayer(Player)
if not player or not player.is_alive():
return
diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py
index 55d59a8e..43ff82e4 100644
--- a/assets/src/ba_data/python/bastd/game/capturetheflag.py
+++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py
@@ -158,9 +158,9 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
self._scoreboard = Scoreboard()
self._alarmsound = ba.getsound('alarm')
self._ticking_sound = ba.getsound('ticking')
- self._last_score_time = 0
self._score_sound = ba.getsound('score')
self._swipsound = ba.getsound('swip')
+ self._last_score_time = 0
self._all_bases_material = ba.Material()
self._last_home_flag_notice_print_time = 0.0
self._score_to_win = int(settings['Score to Win'])
@@ -237,20 +237,22 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
))
# Other parts of our spazzes don't collide with our flags at all.
- spaz_mat_no_flag_collide.add_actions(conditions=('they_have_material',
- flagmat),
- actions=('modify_part_collision',
- 'collide', False))
+ spaz_mat_no_flag_collide.add_actions(
+ conditions=('they_have_material', flagmat),
+ actions=('modify_part_collision', 'collide', False),
+ )
# We wanna know when *any* flag enters/leaves our base.
base_region_mat.add_actions(
conditions=('they_have_material', FlagFactory.get().flagmaterial),
- actions=(('modify_part_collision', 'collide',
- True), ('modify_part_collision', 'physical', False),
- ('call', 'at_connect',
- lambda: self._handle_flag_entered_base(team)),
- ('call', 'at_disconnect',
- lambda: self._handle_flag_left_base(team))))
+ actions=(
+ ('modify_part_collision', 'collide', True),
+ ('modify_part_collision', 'physical', False),
+ ('call', 'at_connect',
+ lambda: self._handle_flag_entered_base(team)),
+ ('call', 'at_disconnect',
+ lambda: self._handle_flag_left_base(team)),
+ ))
return team
@@ -274,7 +276,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
ba.playsound(self._swipsound, position=team.flag.node.position)
def _handle_flag_entered_base(self, team: Team) -> None:
- flag = CTFFlag.from_node(ba.getcollision().opposing_node)
+ flag = CTFFlag.from_node(ba.getcollision().opposingnode)
if not flag:
print('Unable to get flag in _handle_flag_entered_base')
return
@@ -362,7 +364,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
self._flash_base(team)
self._update_scoreboard()
- # Have teammates celebrate
+ # Have teammates celebrate.
for player in team.players:
if player.actor:
player.actor.handlemessage(ba.CelebrateMessage(2.0))
@@ -385,7 +387,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
def _handle_flag_left_base(self, team: Team) -> None:
cur_time = ba.time()
try:
- flag = CTFFlag.from_node(ba.getcollision().opposing_node)
+ flag = CTFFlag.from_node(ba.getcollision().opposingnode)
except ba.NodeNotFoundError:
# We still get this call even if the flag stopped touching us
# because it was deleted; that's ok.
@@ -447,11 +449,12 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
return None if delegate is None else delegate.getplayer(Player)
def _handle_hit_own_flag(self, team: Team, val: int) -> None:
+ """Called when a player touches their own team flag.
+
+ We keep track of when each player is touching their
+ own flag so we can award points when returned.
"""
- keep track of when each player is touching their
- own flag so we can award points when returned
- """
- player = self._player_from_node(ba.getcollision().source_node)
+ player = self._player_from_node(ba.getcollision().sourcenode)
if player:
player.touching_own_flag += (1 if val else -1)
@@ -464,7 +467,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
# Use a node message to kill the flag instead of just killing
# our team's. (avoids redundantly killing new flags if
# multiple body parts generate callbacks in one step).
- node = ba.getcollision().opposing_node
+ node = ba.getcollision().opposingnode
self._award_players_touching_own_flag(team)
node.handlemessage(ba.DieMessage())
@@ -484,8 +487,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
team.touch_return_timer = None
team.touch_return_timer_ticking = None
if team.flag_return_touches < 0:
- ba.print_error(
- "CTF: flag_return_touches < 0; this shouldn't happen.")
+ ba.print_error('CTF flag_return_touches < 0')
def _flash_base(self, team: Team, length: float = 2.0) -> None:
light = ba.newnode('light',
@@ -536,13 +538,15 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
self._score_to_win)
def handlemessage(self, msg: Any) -> Any:
+
if isinstance(msg, ba.PlayerDiedMessage):
- # Augment standard behavior.
- super().handlemessage(msg)
+ super().handlemessage(msg) # Augment standard behavior.
self.respawn_player(msg.getplayer(Player))
+
elif isinstance(msg, FlagDiedMessage):
assert isinstance(msg.flag, CTFFlag)
ba.timer(0.1, ba.Call(self._spawn_flag_for_team, msg.flag.team))
+
elif isinstance(msg, FlagPickedUpMessage):
# Store the last player to hold the flag for scoring purposes.
assert isinstance(msg.flag, CTFFlag)
@@ -550,9 +554,11 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
PlayerSpaz, True).getplayer(Player)
msg.flag.held_count += 1
msg.flag.reset_return_times()
+
elif isinstance(msg, FlagDroppedMessage):
# Store the last player to hold the flag for scoring purposes.
assert isinstance(msg.flag, CTFFlag)
msg.flag.held_count -= 1
+
else:
super().handlemessage(msg)
diff --git a/assets/src/ba_data/python/bastd/game/chosenone.py b/assets/src/ba_data/python/bastd/game/chosenone.py
index 63cb7401..3100dd5c 100644
--- a/assets/src/ba_data/python/bastd/game/chosenone.py
+++ b/assets/src/ba_data/python/bastd/game/chosenone.py
@@ -177,7 +177,7 @@ class ChosenOneGame(ba.TeamGameActivity[Player, Team]):
# If we have a chosen one, ignore these.
if self._get_chosen_one_player() is not None:
return
- player = ba.getcollision().opposing_node.getdelegate(
+ player = ba.getcollision().opposingnode.getdelegate(
PlayerSpaz, True).getplayer(Player)
if player is not None and player.is_alive():
self._set_chosen_one_player(player)
diff --git a/assets/src/ba_data/python/bastd/game/conquest.py b/assets/src/ba_data/python/bastd/game/conquest.py
index a9511482..0f1e51e9 100644
--- a/assets/src/ba_data/python/bastd/game/conquest.py
+++ b/assets/src/ba_data/python/bastd/game/conquest.py
@@ -235,9 +235,9 @@ class ConquestGame(ba.TeamGameActivity[Player, Team]):
def _handle_flag_player_collide(self) -> None:
collision = ba.getcollision()
- flag = collision.source_node.getdelegate(ConquestFlag)
- player = collision.opposing_node.getdelegate(PlayerSpaz,
- True).getplayer(Player)
+ flag = collision.sourcenode.getdelegate(ConquestFlag)
+ player = collision.opposingnode.getdelegate(PlayerSpaz,
+ True).getplayer(Player)
if not flag or not player:
return
assert flag.light
diff --git a/assets/src/ba_data/python/bastd/game/easteregghunt.py b/assets/src/ba_data/python/bastd/game/easteregghunt.py
index a03b40ce..ae0c0f48 100644
--- a/assets/src/ba_data/python/bastd/game/easteregghunt.py
+++ b/assets/src/ba_data/python/bastd/game/easteregghunt.py
@@ -137,9 +137,9 @@ class EasterEggHuntGame(ba.TeamGameActivity[Player, Team]):
if self.has_ended():
return
collision = ba.getcollision()
- egg = collision.source_node.getdelegate(Egg)
- player = collision.opposing_node.getdelegate(PlayerSpaz,
- True).getplayer(Player)
+ egg = collision.sourcenode.getdelegate(Egg)
+ player = collision.opposingnode.getdelegate(PlayerSpaz,
+ True).getplayer(Player)
if player and egg:
player.team.score += 1
diff --git a/assets/src/ba_data/python/bastd/game/football.py b/assets/src/ba_data/python/bastd/game/football.py
index a9b472e0..c428a64d 100644
--- a/assets/src/ba_data/python/bastd/game/football.py
+++ b/assets/src/ba_data/python/bastd/game/football.py
@@ -209,7 +209,7 @@ class FootballTeamGame(ba.TeamGameActivity[Player, Team]):
assert self._flag is not None
if self._flag.scored:
return
- region = ba.getcollision().source_node
+ region = ba.getcollision().sourcenode
i = None
for i in range(len(self._score_regions)):
if region == self._score_regions[i].node:
@@ -654,7 +654,7 @@ class FootballCoopGame(ba.CoopGameActivity[Player, Team]):
return
# See which score region it was.
- region = ba.getcollision().source_node
+ region = ba.getcollision().sourcenode
i = None
for i in range(len(self._score_regions)):
if region == self._score_regions[i].node:
diff --git a/assets/src/ba_data/python/bastd/game/hockey.py b/assets/src/ba_data/python/bastd/game/hockey.py
index 805480ef..26af046c 100644
--- a/assets/src/ba_data/python/bastd/game/hockey.py
+++ b/assets/src/ba_data/python/bastd/game/hockey.py
@@ -245,9 +245,9 @@ class HockeyGame(ba.TeamGameActivity[Player, Team]):
def _handle_puck_player_collide(self) -> None:
collision = ba.getcollision()
- puck = collision.source_node.getdelegate(Puck)
- player = collision.opposing_node.getdelegate(PlayerSpaz,
- True).getplayer(Player)
+ puck = collision.sourcenode.getdelegate(Puck)
+ player = collision.opposingnode.getdelegate(PlayerSpaz,
+ True).getplayer(Player)
if player and puck:
puck.last_players_to_touch[player.team.id] = player
@@ -265,7 +265,7 @@ class HockeyGame(ba.TeamGameActivity[Player, Team]):
if self._puck.scored:
return
- region = ba.getcollision().source_node
+ region = ba.getcollision().sourcenode
index = 0
for index in range(len(self._score_regions)):
if region == self._score_regions[index].node:
diff --git a/assets/src/ba_data/python/bastd/game/kingofthehill.py b/assets/src/ba_data/python/bastd/game/kingofthehill.py
index e1a4cef5..4b11464c 100644
--- a/assets/src/ba_data/python/bastd/game/kingofthehill.py
+++ b/assets/src/ba_data/python/bastd/game/kingofthehill.py
@@ -247,7 +247,7 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]):
ba.playsound(self._swipsound)
def _handle_player_flag_region_collide(self, colliding: bool) -> None:
- player = ba.getcollision().opposing_node.getdelegate(
+ player = ba.getcollision().opposingnode.getdelegate(
PlayerSpaz, True).getplayer(Player)
if not player:
return
diff --git a/assets/src/ba_data/python/bastd/game/race.py b/assets/src/ba_data/python/bastd/game/race.py
index ecb6e38f..df6de7bf 100644
--- a/assets/src/ba_data/python/bastd/game/race.py
+++ b/assets/src/ba_data/python/bastd/game/race.py
@@ -227,9 +227,9 @@ class RaceGame(ba.TeamGameActivity[Player, Team]):
# pylint: disable=too-many-branches
# pylint: disable=too-many-nested-blocks
collision = ba.getcollision()
- region = collision.source_node.getdelegate(RaceRegion)
- playerspaz = collision.opposing_node.getdelegate(PlayerSpaz,
- doraise=False)
+ region = collision.sourcenode.getdelegate(RaceRegion)
+ playerspaz = collision.opposingnode.getdelegate(PlayerSpaz,
+ doraise=False)
player = playerspaz.getplayer(Player) if playerspaz else None
if not player or not region:
return
diff --git a/assets/src/ba_data/python/bastd/game/runaround.py b/assets/src/ba_data/python/bastd/game/runaround.py
index fbcce6e7..d5d0637c 100644
--- a/assets/src/ba_data/python/bastd/game/runaround.py
+++ b/assets/src/ba_data/python/bastd/game/runaround.py
@@ -406,7 +406,7 @@ class RunaroundGame(ba.CoopGameActivity[Player, Team]):
ba.timer(2.0, self._start_updating_waves)
def _handle_reached_end(self) -> None:
- spaz = ba.getcollision().opposing_node.getdelegate(SpazBot, True)
+ spaz = ba.getcollision().opposingnode.getdelegate(SpazBot, True)
if not spaz.is_alive():
return # Ignore bodies flying in.
diff --git a/assets/src/ba_data/python/bastd/ui/settings/controls.py b/assets/src/ba_data/python/bastd/ui/settings/controls.py
index 00e81723..9805557e 100644
--- a/assets/src/ba_data/python/bastd/ui/settings/controls.py
+++ b/assets/src/ba_data/python/bastd/ui/settings/controls.py
@@ -91,7 +91,7 @@ class ControlsSettingsWindow(ba.Window):
height += space_height
show_keyboard = False
- if _ba.get_input_device('Keyboard', '#1', doraise=False) is not None:
+ if _ba.getinputdevice('Keyboard', '#1', doraise=False) is not None:
show_keyboard = True
height += spacing * 2
show_keyboard_p2 = False if app.vr_mode else show_keyboard
@@ -393,7 +393,7 @@ class ControlsSettingsWindow(ba.Window):
self._save_state()
ba.containerwidget(edit=self._root_widget, transition='out_left')
ba.app.main_menu_window = (keyboard.ConfigKeyboardWindow(
- _ba.get_input_device('Keyboard', '#1')).get_root_widget())
+ _ba.getinputdevice('Keyboard', '#1')).get_root_widget())
def _config_keyboard2(self) -> None:
# pylint: disable=cyclic-import
@@ -401,7 +401,7 @@ class ControlsSettingsWindow(ba.Window):
self._save_state()
ba.containerwidget(edit=self._root_widget, transition='out_left')
ba.app.main_menu_window = (keyboard.ConfigKeyboardWindow(
- _ba.get_input_device('Keyboard', '#2')).get_root_widget())
+ _ba.getinputdevice('Keyboard', '#2')).get_root_widget())
def _do_mobile_devices(self) -> None:
# pylint: disable=cyclic-import
diff --git a/docs/ba_module.md b/docs/ba_module.md
index 281527df..c7da0733 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2020-05-25 for Ballistica version 1.5.0 build 20027
+last updated on 2020-05-25 for Ballistica version 1.5.0 build 20028
This page documents the Python classes and functions in the 'ba' module,
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!
@@ -189,6 +189,7 @@
- ba.ActivityNotFoundError
- ba.ActorNotFoundError
+ - ba.DelegateNotFoundError
- ba.InputDeviceNotFoundError
- ba.NodeNotFoundError
- ba.PlayerNotFoundError
@@ -918,7 +919,7 @@ likely result in errors.
-
launch_coop_game(self, game: str, force: bool = False, args: Dict = None) -> bool
-High level way to launch a co-op session locally.
+High level way to launch a local co-op session.
-
@@ -1298,7 +1299,7 @@ mycall()
Methods:
-
+
-
ba.Chooser(vpos: float, player: _ba.SessionPlayer, lobby: "Lobby")
@@ -1352,10 +1353,10 @@ mycall()
Reload all player profiles.
--
-
update_from_player_profiles(self) -> None
+ -
+
update_from_profile(self) -> None
-Set character based on profile; otherwise use pre-picked random.
+Set character/colors based on the current profile.
-
@@ -1382,14 +1383,14 @@ mycall()
A class providing info about occurring collisions.
Attributes:
-
+
--
+
-
int
The body index on the opposing node in the current collision.
--
+
-
ba.Node
The node the current callback material node is hitting.
@@ -1403,7 +1404,7 @@ mycall()
The position of the current collision.
--
+
-
ba.Node
The node containing the material triggering the current callback.
@@ -1734,6 +1735,16 @@ the data object is requested and when it's value is accessed.
- LEFT_GAME
+Inherits from: ba.NotFoundError, Exception, BaseException
+Exception raised when an expected delegate object does not exist.
+
+Category: Exception Classes
+
+
+Methods:
+<all methods inherited from ba.NotFoundError>
+
Inherits from: typing.Generic
A dependency on a DependencyComponent (with an optional config).
@@ -3569,8 +3580,8 @@ loc.connectattr('position', light, 'position')
delete(ignore_missing: bool = True) -> None
-Delete the node. Ignores already-deleted nodes unless ignore_missing
-is False, in which case an Exception is thrown.
+Delete the node. Ignores already-deleted nodes if ignore_missing
+is True; otherwise a ba.NodeNotFoundError is thrown.
@@ -3598,7 +3609,7 @@ the right thing both for Node objects and values of None.
If the node has no delegate or it is not an instance of the passed
type, then None will be returned. If 'doraise' is True, then an
-Exception will be raised instead in such cases.
+ba.DelegateNotFoundError will be raised instead.
@@ -4094,7 +4105,7 @@ the type-checker properly identifies the returned value as one.
This message is normally received by touching a ba.PowerupBox.
Attributes:
-
+
-
str
@@ -4102,11 +4113,11 @@ the type-checker properly identifies the returned value as one.
See ba.Powerup.poweruptype for available type values.
--
+
-
Optional[ba.Node]
The node the powerup game from, or None otherwise.
If a powerup is accepted, a ba.PowerupAcceptMessage should be sent
-back to the source_node to inform it of the fact. This will generally
+back to the sourcenode to inform it of the fact. This will generally
cause the powerup box to make a sound and disappear or whatnot.
@@ -4114,7 +4125,7 @@ cause the powerup box to make a sound and disappear or whatnot.
Methods:
-
-
ba.PowerupMessage(poweruptype: str, source_node: Optional[ba.Node] = None)
+ba.PowerupMessage(poweruptype: str, sourcenode: Optional[ba.Node] = None)
@@ -4443,7 +4454,7 @@ that a SessionPlayer is still present if retaining references to one
for any length of time.
Attributes:
-
+
-
str
@@ -4490,6 +4501,11 @@ the right thing both for Player objects and values of None.
This bool value will be True once the Player has completed
any lobby character/team selection.
+
+-
+
ba.InputDevice
+The input device associated with the player.
+
-
Dict
@@ -4507,7 +4523,7 @@ is still in its lobby selecting a team/etc. then a
Methods:
-
+
-
assign_input_call(type: Union[str, Tuple[str, ...]],
@@ -4544,12 +4560,6 @@ joins (while verification occurs).
Returns the character's icon (images, colors, etc contained in a dict)
-
--
-
get_input_device() -> ba.InputDevice
-
-Returns the player's input device.
-
-
get_name(full: bool = False, icon: bool = True) -> str