Tidying up last pull request now that ba.Vec3.length() is fixed

assets/src/ba_data/python/ba/__init__.py

@@ -69,7 +69,7 @@ from ba._appdelegate import AppDelegate
 from ba._apputils import is_browser_likely_available
 from ba._campaign import Campaign
 from ba._gameutils import (animate, animate_array, show_damage_count,
-                           sharedobj, timestring, cameraflash, distance)
+                           sharedobj, timestring, cameraflash)
 from ba._general import WeakCall, Call
 from ba._level import Level
 from ba._lobby import Lobby, Chooser

assets/src/ba_data/python/ba/_gameutils.py

@@ -22,13 +22,12 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-import math
 
 import _ba
 from ba._enums import TimeType, TimeFormat, SpecialChar
 
 if TYPE_CHECKING:
-    from typing import Any, Dict, Sequence, Tuple
+    from typing import Any, Dict, Sequence
     import ba
 
 TROPHY_CHARS = {
@@ -47,14 +46,6 @@ def get_trophy_string(trophy_id: str) -> str:
         return _ba.charstr(TROPHY_CHARS[trophy_id])
     return '?'
 
-def distance(vec1: Tuple[float, float, float],
-             vec2: Tuple[float, float, float]) -> float:
-    """Find distance between two positions"""
-    xlen = vec1[0] - vec2[0]
-    ylen = vec1[1] - vec2[1]
-    zlen = vec1[2] - vec2[2]
-    xylen = math.sqrt(xlen**2 + ylen**2)
-    return math.sqrt(xylen**2 + zlen**2)
 
 def sharedobj(name: str) -> Any:
     """Return a predefined object for the current Activity, creating if needed.

assets/src/ba_data/python/bastd/actor/playerspaz.py

@@ -126,21 +126,19 @@ class PlayerSpaz(Spaz):
     def player(self) -> ba.Player:
         """The ba.Player associated with this Spaz.
 
-        If the player no longer exists, raises an Exception.
+        If the player no longer exists, raises an ba.PlayerNotFoundError.
         """
-        player = self._player
-        if not player:
-            raise Exception("player no longer exists")
-        return player
+        if not self._player:
+            raise ba.PlayerNotFoundError()
+        return self._player
 
     def getplayer(self) -> Optional[ba.Player]:
         """Get the ba.Player associated with this Spaz.
 
-        Note that this may return None or an invalidated ba.Player,
-        so always test it with 'if playerval' before using it to
-        cover both cases.
+        Note that this may return None if the player has left.
         """
-        return self._player
+        # Convert invalid references to None.
+        return self._player if self._player else None
 
     def connect_controls_to_player(self,
                                    enable_jump: bool = True,

assets/src/ba_data/python/bastd/actor/spazbot.py

@@ -28,7 +28,6 @@ import weakref
 from typing import TYPE_CHECKING
 
 import ba
-from ba import distance
 from bastd.actor import spaz as basespaz
 
 if TYPE_CHECKING:
@@ -42,6 +41,7 @@ DEFAULT_BOT_HIGHLIGHT = (0.1, 0.3, 0.1)
 PRO_BOT_COLOR = (1.0, 0.2, 0.1)
 PRO_BOT_HIGHLIGHT = (0.6, 0.1, 0.05)
 
+
 class SpazBotPunchedMessage:
     """A message saying a ba.SpazBot got punched.
 
@@ -192,9 +192,8 @@ class SpazBot(basespaz.Spaz):
         closest = None
         assert self._player_pts is not None
         for plpt, plvel in self._player_pts:
-            dist = distance(
-                (plpt.x, plpt.y, plpt.z),
-                (botpt.x, botpt.y, botpt.z))
+            dist = (plpt - botpt).length()
+
             # Ignore player-points that are significantly below the bot
             # (keeps bots from following players off cliffs).
             if (closest_dist is None
@@ -256,10 +255,8 @@ class SpazBot(basespaz.Spaz):
                 assert self.target_flag.node
                 target_pt_raw = ba.Vec3(*self.target_flag.node.position)
                 diff = (target_pt_raw - our_pos)
-                diff = ba.Vec3(diff[0], 0, diff[2])  # don't care about y
-                dist = distance(
-                    (target_pt_raw.x, 0, target_pt_raw.z),
-                    (our_pos.x, 0, our_pos.z))
+                diff = ba.Vec3(diff[0], 0, diff[2])  # Don't care about y.
+                dist = diff.length()
                 to_target = diff.normalized()
 
                 # If we're holding some non-flag item, drop it.
@@ -327,9 +324,7 @@ class SpazBot(basespaz.Spaz):
                      target_vel * dist_raw * 0.3 * self._lead_amount)
 
         diff = (target_pt - our_pos)
-        dist = distance(
-            (target_pt.x, target_pt.y, target_pt.z),
-            (our_pos.x, our_pos.y, our_pos.z))
+        dist = diff.length()
         to_target = diff.normalized()
 
         if self._mode == 'throw':

assets/src/ba_data/python/bastd/game/assault.py

@@ -150,7 +150,7 @@ class AssaultGame(ba.TeamGameActivity):
 
     def handlemessage(self, msg: Any) -> Any:
         if isinstance(msg, playerspaz.PlayerSpazDeathMessage):
-            super().handlemessage(msg)  # augment standard
+            super().handlemessage(msg)  # Augment standard.
             self.respawn_player(msg.spaz.player)
         else:
             super().handlemessage(msg)
@@ -167,11 +167,14 @@ class AssaultGame(ba.TeamGameActivity):
         ba.timer(length, light.delete)
 
     def _handle_base_collide(self, team: ba.Team) -> None:
-        cval = ba.get_collision_info('opposing_node')
-        try:
-            player = cval.getdelegate().getplayer()
-        except Exception:
+
+        # Attempt to pull a living ba.Player from what we hit.
+        cnode = ba.get_collision_info('opposing_node')
+        assert isinstance(cnode, ba.Node)
+        actor = cnode.getdelegate()
+        if not isinstance(actor, playerspaz.PlayerSpaz):
             return
+        player = actor.getplayer()
         if not player or not player.is_alive():
             return
 
@@ -190,20 +193,21 @@ class AssaultGame(ba.TeamGameActivity):
                 # and add flashes of light so its noticeable.
                 for player in player_team.players:
                     if player.is_alive():
-                        pos = player.actor.node.position
-                        light = ba.newnode('light',
-                                           attrs={
-                                               'position': pos,
-                                               'color': player_team.color,
-                                               'height_attenuated': False,
-                                               'radius': 0.4
-                                           })
-                        ba.timer(0.5, light.delete)
-                        ba.animate(light, 'intensity', {
-                            0: 0,
-                            0.1: 1.0,
-                            0.5: 0
-                        })
+                        if player.node:
+                            pos = player.node.position
+                            light = ba.newnode('light',
+                                               attrs={
+                                                   'position': pos,
+                                                   'color': player_team.color,
+                                                   'height_attenuated': False,
+                                                   'radius': 0.4
+                                               })
+                            ba.timer(0.5, light.delete)
+                            ba.animate(light, 'intensity', {
+                                0: 0,
+                                0.1: 1.0,
+                                0.5: 0
+                            })
 
                         new_pos = (self.map.get_start_position(
                             player_team.get_id()))
@@ -220,8 +224,10 @@ class AssaultGame(ba.TeamGameActivity):
                             0.1: 1.0,
                             0.5: 0
                         })
-                        player.actor.handlemessage(
-                            ba.StandMessage(new_pos, random.uniform(0, 360)))
+                        if player.actor:
+                            player.actor.handlemessage(
+                                ba.StandMessage(new_pos,
+                                                random.uniform(0, 360)))
 
                 # Have teammates celebrate.
                 for player in player_team.players:

assets/src/ba_data/python/bastd/game/capturetheflag.py

@@ -487,8 +487,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
             self.respawn_player(msg.spaz.player)
         elif isinstance(msg, stdflag.FlagDeathMessage):
             assert isinstance(msg.flag, CTFFlag)
-            ba.timer(0.1,
-                     ba.Call(self._spawn_flag_for_team, msg.flag.team))
+            ba.timer(0.1, ba.Call(self._spawn_flag_for_team, msg.flag.team))
         elif isinstance(msg, stdflag.FlagPickedUpMessage):
             # Store the last player to hold the flag for scoring purposes.
             assert isinstance(msg.flag, CTFFlag)