From 46dde80d2a614a5e8f5d57544568aed404554a90 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Wed, 9 Feb 2022 23:03:54 +0300
Subject: [PATCH 01/21] docs generation improvement

---
 .idea/inspectionProfiles/Default.xml |   6 +-
 tools/batools/docs.py                | 121 +++++++++++++++++++++------
 2 files changed, 100 insertions(+), 27 deletions(-)

diff --git a/.idea/inspectionProfiles/Default.xml b/.idea/inspectionProfiles/Default.xml
index 988bb294..afb5c715 100644
--- a/.idea/inspectionProfiles/Default.xml
+++ b/.idea/inspectionProfiles/Default.xml
@@ -69,8 +69,8 @@
     <inspection_tool class="PyTypeCheckerInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PyTypeHintsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PyUnreachableCodeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="false">
-      <scope name="PyIgnoreUnresolved" level="WARNING" enabled="false">
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="PyIgnoreUnresolved" level="WARNING" enabled="true">
         <option name="ignoredIdentifiers">
           <list>
             <option value="astroid.node_classes.NodeNG.*" />
@@ -84,7 +84,7 @@
           </list>
         </option>
       </scope>
-      <scope name="UncheckedPython" level="WARNING" enabled="false">
+      <scope name="UncheckedPython" level="WARNING" enabled="true">
         <option name="ignoredIdentifiers">
           <list>
             <option value="astroid.node_classes.NodeNG.*" />
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index 1fc9df2e..0b89fe33 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import importlib
 import os
 import datetime
 import inspect
@@ -13,6 +14,8 @@ import subprocess
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Union, cast
 from enum import Enum
+import types
+import pydoc
 
 from efro.error import CleanError
 from efro.terminal import Clr
@@ -366,12 +369,26 @@ def _add_inner_classes(class_objs: Sequence[type],
                 (cls.__module__ + '.' + cls.__name__ + '.' + name, obj))
 
 
-class Generator:
-    """class which handles docs generation."""
+class BaseGenerator:
+    """Base class which handles docs generation.
+
+    Some generation options and target module set up in inherited classes."""
+
+    # This should be overridden by inherited classes.
+
+    # Top-level module (e.g. 'ba')
+    top_module_name: str
+
+    # Modules NOT to generate docs for. Example: ['ba.internal']
+    ignored_modules: list[str]
 
     def __init__(self) -> None:
         self._index_keys: list[str] = []
 
+        # All modules where we will search functions and classes to
+        # generate docs for (including top-level module).
+        self._submodules: set[ModuleType] = set()
+
         # Make a list of missing stuff so we can warn about it in one
         # big chunk at the end (so the user can batch their corrections).
         self._errors: list[Any] = []
@@ -434,13 +451,6 @@ class Generator:
                         docs += index_entry_actual  # Keep original.
                     docs += bits[i]
 
-        # Misc replacements:
-        docs = docs.replace(
-            'General message handling; can be passed any message object.',
-            'General message handling; can be passed any <a href="#' +
-            _get_class_category_href('Message Classes') +
-            '">message object</a>.')
-
         for sub_name, sub_val in list(subs.items()):
             docs = docs.replace(sub_name, sub_val)
         return docs
@@ -562,7 +572,6 @@ class Generator:
 
     def _get_methods_for_class(
             self, cls: type) -> tuple[list[FunctionInfo], list[FunctionInfo]]:
-        import types
 
         method_types = [
             types.MethodDescriptorType, types.FunctionType, types.MethodType
@@ -617,7 +626,6 @@ class Generator:
 
     def _python_method_docs(self, cls: type,
                             mth: Callable) -> tuple[str, bool]:
-        import pydoc
         mdocs_lines = pydoc.plain(pydoc.render_doc(mth)).splitlines()[2:]
 
         # Remove ugly 'method of builtins.type instance'
@@ -666,7 +674,6 @@ class Generator:
     def _handle_single_line_method_docs(self, cls: type,
                                         mdocs_lines: list[str],
                                         mth: Callable) -> list[str]:
-        import pydoc
         for testclass in cls.mro()[1:]:
             testm = getattr(testclass, mth.__name__, None)
             if testm is not None:
@@ -1029,21 +1036,45 @@ class Generator:
                 self._write_inherited_methods_for_class(cls)
                 self._write_methods_for_class(cls, methods)
 
-    def _gather_funcs(self, module: ModuleType) -> None:
-        import types
-        import pydoc
+    def _collect_submodules(self, module: ModuleType) -> None:
+        # In case we somehow met one module twice.
+        if module in self._submodules:
+            return
 
-        # Function, build-in-function.
+        if module.__name__ in self.ignored_modules:
+            return
+
+        if not module.__name__.startswith(self.top_module_name):
+            return
+
+        self._submodules.add(module)
+
+        names = dir(module)
+        objects = [
+            getattr(module, name) for name in names if not name.startswith('_')
+        ]
+        submodules = [
+            obj for obj in objects if isinstance(obj, types.ModuleType)
+        ]
+        for submodule in submodules:
+            self._collect_submodules(submodule)
+
+    def _gather_funcs(self, module: ModuleType) -> None:
         func_types = [types.FunctionType, types.BuiltinMethodType]
 
         names = dir(module)
-        funcs = [
+        objects = [
             getattr(module, name) for name in names if not name.startswith('_')
         ]
-        funcs = [f for f in funcs if any(isinstance(f, t) for t in func_types)]
+        funcs = [
+            obj for obj in objects if any(isinstance(obj, t) for t in func_types)
+        ]
+        # Or should we take care of this in modules itself?..
+        funcs = [
+            f for f in funcs if f.__name__.startswith(self.top_module_name)
+        ]
 
         for fnc in funcs:
-
             # For non-builtin funcs, use the pydoc rendering since it includes
             # args.
             # Chop off the first line which is just "Python Library
@@ -1082,6 +1113,10 @@ class Generator:
                 self._functions.append(f_info)
 
     def _process_classes(self, module: ModuleType) -> None:
+        # We don't want generate docs not for our submodules.
+        if not module.__name__.startswith(f'{self.top_module_name}'):
+            return
+
         classes_by_name = _get_module_classes(module)
         for c_name, cls in classes_by_name:
             docs = self._get_base_docs_for_class(cls)
@@ -1161,12 +1196,19 @@ class Generator:
         docs = self._add_index_links(docs, ignore_links)
         return docs
 
+    def get_top_module(self) -> ModuleType:
+        """Returns top-level module we generating docs for"""
+        return importlib.import_module(self.top_module_name)
+
     def run(self, outfilename: str) -> None:
         """Generate docs from within the game."""
         import ba
 
-        self._gather_funcs(ba)
-        self._process_classes(ba)
+        self._collect_submodules(self.get_top_module())
+        print([sm.__name__ for sm in self._submodules])
+        for module in sorted(self._submodules, key=lambda m: m.__name__):
+            self._gather_funcs(module)
+            self._process_classes(module)
 
         # Start with our list of classes and functions.
         app = ba.app
@@ -1268,7 +1310,36 @@ class Generator:
 
         print(f"Generated docs file: '{Clr.BLU}{outfilename}.{Clr.RST}'")
 
-        ba.quit()
+
+class BaModuleGenerator(BaseGenerator):
+    """Generates docs for 'ba' module."""
+
+    top_module_name = 'ba'
+    # Ignore them as they are already shown in ba.__init__.
+    ignored_modules = ['ba.internal', 'ba.ui']
+
+    def _add_index_links(self,
+                         docs: str,
+                         ignore_links: Optional[list[str]] = None) -> str:
+        docs = super()._add_index_links(docs, ignore_links=ignore_links)
+
+        # Misc replacements:
+        docs = docs.replace(
+            'General message handling; can be passed any message object.',
+            'General message handling; can be passed any <a href="#' +
+            _get_class_category_href('Message Classes') +
+            '">message object</a>.')
+
+        return docs
+
+
+class BastdModuleGenerator(BaseGenerator):
+    """Generates docs for 'bastd' module and all submodules."""
+
+    top_module_name = 'bastd'
+    # Mypy complains if there is no type annotation
+    # (though it is in base class).
+    ignored_modules: list[str] = []
 
 
 def generate(projroot: str) -> None:
@@ -1278,7 +1349,8 @@ def generate(projroot: str) -> None:
     # Make sure we're running from the dir above this script.
     os.chdir(projroot)
 
-    outfilename = os.path.abspath('build/docs.html')
+    ba_out_file_name = os.path.abspath('build/docs_ba.html')
+    bastd_out_file_name = os.path.abspath('build/docs_bastd.html')
 
     # Let's build the cmake version; no sandboxing issues to contend
     # with there. Also going with the headless build; will need to revisit
@@ -1298,7 +1370,8 @@ def generate(projroot: str) -> None:
                 f'    import ba\n'
                 f'    sys.path.append("{toolsdir}")\n'
                 f'    import batools.docs\n'
-                f'    batools.docs.Generator().run("{outfilename}")\n'
+                f'    batools.docs.BaModuleGenerator().run("{ba_out_file_name}")\n'
+                f'    batools.docs.BastdModuleGenerator().run("{bastd_out_file_name}")\n'
                 f'    ba.quit()\n'
                 f'except Exception:\n'
                 f'    import sys\n'

From c09770b9daf97ea92d631052b7066e0a2715f22e Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Thu, 10 Feb 2022 18:22:14 +0300
Subject: [PATCH 02/21] more docs generation stuff

---
 tools/batools/docs.py | 63 +++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index 0b89fe33..fa5fcecc 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -253,7 +253,6 @@ def _get_module_classes(module: ModuleType) -> list[tuple[str, type]]:
 
 
 def _is_inherited(cls: type, name: str) -> bool:
-
     method = getattr(cls, name)
 
     # Classmethods are already bound with the class as self.
@@ -353,7 +352,6 @@ def _print_child_classes(category_classes: list[ClassInfo], parent: str,
 
 def _add_inner_classes(class_objs: Sequence[type],
                        classes_by_name: list[tuple[str, type]]) -> None:
-
     # Ok, now go through all existing classes and look for classes
     # defined within.
     for cls in class_objs:
@@ -376,12 +374,15 @@ class BaseGenerator:
 
     # This should be overridden by inherited classes.
 
-    # Top-level module (e.g. 'ba')
+    # Top-level module (e.g. 'ba').
     top_module_name: str
 
-    # Modules NOT to generate docs for. Example: ['ba.internal']
+    # Modules NOT to generate docs for. Example: ['ba.internal'].
     ignored_modules: list[str]
 
+    # Docs file header.
+    header: str = ''
+
     def __init__(self) -> None:
         self._index_keys: list[str] = []
 
@@ -701,13 +702,13 @@ class BaseGenerator:
         return mdocs_lines
 
     def _create_index(self) -> None:
-
         # Create an index of everything we can link to in classes and
         # functions.
         for cls in self._classes:
             key = cls.name
             if key in self._index:
-                print('duplicate index entry:', key)
+                # print('duplicate index entry:', key)
+                continue
             self._index[key] = (_get_class_href(cls.name), cls)
             self._index_keys.append(key)
 
@@ -715,7 +716,8 @@ class BaseGenerator:
             for mth in cls.methods:
                 key = cls.name + '.' + mth.name
                 if key in self._index:
-                    print('duplicate index entry:', key)
+                    # print('duplicate index entry:', key)
+                    continue
                 self._index[key] = (_get_method_href(cls.name, mth.name), mth)
                 self._index_keys.append(key)
 
@@ -723,7 +725,8 @@ class BaseGenerator:
             for attr in cls.attributes:
                 key = cls.name + '.' + attr.name
                 if key in self._index:
-                    print('duplicate index entry:', key)
+                    # print('duplicate index entry:', key)
+                    continue
                 self._index[key] = (_get_attribute_href(cls.name,
                                                         attr.name), attr)
                 self._index_keys.append(key)
@@ -732,7 +735,8 @@ class BaseGenerator:
         for fnc in self._functions:
             key = fnc.name
             if key in self._index:
-                print('duplicate index entry:', key)
+                # print('duplicate index entry:', key)
+                continue
             self._index[key] = (_get_function_href(fnc.name), fnc)
             self._index_keys.append(key)
 
@@ -1067,7 +1071,8 @@ class BaseGenerator:
             getattr(module, name) for name in names if not name.startswith('_')
         ]
         funcs = [
-            obj for obj in objects if any(isinstance(obj, t) for t in func_types)
+            obj for obj in objects if any(
+                isinstance(obj, t) for t in func_types)
         ]
         # Or should we take care of this in modules itself?..
         funcs = [
@@ -1113,10 +1118,6 @@ class BaseGenerator:
                 self._functions.append(f_info)
 
     def _process_classes(self, module: ModuleType) -> None:
-        # We don't want generate docs not for our submodules.
-        if not module.__name__.startswith(f'{self.top_module_name}'):
-            return
-
         classes_by_name = _get_module_classes(module)
         for c_name, cls in classes_by_name:
             docs = self._get_base_docs_for_class(cls)
@@ -1202,11 +1203,14 @@ class BaseGenerator:
 
     def run(self, outfilename: str) -> None:
         """Generate docs from within the game."""
+        # pylint: disable=too-many-locals
+
         import ba
 
         self._collect_submodules(self.get_top_module())
-        print([sm.__name__ for sm in self._submodules])
-        for module in sorted(self._submodules, key=lambda m: m.__name__):
+        submodules = list(sorted(self._submodules, key=lambda x: x.__name__))
+        print([sm.__name__ for sm in submodules])
+        for module in submodules:
             self._gather_funcs(module)
             self._process_classes(module)
 
@@ -1215,15 +1219,7 @@ class BaseGenerator:
         self._out += ('<h4><em>last updated on ' + str(datetime.date.today()) +
                       ' for Ballistica version ' + app.version + ' build ' +
                       str(app.build_number) + '</em></h4>\n')
-        self._out += (
-            '<p>This page documents the Python classes'
-            ' and functions in the \'ba\' module,\n'
-            ' 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 '
-            '<a href="mailto:support@froemling.net">'
-            'let me know</a>. Happy modding!</p>\n')
+        self._out += self.header
         self._out += '<hr>\n'
         self._out += '<h2>Table of Contents</h2>\n'
 
@@ -1315,8 +1311,15 @@ class BaModuleGenerator(BaseGenerator):
     """Generates docs for 'ba' module."""
 
     top_module_name = 'ba'
-    # Ignore them as they are already shown in ba.__init__.
     ignored_modules = ['ba.internal', 'ba.ui']
+    header = ('<p>This page documents the Python classes'
+              ' and functions in the \'ba\' module,\n'
+              ' 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 '
+              '<a href="mailto:support@froemling.net">'
+              'let me know</a>. Happy modding!</p>\n')
 
     def _add_index_links(self,
                          docs: str,
@@ -1340,6 +1343,14 @@ class BastdModuleGenerator(BaseGenerator):
     # Mypy complains if there is no type annotation
     # (though it is in base class).
     ignored_modules: list[str] = []
+    header = ('<p>This page documents the Python classes'
+              ' and functions in the \'bastd\' module,\n'
+              ' which are also often needed to modding.'
+              ' If you come across something you feel'
+              ' should be included here or could'
+              ' be better explained, please '
+              '<a href="mailto:support@froemling.net">'
+              'let me know</a>. Happy modding!</p>\n')
 
 
 def generate(projroot: str) -> None:

From 723a7744cf3d6d6f39cc1696e782d92e50be9a92 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Thu, 10 Feb 2022 19:08:10 +0300
Subject: [PATCH 03/21] fixed generation errors

---
 .idea/dictionaries/roman.xml                  |  1 +
 assets/src/ba_data/python/bastd/actor/bomb.py | 62 +++++++++----------
 assets/src/ba_data/python/bastd/actor/flag.py | 10 +--
 .../ba_data/python/bastd/actor/playerspaz.py  |  2 +-
 .../ba_data/python/bastd/actor/powerupbox.py  | 36 +++++------
 assets/src/ba_data/python/bastd/actor/spaz.py |  2 +-
 .../src/ba_data/python/bastd/actor/spazbot.py | 10 +--
 .../ba_data/python/bastd/actor/spazfactory.py | 32 +++++-----
 tools/batools/docs.py                         | 47 ++++++++++----
 9 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/.idea/dictionaries/roman.xml b/.idea/dictionaries/roman.xml
index d594223f..58cf7470 100644
--- a/.idea/dictionaries/roman.xml
+++ b/.idea/dictionaries/roman.xml
@@ -4,6 +4,7 @@
       <w>gamename</w>
       <w>maxlen</w>
       <w>pagename</w>
+      <w>unhashable</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file
diff --git a/assets/src/ba_data/python/bastd/actor/bomb.py b/assets/src/ba_data/python/bastd/actor/bomb.py
index 1c86f1fa..6528367a 100644
--- a/assets/src/ba_data/python/bastd/actor/bomb.py
+++ b/assets/src/ba_data/python/bastd/actor/bomb.py
@@ -29,102 +29,102 @@ class BombFactory:
 
     Attributes:
 
-       bomb_model
+       bomb_model: ba.Model
           The ba.Model of a standard or ice bomb.
 
-       sticky_bomb_model
+       sticky_bomb_model: ba.Model
           The ba.Model of a sticky-bomb.
 
-       impact_bomb_model
+       impact_bomb_model: ba.Model
           The ba.Model of an impact-bomb.
 
-       land_mine_model
+       land_mine_model: ba.Model
           The ba.Model of a land-mine.
 
-       tnt_model
+       tnt_model: ba.Model
           The ba.Model of a tnt box.
 
-       regular_tex
+       regular_tex: ba.Texture
           The ba.Texture for regular bombs.
 
-       ice_tex
+       ice_tex: ba.Texture
           The ba.Texture for ice bombs.
 
-       sticky_tex
+       sticky_tex: ba.Texture
           The ba.Texture for sticky bombs.
 
-       impact_tex
+       impact_tex: ba.Texture
           The ba.Texture for impact bombs.
 
-       impact_lit_tex
+       impact_lit_tex: ba.Texture
           The ba.Texture for impact bombs with lights lit.
 
-       land_mine_tex
+       land_mine_tex: ba.Texture
           The ba.Texture for land-mines.
 
-       land_mine_lit_tex
+       land_mine_lit_tex: ba.Texture
           The ba.Texture for land-mines with the light lit.
 
-       tnt_tex
+       tnt_tex: ba.Texture
           The ba.Texture for tnt boxes.
 
-       hiss_sound
+       hiss_sound: ba.Sound
           The ba.Sound for the hiss sound an ice bomb makes.
 
-       debris_fall_sound
+       debris_fall_sound: ba.Sound
           The ba.Sound for random falling debris after an explosion.
 
-       wood_debris_fall_sound
+       wood_debris_fall_sound: ba.Sound
           A ba.Sound for random wood debris falling after an explosion.
 
-       explode_sounds
+       explode_sounds: Sequence[ba.Sound]
           A tuple of ba.Sounds for explosions.
 
-       freeze_sound
+       freeze_sound: ba.Sound
           A ba.Sound of an ice bomb freezing something.
 
-       fuse_sound
+       fuse_sound: ba.Sound
           A ba.Sound of a burning fuse.
 
-       activate_sound
+       activate_sound: ba.Sound
           A ba.Sound for an activating impact bomb.
 
-       warn_sound
+       warn_sound: ba.Sound
           A ba.Sound for an impact bomb about to explode due to time-out.
 
-       bomb_material
+       bomb_material: ba.Material
           A ba.Material applied to all bombs.
 
-       normal_sound_material
+       normal_sound_material: ba.Material
           A ba.Material that generates standard bomb noises on impacts, etc.
 
-       sticky_material
+       sticky_material: ba.Material
           A ba.Material that makes 'splat' sounds and makes collisions softer.
 
-       land_mine_no_explode_material
+       land_mine_no_explode_material: ba.Material
           A ba.Material that keeps land-mines from blowing up.
           Applied to land-mines when they are created to allow land-mines to
           touch without exploding.
 
-       land_mine_blast_material
+       land_mine_blast_material: ba.Material
           A ba.Material applied to activated land-mines that causes them to
           explode on impact.
 
-       impact_blast_material
+       impact_blast_material: ba.Material
           A ba.Material applied to activated impact-bombs that causes them to
           explode on impact.
 
-       blast_material
+       blast_material: ba.Material
           A ba.Material applied to bomb blast geometry which triggers impact
           events with what it touches.
 
-       dink_sounds
+       dink_sounds: Sequence[ba.Sound]
           A tuple of ba.Sounds for when bombs hit the ground.
 
-       sticky_impact_sound
+       sticky_impact_sound: ba.Sound
           The ba.Sound for a squish made by a sticky bomb hitting something.
 
-       roll_sound
+       roll_sound: ba.Sound
           ba.Sound for a rolling bomb.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/flag.py b/assets/src/ba_data/python/bastd/actor/flag.py
index 417a3d46..5bb693dc 100644
--- a/assets/src/ba_data/python/bastd/actor/flag.py
+++ b/assets/src/ba_data/python/bastd/actor/flag.py
@@ -24,20 +24,20 @@ class FlagFactory:
 
     Attributes:
 
-       flagmaterial
+       flagmaterial: ba.Material
           The ba.Material applied to all ba.Flags.
 
-       impact_sound
+       impact_sound: ba.Sound
           The ba.Sound used when a ba.Flag hits the ground.
 
-       skid_sound
+       skid_sound: ba.Sound
           The ba.Sound used when a ba.Flag skids along the ground.
 
-       no_hit_material
+       no_hit_material: ba.Material
           A ba.Material that prevents contact with most objects;
           applied to 'non-touchable' flags.
 
-       flag_texture
+       flag_texture: ba.Texture
           The ba.Texture for flags.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/playerspaz.py b/assets/src/ba_data/python/bastd/actor/playerspaz.py
index 7969dc75..6cc762e7 100644
--- a/assets/src/ba_data/python/bastd/actor/playerspaz.py
+++ b/assets/src/ba_data/python/bastd/actor/playerspaz.py
@@ -23,7 +23,7 @@ class PlayerSpazHurtMessage:
 
     Attributes:
 
-       spaz
+       spaz: ba.PlayerSpaz
           The ba.PlayerSpaz that was hurt
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/powerupbox.py b/assets/src/ba_data/python/bastd/actor/powerupbox.py
index bed2de5d..3dda1d9a 100644
--- a/assets/src/ba_data/python/bastd/actor/powerupbox.py
+++ b/assets/src/ba_data/python/bastd/actor/powerupbox.py
@@ -30,52 +30,52 @@ class PowerupBoxFactory:
 
     Attributes:
 
-       model
+       model: ba.Model
           The ba.Model of the powerup box.
 
-       model_simple
+       model_simple: ba.Model
           A simpler ba.Model of the powerup box, for use in shadows, etc.
 
-       tex_bomb
+       tex_bomb: ba.Texture
           Triple-bomb powerup ba.Texture.
 
-       tex_punch
+       tex_punch: ba.Texture
           Punch powerup ba.Texture.
 
-       tex_ice_bombs
+       tex_ice_bombs: ba.Texture
           Ice bomb powerup ba.Texture.
 
-       tex_sticky_bombs
+       tex_sticky_bombs: ba.Texture
           Sticky bomb powerup ba.Texture.
 
-       tex_shield
+       tex_shield: ba.Texture
           Shield powerup ba.Texture.
 
-       tex_impact_bombs
+       tex_impact_bombs: ba.Texture
           Impact-bomb powerup ba.Texture.
 
-       tex_health
+       tex_health: ba.Texture
           Health powerup ba.Texture.
 
-       tex_land_mines
+       tex_land_mines: ba.Texture
           Land-mine powerup ba.Texture.
 
-       tex_curse
+       tex_curse: ba.Texture
           Curse powerup ba.Texture.
 
-       health_powerup_sound
+       health_powerup_sound: ba.Sound
           ba.Sound played when a health powerup is accepted.
 
-       powerup_sound
+       powerup_sound: ba.Sound
           ba.Sound played when a powerup is accepted.
 
-       powerdown_sound
+       powerdown_sound: ba.Sound
           ba.Sound that can be used when powerups wear off.
 
-       powerup_material
+       powerup_material: ba.Material
           ba.Material applied to powerup boxes.
 
-       powerup_accept_material
+       powerup_accept_material: ba.Material
           Powerups will send a ba.PowerupMessage to anything they touch
           that has this ba.Material applied.
     """
@@ -194,12 +194,12 @@ class PowerupBox(ba.Actor):
 
     Attributes:
 
-       poweruptype
+       poweruptype: str
           The string powerup type.  This can be 'triple_bombs', 'punch',
           'ice_bombs', 'impact_bombs', 'land_mines', 'sticky_bombs', 'shield',
           'health', or 'curse'.
 
-       node
+       node: ba.Node
           The 'prop' ba.Node representing this box.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py
index 45931bb1..8209e4da 100644
--- a/assets/src/ba_data/python/bastd/actor/spaz.py
+++ b/assets/src/ba_data/python/bastd/actor/spaz.py
@@ -52,7 +52,7 @@ class Spaz(ba.Actor):
 
     Attributes:
 
-       node
+       node: ba.Node
           The 'spaz' ba.Node.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/spazbot.py b/assets/src/ba_data/python/bastd/actor/spazbot.py
index 9d4d92ec..e225962f 100644
--- a/assets/src/ba_data/python/bastd/actor/spazbot.py
+++ b/assets/src/ba_data/python/bastd/actor/spazbot.py
@@ -31,10 +31,10 @@ class SpazBotPunchedMessage:
 
     Attributes:
 
-       spazbot
+       spazbot: ba.SpazBot
           The ba.SpazBot that got punched.
 
-       damage
+       damage: int
           How much damage was done to the ba.SpazBot.
     """
 
@@ -51,13 +51,13 @@ class SpazBotDiedMessage:
 
     Attributes:
 
-       spazbot
+       spazbot: ba.SpazBot
           The ba.SpazBot that was killed.
 
-       killerplayer
+       killerplayer: ba.Player
           The ba.Player that killed it (or None).
 
-       how
+       how: ba.DeathType
           The particular type of death.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/spazfactory.py b/assets/src/ba_data/python/bastd/actor/spazfactory.py
index ed06d72e..af7eb868 100644
--- a/assets/src/ba_data/python/bastd/actor/spazfactory.py
+++ b/assets/src/ba_data/python/bastd/actor/spazfactory.py
@@ -25,55 +25,55 @@ class SpazFactory:
 
     Attributes:
 
-       impact_sounds_medium
+       impact_sounds_medium: Sequence[ba.Sound]
           A tuple of ba.Sounds for when a ba.Spaz hits something kinda hard.
 
-       impact_sounds_hard
+       impact_sounds_hard: Sequence[ba.Sound]
           A tuple of ba.Sounds for when a ba.Spaz hits something really hard.
 
-       impact_sounds_harder
+       impact_sounds_harder: Sequence[ba.Sound]
           A tuple of ba.Sounds for when a ba.Spaz hits something really
           really hard.
 
-       single_player_death_sound
+       single_player_death_sound: ba.Sound
           The sound that plays for an 'important' spaz death such as in
           co-op games.
 
-       punch_sound
+       punch_sound: ba.Sound
           A standard punch ba.Sound.
 
-       punch_sound_strong
+       punch_sound_strong: Sequence[ba.Sound]
           A tuple of stronger sounding punch ba.Sounds.
 
-       punch_sound_stronger
+       punch_sound_stronger: ba.Sound
           A really really strong sounding punch ba.Sound.
 
-       swish_sound
+       swish_sound: ba.Sound
           A punch swish ba.Sound.
 
-       block_sound
+       block_sound: ba.Sound
           A ba.Sound for when an attack is blocked by invincibility.
 
-       shatter_sound
+       shatter_sound: ba.Sound
           A ba.Sound for when a frozen ba.Spaz shatters.
 
-       splatter_sound
+       splatter_sound: ba.Sound
           A ba.Sound for when a ba.Spaz blows up via curse.
 
-       spaz_material
+       spaz_material: ba.Material
           A ba.Material applied to all of parts of a ba.Spaz.
 
-       roller_material
+       roller_material: ba.Material
           A ba.Material applied to the invisible roller ball body that
           a ba.Spaz uses for locomotion.
 
-       punch_material
+       punch_material: ba.Material
           A ba.Material applied to the 'fist' of a ba.Spaz.
 
-       pickup_material
+       pickup_material: ba.Material
           A ba.Material applied to the 'grabber' body of a ba.Spaz.
 
-       curse_material
+       curse_material: ba.Material
           A ba.Material applied to a cursed ba.Spaz that triggers an explosion.
     """
 
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index fa5fcecc..2653d528 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -397,7 +397,9 @@ class BaseGenerator:
                                                 AttributeInfo]]] = {}
         self._out = ''
         self._classes: list[ClassInfo] = []
+        self._class_names: set[str] = set()
         self._functions: list[FunctionInfo] = []
+        self._function_names: set[str] = set()
         self._merged_categories: list[tuple[str, str,
                                             list[Union[ClassInfo,
                                                        FunctionInfo]]]] = []
@@ -707,8 +709,7 @@ class BaseGenerator:
         for cls in self._classes:
             key = cls.name
             if key in self._index:
-                # print('duplicate index entry:', key)
-                continue
+                print(f'WARNING: duplicate index entry: {key}')
             self._index[key] = (_get_class_href(cls.name), cls)
             self._index_keys.append(key)
 
@@ -716,8 +717,7 @@ class BaseGenerator:
             for mth in cls.methods:
                 key = cls.name + '.' + mth.name
                 if key in self._index:
-                    # print('duplicate index entry:', key)
-                    continue
+                    print(f'WARNING: duplicate index entry: {key}')
                 self._index[key] = (_get_method_href(cls.name, mth.name), mth)
                 self._index_keys.append(key)
 
@@ -725,8 +725,7 @@ class BaseGenerator:
             for attr in cls.attributes:
                 key = cls.name + '.' + attr.name
                 if key in self._index:
-                    # print('duplicate index entry:', key)
-                    continue
+                    print(f'WARNING: duplicate index entry: {key}')
                 self._index[key] = (_get_attribute_href(cls.name,
                                                         attr.name), attr)
                 self._index_keys.append(key)
@@ -735,8 +734,7 @@ class BaseGenerator:
         for fnc in self._functions:
             key = fnc.name
             if key in self._index:
-                # print('duplicate index entry:', key)
-                continue
+                print(f'WARNING: duplicate index entry: {key}')
             self._index[key] = (_get_function_href(fnc.name), fnc)
             self._index_keys.append(key)
 
@@ -1114,8 +1112,9 @@ class BaseGenerator:
                                   category=_get_category(
                                       docs, CategoryType.FUNCTION),
                                   docs=docs)
-            if '(internal)' not in docs:
+            if '(internal)' not in docs and f_info.name not in self._function_names:
                 self._functions.append(f_info)
+                self._function_names.add(f_info.name)
 
     def _process_classes(self, module: ModuleType) -> None:
         classes_by_name = _get_module_classes(module)
@@ -1135,7 +1134,9 @@ class BaseGenerator:
                                category=_get_category(docs,
                                                       CategoryType.CLASS),
                                attributes=attrs)
-            self._classes.append(c_info)
+            if c_info.name not in self._class_names:
+                self._classes.append(c_info)
+                self._class_names.add(c_info.name)
 
     def _write_category_list(self) -> None:
         for cname, ctype, cmembers in self._merged_categories:
@@ -1207,13 +1208,35 @@ class BaseGenerator:
 
         import ba
 
+        print(f"Generating docs file: '{Clr.BLU}{outfilename}{Clr.RST}'...")
+
+        # Collect everything we want to generate docs for.
         self._collect_submodules(self.get_top_module())
         submodules = list(sorted(self._submodules, key=lambda x: x.__name__))
-        print([sm.__name__ for sm in submodules])
+        print(f'{self.top_module_name} submodules:\n -->',
+              '\n --> '.join([sm.__name__ for sm in submodules]))
         for module in submodules:
             self._gather_funcs(module)
             self._process_classes(module)
 
+        # Remove duplicates. This probably should be handled at
+        # self._gather_funcs/self._process_classes level (i.e. just not to add
+        # already existing things), but the main problem is unhashable
+        # ClassInfo dataclass which leads to O(N^2) asymptotic (though I didn't
+        # check how exactly slow it would be).
+        # funcs = self._functions
+        # funcs.sort(key=lambda x: x.name)
+        # f_last: Optional[FunctionInfo] = None
+        # self._functions = []
+        # for func in funcs:
+        #     if func.name == f_last.name:
+        #         continue
+        #     f_last = func
+        #     self._functions.append(func)
+
+        self._functions.sort(key=lambda x: x.name)
+        self._classes.sort(key=lambda x: x.name)
+
         # Start with our list of classes and functions.
         app = ba.app
         self._out += ('<h4><em>last updated on ' + str(datetime.date.today()) +
@@ -1304,7 +1327,7 @@ class BaseGenerator:
         with open(outfilename, 'w', encoding='utf-8') as outfile:
             outfile.write(self._out)
 
-        print(f"Generated docs file: '{Clr.BLU}{outfilename}.{Clr.RST}'")
+        print(f"Generated docs file: '{Clr.BLU}{outfilename}{Clr.RST}'.")
 
 
 class BaModuleGenerator(BaseGenerator):

From 4ab704bb2f284267328ab33384fe550b50765b23 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Thu, 10 Feb 2022 22:18:47 +0300
Subject: [PATCH 04/21] moved to pdoc docs generation library

---
 .idea/dictionaries/roman.xml                |    2 +
 assets/src/ba_data/python/bastd/ui/popup.py |    4 +-
 tools/batools/docs.py                       | 1069 +------------------
 3 files changed, 19 insertions(+), 1056 deletions(-)

diff --git a/.idea/dictionaries/roman.xml b/.idea/dictionaries/roman.xml
index 58cf7470..941fd83d 100644
--- a/.idea/dictionaries/roman.xml
+++ b/.idea/dictionaries/roman.xml
@@ -3,7 +3,9 @@
     <words>
       <w>gamename</w>
       <w>maxlen</w>
+      <w>outdirname</w>
       <w>pagename</w>
+      <w>pythondir</w>
       <w>unhashable</w>
     </words>
   </dictionary>
diff --git a/assets/src/ba_data/python/bastd/ui/popup.py b/assets/src/ba_data/python/bastd/ui/popup.py
index d89374b2..8a50f8fb 100644
--- a/assets/src/ba_data/python/bastd/ui/popup.py
+++ b/assets/src/ba_data/python/bastd/ui/popup.py
@@ -15,7 +15,9 @@ if TYPE_CHECKING:
 
 
 class PopupWindow:
-    """A transient window that positions and scales itself for visibility."""
+    """A transient window that positions and scales itself for visibility.
+
+    Category: UI Classes"""
 
     def __init__(self,
                  position: tuple[float, float],
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index 2653d528..a436eab1 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -2,20 +2,15 @@
 #
 """Documentation generation functionality."""
 
-# pylint: disable=too-many-lines
-
 from __future__ import annotations
 
-import importlib
+import sys
 import os
-import datetime
 import inspect
-import subprocess
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Union, cast
+from pathlib import Path
+from typing import TYPE_CHECKING
 from enum import Enum
-import types
-import pydoc
 
 from efro.error import CleanError
 from efro.terminal import Clr
@@ -367,1059 +362,23 @@ def _add_inner_classes(class_objs: Sequence[type],
                 (cls.__module__ + '.' + cls.__name__ + '.' + name, obj))
 
 
-class BaseGenerator:
-    """Base class which handles docs generation.
-
-    Some generation options and target module set up in inherited classes."""
-
-    # This should be overridden by inherited classes.
-
-    # Top-level module (e.g. 'ba').
-    top_module_name: str
-
-    # Modules NOT to generate docs for. Example: ['ba.internal'].
-    ignored_modules: list[str]
-
-    # Docs file header.
-    header: str = ''
-
-    def __init__(self) -> None:
-        self._index_keys: list[str] = []
-
-        # All modules where we will search functions and classes to
-        # generate docs for (including top-level module).
-        self._submodules: set[ModuleType] = set()
-
-        # Make a list of missing stuff so we can warn about it in one
-        # big chunk at the end (so the user can batch their corrections).
-        self._errors: list[Any] = []
-        self._index: dict[str, tuple[str, Union[ClassInfo, FunctionInfo,
-                                                AttributeInfo]]] = {}
-        self._out = ''
-        self._classes: list[ClassInfo] = []
-        self._class_names: set[str] = set()
-        self._functions: list[FunctionInfo] = []
-        self._function_names: set[str] = set()
-        self._merged_categories: list[tuple[str, str,
-                                            list[Union[ClassInfo,
-                                                       FunctionInfo]]]] = []
-
-    def name_variants(self, name: str) -> list[str]:
-        """Return variants of a word (such as plural) for linking."""
-        # Do 'ies' plural for words ending in y.
-        # (but not things like foo.y or display or prey)
-        if (len(name) > 1 and name.endswith('y') and name[-2].isalpha()
-                and name[-2] not in {'a', 'e', 'i', 'o', 'u'}):
-            return [name, f'{name[:-1]}ies']
-        # Otherwise assume plural just ends with s:
-        return [name, f'{name}s']
-
-    def _add_index_links(self,
-                         docs: str,
-                         ignore_links: Optional[list[str]] = None) -> str:
-        """Add links to indexed classes/methods/etc found in a docstr."""
-        sub_num = 0
-        subs = {}
-
-        # Ok now replace any names found in our index with links.
-        for index_entry in self._index_keys:
-            if ignore_links is not None and index_entry in ignore_links:
-                continue
-
-            for index_entry_actual in self.name_variants(index_entry):
-                bits = docs.split(index_entry_actual)
-                docs = bits[0]
-
-                # Look at the first char after each split; if its
-                # not alphanumeric, lets replace.
-                for i in range(1, len(bits)):
-                    bit = bits[i]
-                    if not bit:
-                        valid = True
-                    else:
-                        valid = not bit[:1].isalnum()
-                    if valid:
-
-                        # Strip out this name and replace it with a funky
-                        # string to prevent further replacements from
-                        # applying to it.. we'll then swap it back at the end.
-                        sub_name = '<__SUB' + str(sub_num) + '__>'
-                        subs[sub_name] = index_entry_actual
-                        sub_num += 1
-
-                        # Sub in link.
-                        docs += ('<a href="#' + self._index[index_entry][0] +
-                                 '">' + sub_name + '</a>')
-                    else:
-                        docs += index_entry_actual  # Keep original.
-                    docs += bits[i]
-
-        for sub_name, sub_val in list(subs.items()):
-            docs = docs.replace(sub_name, sub_val)
-        return docs
-
-    def _get_all_attrs_for_class(self, cls: type,
-                                 docs: str) -> tuple[str, list[AttributeInfo]]:
-        """
-        if there's an 'Attributes' section in the docs, strip it out and
-        create attributes entries out of it.
-        Returns the stripped down docs as well as detected attrs.
-        """
-        attrs: list[AttributeInfo] = []
-
-        # Start by pulling any type info we find in the doc str.
-        # (necessary in many non-property cases since there's no other way
-        # to annotate attrs)
-        docs = parse_docs_attrs(attrs, docs)
-
-        # In some cases we document an attr in the class doc-string but
-        # provide an annotation for it at the type level.
-        # (this is the case for simple class/instance attributes since we
-        # can't provide docstrings along with those)
-        self._get_class_level_types_for_doc_attrs(cls, attrs)
-
-        # Now pull info on properties, which can have doc-strings and
-        # annotations all in the same place; yay!
-        self._get_property_attrs_for_class(cls, attrs)
-
-        return docs, attrs
-
-    def _get_class_level_types_for_doc_attrs(
-            self, cls: type, attrs: list[AttributeInfo]) -> None:
-        # Take note of all the attrs that we're aware of already;
-        # these are the ones we can potentially provide type info for.
-        existing_attrs_by_name = {a.name: a for a in attrs}
-
-        cls_annotations = getattr(cls, '__annotations__', {})
-
-        for aname, aval in cls_annotations.items():
-            # (we expect __future__ annotations to always be on, which makes
-            # these strings)
-            assert isinstance(aval, str)
-            if aname in existing_attrs_by_name:
-                # Complain if there's a type in both the docs and the type.
-                if existing_attrs_by_name[aname].attr_type is not None:
-                    print('FOUND', existing_attrs_by_name[aname], aval)
-                    self._errors.append(
-                        f'attr {aname} for class {cls}'
-                        'has both a docstring and class level annotation;'
-                        ' should just have one')
-                existing_attrs_by_name[aname].attr_type = aval
-
-    def _get_property_attrs_for_class(self, cls: type,
-                                      attrs: list[AttributeInfo]) -> None:
-        for attrname in dir(cls):
-            attr = getattr(cls, attrname)
-
-            if isinstance(attr, property):
-                if any(a.name == attrname for a in attrs):
-                    raise Exception(f'attr "{attrname}" has both a'
-                                    f' class docs and property entry')
-
-                # Pull its docs.
-                attrdocs = getattr(attr, '__doc__', None)
-                if attrdocs is None:
-                    self._errors.append(
-                        f'property \'{attrname}\' on class {cls}')
-                    attrdocs = '(no docs)'
-                else:
-                    attrdocs = attrdocs.strip()
-
-                # Pull type annotations.
-                attr_annotations = getattr(attr.fget, '__annotations__')
-                if (not isinstance(attr_annotations, dict)
-                        or 'return' not in attr_annotations
-                        or not isinstance(attr_annotations['return'], str)):
-                    raise Exception('property type annotation not found')
-                attrtype = attr_annotations['return']
-
-                if '(internal)' not in attrdocs:
-                    attrs.append(
-                        AttributeInfo(name=attrname,
-                                      docs=attrdocs,
-                                      attr_type=attrtype))
-
-    def _get_base_docs_for_class(self, cls: type) -> str:
-        if cls.__doc__ is not None:
-            docs = cls.__doc__
-            docs_lines = docs.splitlines()
-            min_indent = 9999
-            for i, line in enumerate(docs_lines):
-                if line != '':
-                    spaces = 0
-                    while line and line[0] == ' ':
-                        line = line[1:]
-                        spaces += 1
-                    if spaces < min_indent:
-                        min_indent = spaces
-            if min_indent == 9999:
-                min_indent = 0
-
-            for i, line in enumerate(docs_lines):
-                if line != '':
-                    if not line.startswith(' ' * min_indent):
-                        raise Exception("expected opening whitespace: '" +
-                                        line + "'; class " + str(cls))
-                    docs_lines[i] = line[min_indent:]
-            docs = '\n'.join(docs_lines)
-
-        else:
-            docs = '(no docs)'
-            self._errors.append(f'base docs for class {cls}')
-        return docs
-
-    def _get_enum_values_for_class(self, cls: type) -> Optional[list[str]]:
-        if issubclass(cls, Enum):
-            return [val.name for val in cls]
-        return None
-
-    def _get_methods_for_class(
-            self, cls: type) -> tuple[list[FunctionInfo], list[FunctionInfo]]:
-
-        method_types = [
-            types.MethodDescriptorType, types.FunctionType, types.MethodType
-        ]
-        methods_raw = [
-            getattr(cls, name) for name in dir(cls)
-            if any(isinstance(getattr(cls, name), t)
-                   for t in method_types) and (
-                       not name.startswith('_') or name == '__init__') and
-            '_no_init' not in name and '_no_init_or_replace_init' not in name
-        ]
-
-        methods: list[FunctionInfo] = []
-        inherited_methods: list[FunctionInfo] = []
-        for mth in methods_raw:
-
-            # Protocols seem to give this...
-            if mth.__name__ in {'_no_init', '_no_init_or_replace_init'}:
-                continue
-
-            # Keep a list of inherited methods but don't do a full
-            # listing of them.
-            if _is_inherited(cls, mth.__name__):
-                dcls = _get_defining_class(cls, mth.__name__)
-                assert dcls is not None
-                inherited_methods.append(
-                    FunctionInfo(name=mth.__name__,
-                                 method_class=dcls.__module__ + '.' +
-                                 dcls.__name__))
-                continue
-
-            # Use pydoc stuff for python methods since it includes args.
-
-            # Its a c-defined method.
-            if isinstance(mth, types.MethodDescriptorType):
-                if mth.__doc__ is not None:
-                    mdocs = mth.__doc__
-                else:
-                    mdocs = '(no docs)'
-                    self._errors.append(mth)
-                is_class_method = False
-
-            # Its a python method.
-            else:
-                mdocs, is_class_method = self._python_method_docs(cls, mth)
-            if '(internal)' not in mdocs:
-                methods.append(
-                    FunctionInfo(name=mth.__name__,
-                                 docs=mdocs,
-                                 is_class_method=is_class_method))
-        return methods, inherited_methods
-
-    def _python_method_docs(self, cls: type,
-                            mth: Callable) -> tuple[str, bool]:
-        mdocs_lines = pydoc.plain(pydoc.render_doc(mth)).splitlines()[2:]
-
-        # Remove ugly 'method of builtins.type instance'
-        # on classmethods.
-        mdocs_lines = [
-            l.replace('method of builtins.type instance', '')
-            for l in mdocs_lines
-        ]
-
-        # Pydoc indents all lines but the first 4 spaces;
-        # undo that.
-        for i, line in enumerate(mdocs_lines):
-            if i != 0:
-                if not line.startswith('    '):
-                    raise Exception('UNEXPECTED')
-                mdocs_lines[i] = line[4:]
-
-        # Class-methods will show up as bound methods when we pull
-        # them out of the type (with the type as the object).
-        # Regular methods just show up as normal functions in
-        # python 3 (no more unbound methods).
-        is_class_method = inspect.ismethod(mth)
-
-        # If this only gave us 1 line, it means there's no docs
-        # (the one line is just the call signature).
-        # In that case lets try parent classes to see if they
-        # have docs.
-        if len(mdocs_lines) == 1:
-            mdocs_lines = self._handle_single_line_method_docs(
-                cls, mdocs_lines, mth)
-
-        # Add an empty line after the first.
-        mdocs_lines = [mdocs_lines[0]] + [''] + mdocs_lines[1:]
-        if len(mdocs_lines) == 2:
-            # Special case: we allow dataclass types to have no __init__ docs
-            # since they generate their own init (and their attributes tell
-            # pretty much the whole story about them anyway).
-            if (hasattr(cls, '__dataclass_fields__')
-                    and mth.__name__ == '__init__'):
-                pass
-            else:
-                self._errors.append((cls, mth))
-        mdocs = '\n'.join(mdocs_lines)
-        return mdocs, is_class_method
-
-    def _handle_single_line_method_docs(self, cls: type,
-                                        mdocs_lines: list[str],
-                                        mth: Callable) -> list[str]:
-        for testclass in cls.mro()[1:]:
-            testm = getattr(testclass, mth.__name__, None)
-            if testm is not None:
-                mdocs_lines_test = pydoc.plain(
-                    pydoc.render_doc(testm)).splitlines()[2:]
-
-                # Split before "unbound method" or "method".
-                if 'unbound' in mdocs_lines_test[0]:
-                    if len(mdocs_lines_test[0].split('unbound')) > 2:
-                        raise Exception('multi-unbounds')
-                    mdocs_lines_test[0] = \
-                        mdocs_lines_test[0].split('unbound')[0]
-                else:
-                    if len(mdocs_lines_test[0].split('method')) > 2:
-                        raise Exception('multi-methods')
-                    mdocs_lines_test[0] = \
-                        mdocs_lines_test[0].split('method')[0]
-
-                # If this one has more info in it but its
-                # first line (call signature) matches ours,
-                # go ahead and use its docs in place of ours.
-                if (len(mdocs_lines_test) > 1
-                        and mdocs_lines_test[0] == mdocs_lines[0]):
-                    mdocs_lines = mdocs_lines_test
-        return mdocs_lines
-
-    def _create_index(self) -> None:
-        # Create an index of everything we can link to in classes and
-        # functions.
-        for cls in self._classes:
-            key = cls.name
-            if key in self._index:
-                print(f'WARNING: duplicate index entry: {key}')
-            self._index[key] = (_get_class_href(cls.name), cls)
-            self._index_keys.append(key)
-
-            # Add in methods.
-            for mth in cls.methods:
-                key = cls.name + '.' + mth.name
-                if key in self._index:
-                    print(f'WARNING: duplicate index entry: {key}')
-                self._index[key] = (_get_method_href(cls.name, mth.name), mth)
-                self._index_keys.append(key)
-
-            # Add in attributes.
-            for attr in cls.attributes:
-                key = cls.name + '.' + attr.name
-                if key in self._index:
-                    print(f'WARNING: duplicate index entry: {key}')
-                self._index[key] = (_get_attribute_href(cls.name,
-                                                        attr.name), attr)
-                self._index_keys.append(key)
-
-        # Add in functions.
-        for fnc in self._functions:
-            key = fnc.name
-            if key in self._index:
-                print(f'WARNING: duplicate index entry: {key}')
-            self._index[key] = (_get_function_href(fnc.name), fnc)
-            self._index_keys.append(key)
-
-        # Reverse this so when we replace things with links our longest
-        # ones are searched first (such as nested classes like ba.Foo.Bar).
-        self._index_keys.reverse()
-
-    def _write_inherited_attrs(self, inherited_attrs: dict[str, str]) -> None:
-        style = (' style="padding-left: 0px;"' if DO_STYLES else '')
-        self._out += f'<h3{style}>Attributes Inherited:</h3>\n'
-        style = (' style="padding-left: 30px;"' if DO_STYLES else '')
-        self._out += f'<h5{style}>'
-        inherited_attrs_sorted = list(inherited_attrs.items())
-        inherited_attrs_sorted.sort(key=lambda x: x[0].lower())
-        for i, attr in enumerate(inherited_attrs_sorted):
-            if i != 0:
-                self._out += ', '
-            aname = attr[0]
-            self._out += ('<a href="#' + attr[1] + '">' + aname + '</a>')
-        self._out += '</h5>\n'
-
-    def _write_attrs(self, cls: ClassInfo,
-                     attributes: list[AttributeInfo]) -> None:
-        # Include a block of links to our attrs if we have more
-        # than one.
-        if len(attributes) > 1:
-            self._out += f'<h5{STYLE_PAD_L30}>'
-            for i, attr in enumerate(attributes):
-                if i != 0:
-                    self._out += ', '
-                aname = attr.name
-                self._out += ('<a href="#' +
-                              _get_attribute_href(cls.name, attr.name) + '">' +
-                              aname + '</a>')
-            self._out += '</h5>\n'
-
-        self._out += '<dl>\n'
-        for attr in attributes:
-            cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-            self._out += (f'<dt><h4{STYLE_PAD_L30}>'
-                          f'<a {cssclass}name="' +
-                          _get_attribute_href(cls.name, attr.name) + '">' +
-                          attr.name + '</a></h4></dt><dd>\n')
-
-            # If we've got a type for the attr, spit that out.
-            if attr.attr_type is not None:
-                # Add links to any types we cover.
-                typestr = self._add_index_links(attr.attr_type)
-                style2 = (' style="color: #666677;"' if DO_STYLES else '')
-                self._out += (f'<p{STYLE_PAD_L60}>'
-                              f'<span{style2}>' + typestr + '</span></p>\n')
-            else:
-                self._errors.append(f"Attr '{attr.name}' on {cls.name} "
-                                    'has no type annotation.')
-
-            if attr.docs is not None:
-                self._out += self._filter_docs(attr.docs, 'attribute')
-            self._out += '</dd>\n'
-        self._out += '</dl>\n'
-
-    def _write_class_attrs_all(self, cls: ClassInfo,
-                               attributes: list[AttributeInfo],
-                               inherited_attrs: dict[str, str]) -> None:
-        # If this class has no non-inherited attrs, just print a link to
-        # the base class instead of repeating everything.
-        # Nevermind for now; we never have many attrs so this isn't as
-        # helpful as with methods.
-        if bool(False):
-            if cls.parents:
-                self._out += f'<h3{STYLE_PAD_L0}>Attributes:</h3>\n'
-                par = cls.parents[0]
-                self._out += (f'<p{STYLE_PAD_L30}>&lt;'
-                              'all attributes inherited from ' + '<a href="#' +
-                              _get_class_href(par) + '">' + par + '</a>' +
-                              '&gt;</p>\n')
-        else:
-            # Dump inherited attrs.
-            if inherited_attrs:
-                self._write_inherited_attrs(inherited_attrs)
-
-            # Dump attributes.
-            if attributes:
-                if inherited_attrs:
-                    self._out += (f'<h3{STYLE_PAD_L0}>'
-                                  'Attributes Defined Here:</h3>\n')
-                else:
-                    self._out += f'<h3{STYLE_PAD_L0}>Attributes:</h3>\n'
-
-                self._write_attrs(cls, attributes)
-
-    def _write_enum_vals(self, cls: ClassInfo) -> None:
-        if cls.enum_values is None:
-            return
-        self._out += f'<h3{STYLE_PAD_L0}>Values:</h3>\n'
-        self._out += '<ul>\n'
-        for val in cls.enum_values:
-            self._out += '<li>' + val + '</li>\n'
-        self._out += '</ul>\n'
-
-    def _write_inherited_methods_for_class(self, cls: ClassInfo) -> None:
-        """Dump inherited methods for a class."""
-        if cls.inherited_methods:
-            # If we inherit directly from a builtin class,
-            # lets not print inherited methods at all since
-            # we don't have docs for them.
-            if (len(cls.parents) == 1
-                    and cls.parents[0].startswith('builtins.')):
-                pass
-            else:
-                self._out += f'<h3{STYLE_PAD_L0}>Methods Inherited:</h3>\n'
-                self._out += f'<h5{STYLE_PAD_L30}>'
-                for i, method in enumerate(cls.inherited_methods):
-                    if i != 0:
-                        self._out += ', '
-                    mname = method.name + '()'
-                    if mname == '__init__()':
-                        mname = '&lt;constructor&gt;'
-                    assert method.method_class is not None
-                    self._out += (
-                        '<a href="#' +
-                        _get_method_href(method.method_class, method.name) +
-                        '">' + mname + '</a>')
-                self._out += '</h5>\n'
-
-    def _write_methods_for_class(self, cls: ClassInfo,
-                                 methods: list[FunctionInfo]) -> None:
-        """Dump methods for a class."""
-        if cls.methods:
-            # Just say "methods" if we had no inherited ones.
-            if cls.inherited_methods:
-                self._out += (f'<h3{STYLE_PAD_L0}>'
-                              'Methods Defined or Overridden:</h3>\n')
-            else:
-                self._out += f'<h3{STYLE_PAD_L0}>Methods:</h3>\n'
-
-            # Include a block of links to our methods if we have more
-            # than one.
-            if len(methods) > 1:
-                self._out += f'<h5{STYLE_PAD_L30}>'
-                for i, method in enumerate(methods):
-                    if i != 0:
-                        self._out += ', '
-                    mname = method.name + '()'
-                    if mname == '__init__()':
-                        mname = '&lt;constructor&gt;'
-                    self._out += ('<a href="#' +
-                                  _get_method_href(cls.name, method.name) +
-                                  '">' + mname + '</a>')
-                self._out += '</h5>\n'
-
-            self._out += '<dl>\n'
-            for mth in cls.methods:
-                self._write_method(cls, mth)
-            self._out += '</dl>\n'
-
-    def _write_method(self, cls: ClassInfo, mth: FunctionInfo) -> None:
-        name = mth.name + '()'
-        ignore_links = []
-        if name == '__init__()':
-            ignore_links.append(cls.name)
-            name = '&lt;constructor&gt;'
-
-        # If we have a 3 part name such as
-        # 'ba.Spaz.DeathMessage',
-        # ignore the first 2 components ('ba.Spaz').
-        dot_splits = cls.name.split('.')
-        if len(dot_splits) == 3:
-            ignore_links.append(dot_splits[0] + '.' + dot_splits[1])
-        cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-
-        self._out += (f'<dt><h4{STYLE_PAD_L30}>'
-                      f'<a{cssclass} name="' +
-                      _get_method_href(cls.name, mth.name) + '">' + name +
-                      '</a></dt></h4><dd>\n')
-        if mth.docs is not None:
-            mdocslines = mth.docs.splitlines()
-
-            # Hmm should we be pulling from the class docs
-            # as python suggests?..  hiding the suggestion to do so.
-            mdocslines = [
-                l for l in mdocslines
-                if 'Initialize self.  See help(type(self))'
-                ' for accurate signature' not in l
-            ]
-
-            # Kill any '-> None' on inits.
-            if '__init__' in mdocslines[0]:
-                mdocslines[0] = mdocslines[0].split(' -> ')[0]
-
-            # Let's display '__init__(self, foo)' as 'Name(foo)'.
-            mdocslines[0] = mdocslines[0].replace('__init__(self, ',
-                                                  cls.name + '(')
-            mdocslines[0] = mdocslines[0].replace('__init__(self)',
-                                                  cls.name + '()')
-
-            if mth.is_class_method:
-                style2 = (' style="color: #CC6600;"' if DO_STYLES else '')
-                self._out += (f'<h5{STYLE_PAD_L60}>'
-                              f'<span{style2}>'
-                              '<em>&lt;class method&gt;'
-                              '</span></em></h5>\n')
-            self._out += self._filter_docs('\n'.join(mdocslines),
-                                           'method',
-                                           ignore_links=ignore_links)
-        self._out += '</dd>\n'
-
-    def _get_type_display(self, name: str) -> str:
-        """Given a string such as 'ba.ClassName', returns link/txt for it."""
-        # Special-case; don't do links for built in classes.
-        if name.startswith('builtins.'):
-            shortname = name.replace('builtins.', '')
-
-            # Show handy links for some builtin python types
-            if shortname in {
-                    'Exception', 'BaseException', 'RuntimeError', 'ValueError'
-            }:
-                return (f'<a href="https://docs.python.org/3/library'
-                        f'/exceptions.html#{shortname}">{shortname}</a>')
-        if name.startswith('ba.'):
-            return ('<a href="#' + _get_class_href(name) + '">' + name +
-                    '</a>')
-
-        # Show handy links for various standard library types.
-        if name in {'typing.Generic', 'typing.Protocol'}:
-            return (f'<a href="https://docs.python.org/3/library'
-                    f'/typing.html#{name}">{name}</a>')
-        if name in {'enum.Enum'}:
-            return (f'<a href="https://docs.python.org/3/library'
-                    f'/enum.html#{name}">{name}</a>')
-
-        return name
-
-    def _write_class_inheritance(self, cls: ClassInfo) -> None:
-        if cls.parents:
-            self._out += f'<p{STYLE_PAD_L30}>Inherits from: '
-            for i, par in enumerate(cls.parents):
-
-                if i != 0:
-                    self._out += ', '
-
-                self._out += self._get_type_display(par)
-        else:
-            self._out += (f'<p{STYLE_PAD_L30}>'
-                          '<em>&lt;top level class&gt;</em>\n')
-
-    def _get_inherited_attrs(self, cls: ClassInfo,
-                             attr_name_set: set[str]) -> dict[str, str]:
-        inherited_attrs: dict[str, str] = {}
-        for par in cls.parents:
-            if par in self._index:
-                parent_class = self._index[par][1]
-                assert isinstance(parent_class, ClassInfo)
-                for attr in parent_class.attributes:
-                    if (attr.name not in attr_name_set
-                            and attr.name not in inherited_attrs):
-                        inherited_attrs[attr.name] = (_get_attribute_href(
-                            parent_class.name, attr.name))
-        self._out += '</p>\n'
-        return inherited_attrs
-
-    def _write_classes(self) -> None:
-        # Now write out the docs for each class.
-        for cls in self._classes:
-            self._out += '<hr>\n'
-            cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-            self._out += (f'<h2><strong><a{cssclass} name="' +
-                          _get_class_href(cls.name) + '">' + cls.name +
-                          '</a></strong></h3>\n')
-            self._write_class_inheritance(cls)
-            methods = cls.methods
-            methods.sort(key=lambda x: x.name.lower())
-            attributes = cls.attributes
-            attributes.sort(key=lambda x: x.name.lower())
-
-            attr_name_set = set()
-            for attr in attributes:
-                attr_name_set.add(attr.name)
-
-            # Go through parent classes' attributes, including any
-            # that aren't in our set in the 'inherited attributes' list.
-
-            inherited_attrs = self._get_inherited_attrs(cls, attr_name_set)
-
-            if cls.docs is not None:
-                self._out += self._filter_docs(cls.docs, 'class')
-
-            self._write_class_attrs_all(cls, attributes, inherited_attrs)
-
-            self._write_enum_vals(cls)
-
-            # If this class has no non-inherited methods, just print a link to
-            # the base class instead of repeating everything.
-            if cls.inherited_methods and not cls.methods:
-                if cls.parents:
-                    self._out += f'<h3{STYLE_PAD_L0}>Methods:</h3>\n'
-                    par = cls.parents[0]
-                    self._out += (f'<p{STYLE_PAD_L30}>&lt;'
-                                  'all methods inherited from ' +
-                                  self._get_type_display(par) + '&gt;</p>\n')
-            else:
-                self._write_inherited_methods_for_class(cls)
-                self._write_methods_for_class(cls, methods)
-
-    def _collect_submodules(self, module: ModuleType) -> None:
-        # In case we somehow met one module twice.
-        if module in self._submodules:
-            return
-
-        if module.__name__ in self.ignored_modules:
-            return
-
-        if not module.__name__.startswith(self.top_module_name):
-            return
-
-        self._submodules.add(module)
-
-        names = dir(module)
-        objects = [
-            getattr(module, name) for name in names if not name.startswith('_')
-        ]
-        submodules = [
-            obj for obj in objects if isinstance(obj, types.ModuleType)
-        ]
-        for submodule in submodules:
-            self._collect_submodules(submodule)
-
-    def _gather_funcs(self, module: ModuleType) -> None:
-        func_types = [types.FunctionType, types.BuiltinMethodType]
-
-        names = dir(module)
-        objects = [
-            getattr(module, name) for name in names if not name.startswith('_')
-        ]
-        funcs = [
-            obj for obj in objects if any(
-                isinstance(obj, t) for t in func_types)
-        ]
-        # Or should we take care of this in modules itself?..
-        funcs = [
-            f for f in funcs if f.__name__.startswith(self.top_module_name)
-        ]
-
-        for fnc in funcs:
-            # For non-builtin funcs, use the pydoc rendering since it includes
-            # args.
-            # Chop off the first line which is just "Python Library
-            # Documentation: and the second which is blank.
-            docs = None
-            if isinstance(fnc, types.FunctionType):
-                docslines = pydoc.plain(pydoc.render_doc(fnc)).splitlines()[2:]
-
-                # Pydoc indents all lines but the first 4 spaces; undo that.
-                for i, line in enumerate(docslines):
-                    if i != 0:
-                        if not line.startswith('    '):
-                            raise Exception('UNEXPECTED')
-                        docslines[i] = line[4:]
-
-                # Add an empty line after the first.
-                docslines = [docslines[0]] + [''] + docslines[1:]
-
-                if len(docslines) == 2:
-                    docslines.append('(no docs)')
-                    self._errors.append(fnc)
-                docs = '\n'.join(docslines)
-            else:
-                if fnc.__doc__ is not None:
-                    docs = fnc.__doc__
-                else:
-                    fnc.__doc__ = '(no docs)'
-                    self._errors.append(fnc)
-            assert docs is not None
-
-            f_info = FunctionInfo(name=fnc.__module__ + '.' + fnc.__name__,
-                                  category=_get_category(
-                                      docs, CategoryType.FUNCTION),
-                                  docs=docs)
-            if '(internal)' not in docs and f_info.name not in self._function_names:
-                self._functions.append(f_info)
-                self._function_names.add(f_info.name)
-
-    def _process_classes(self, module: ModuleType) -> None:
-        classes_by_name = _get_module_classes(module)
-        for c_name, cls in classes_by_name:
-            docs = self._get_base_docs_for_class(cls)
-            bases = _get_bases(cls)
-            methods, inherited_methods = self._get_methods_for_class(cls)
-            enum_values = self._get_enum_values_for_class(cls)
-            docs, attrs = self._get_all_attrs_for_class(cls, docs)
-
-            c_info = ClassInfo(name=c_name,
-                               parents=bases,
-                               docs=docs,
-                               enum_values=enum_values,
-                               methods=methods,
-                               inherited_methods=inherited_methods,
-                               category=_get_category(docs,
-                                                      CategoryType.CLASS),
-                               attributes=attrs)
-            if c_info.name not in self._class_names:
-                self._classes.append(c_info)
-                self._class_names.add(c_info.name)
-
-    def _write_category_list(self) -> None:
-        for cname, ctype, cmembers in self._merged_categories:
-            if ctype == 'class':
-                assert (isinstance(i, ClassInfo) for i in cmembers)
-                cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-                self._out += (f'<h4><a{cssclass} name="' +
-                              _get_class_category_href(cname) + '">' + cname +
-                              '</a></h4>\n')
-                classes_sorted = cast(list[ClassInfo], cmembers)
-                classes_sorted.sort(key=lambda x: x.name.lower())
-                pcc = _print_child_classes(classes_sorted, '', 0)
-                self._out += pcc
-            elif ctype == 'function':
-                assert (isinstance(i, FunctionInfo) for i in cmembers)
-                cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-                self._out += (f'<h4><a{cssclass} name="' +
-                              _get_function_category_href(cname) + '">' +
-                              cname + '</a></h4>\n'
-                              '<ul>\n')
-                funcs = cast(list[FunctionInfo], cmembers)
-                funcs.sort(key=lambda x: x.name.lower())
-                for fnc in funcs:
-                    self._out += ('   <li><a href="#' +
-                                  _get_function_href(fnc.name) + '">' +
-                                  fnc.name + '()</a></li>\n')
-                self._out += '</ul>\n'
-            else:
-                raise Exception('invalid ctype')
-
-    def _filter_docs(self,
-                     docs: str,
-                     filter_type: str,
-                     ignore_links: list[str] = None) -> str:
-        get_category_href_func, indent = _filter_type_settings(filter_type)
-        docs = docs.replace('>', '&gt;')
-        docs = docs.replace('<', '&lt;')
-
-        docs_lines = docs.splitlines()
-
-        # Make sure empty lines are actually empty (so we can search for
-        # '\n\n' and not get thrown off by something like '\n   \n').
-        for i, line in enumerate(docs_lines):
-            if line.strip() == '':
-                docs_lines[i] = ''
-
-        # If a line starts with 'Category:', make it a link to that category.
-        for i, line in enumerate(docs_lines):
-            if line.lower().strip().startswith(CATEGORY_STRING.lower()):
-                if get_category_href_func is None:
-                    raise Exception('cant do category for filter_type ' +
-                                    filter_type)
-                cat = line.strip()[len(CATEGORY_STRING):].strip()
-                docs_lines[i] = (CATEGORY_STRING + ' <a href="#' +
-                                 get_category_href_func(cat) + '">' + cat +
-                                 '</a>')
-        docs = '\n'.join(docs_lines)
-        docs = _split_into_paragraphs(docs, filter_type, indent)
-        docs = self._add_index_links(docs, ignore_links)
-        return docs
-
-    def get_top_module(self) -> ModuleType:
-        """Returns top-level module we generating docs for"""
-        return importlib.import_module(self.top_module_name)
-
-    def run(self, outfilename: str) -> None:
-        """Generate docs from within the game."""
-        # pylint: disable=too-many-locals
-
-        import ba
-
-        print(f"Generating docs file: '{Clr.BLU}{outfilename}{Clr.RST}'...")
-
-        # Collect everything we want to generate docs for.
-        self._collect_submodules(self.get_top_module())
-        submodules = list(sorted(self._submodules, key=lambda x: x.__name__))
-        print(f'{self.top_module_name} submodules:\n -->',
-              '\n --> '.join([sm.__name__ for sm in submodules]))
-        for module in submodules:
-            self._gather_funcs(module)
-            self._process_classes(module)
-
-        # Remove duplicates. This probably should be handled at
-        # self._gather_funcs/self._process_classes level (i.e. just not to add
-        # already existing things), but the main problem is unhashable
-        # ClassInfo dataclass which leads to O(N^2) asymptotic (though I didn't
-        # check how exactly slow it would be).
-        # funcs = self._functions
-        # funcs.sort(key=lambda x: x.name)
-        # f_last: Optional[FunctionInfo] = None
-        # self._functions = []
-        # for func in funcs:
-        #     if func.name == f_last.name:
-        #         continue
-        #     f_last = func
-        #     self._functions.append(func)
-
-        self._functions.sort(key=lambda x: x.name)
-        self._classes.sort(key=lambda x: x.name)
-
-        # Start with our list of classes and functions.
-        app = ba.app
-        self._out += ('<h4><em>last updated on ' + str(datetime.date.today()) +
-                      ' for Ballistica version ' + app.version + ' build ' +
-                      str(app.build_number) + '</em></h4>\n')
-        self._out += self.header
-        self._out += '<hr>\n'
-        self._out += '<h2>Table of Contents</h2>\n'
-
-        self._create_index()
-
-        # Build a sorted list of class categories.
-        c_categories: dict[str, list[Union[ClassInfo, FunctionInfo]]] = {}
-        self._classes.sort(key=lambda x: x.name.lower())
-        for cls in self._classes:
-            assert cls.category is not None
-            category = cls.category
-            if category not in c_categories:
-                c_categories[category] = []
-            c_categories[category].append(cls)
-
-        self._merged_categories = [(cname, 'class', cval)
-                                   for cname, cval in c_categories.items()]
-
-        # Build sorted function category list.
-        f_categories: dict[str, list[FunctionInfo]] = {}
-        for fnc in self._functions:
-            if fnc.category is not None:
-                category = fnc.category
-            else:
-                category = 'Misc'
-            if category not in f_categories:
-                f_categories[category] = []
-            f_categories[category].append(fnc)
-
-        self._merged_categories += [(cname, 'function',
-                                     cast(list[Union[ClassInfo, FunctionInfo]],
-                                          cval))
-                                    for cname, cval in f_categories.items()]
-
-        def sort_func(entry: tuple[str, str, Any]) -> str:
-            name = entry[0].lower()
-
-            # Sort a few recognized categories somewhat manually.
-            overrides = {
-                'gameplay classes': 'aaaa',
-                'gameplay functions': 'aaab',
-                'general utility classes': 'aaac',
-                'general utility functions': 'aaad',
-                'asset classes': 'aaae',
-                'asset functions': 'aaaf',
-                'message classes': 'aaag',
-                'app classes': 'aaah',
-                'app functions': 'aaai',
-                'user interface classes': 'aaaj',
-                'user interface functions': 'aaak',
-            }
-            return overrides.get(name, name)
-
-        self._merged_categories.sort(key=sort_func)
-
-        # Write out our category listings.
-        self._write_category_list()
-        self._write_classes()
-
-        # Now write docs for each function.
-        for fnc in self._functions:
-            self._out += '<hr>\n'
-            cssclass = ' class="offsanchor"' if DO_CSS_CLASSES else ''
-            self._out += (f'<h2><strong><a{cssclass} name="' +
-                          _get_function_href(fnc.name) + '">' + fnc.name +
-                          '()</a></strong></h3>\n')
-            if fnc.docs is not None:
-                self._out += self._filter_docs(fnc.docs, 'function')
-
-        # If we've hit any errors along the way, complain.
-        if self._errors:
-            max_displayed = 10
-            print(
-                len(self._errors), 'ISSUES FOUND GENERATING DOCS:\n' +
-                '\n'.join(self._errors[:max_displayed]))
-            clipped = max(0, len(self._errors) - max_displayed)
-            if clipped:
-                print(f'(and {clipped} more)')
-            raise Exception(
-                str(len(self._errors)) + ' docs generation issues.')
-
-        with open(outfilename, 'w', encoding='utf-8') as outfile:
-            outfile.write(self._out)
-
-        print(f"Generated docs file: '{Clr.BLU}{outfilename}{Clr.RST}'.")
-
-
-class BaModuleGenerator(BaseGenerator):
-    """Generates docs for 'ba' module."""
-
-    top_module_name = 'ba'
-    ignored_modules = ['ba.internal', 'ba.ui']
-    header = ('<p>This page documents the Python classes'
-              ' and functions in the \'ba\' module,\n'
-              ' 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 '
-              '<a href="mailto:support@froemling.net">'
-              'let me know</a>. Happy modding!</p>\n')
-
-    def _add_index_links(self,
-                         docs: str,
-                         ignore_links: Optional[list[str]] = None) -> str:
-        docs = super()._add_index_links(docs, ignore_links=ignore_links)
-
-        # Misc replacements:
-        docs = docs.replace(
-            'General message handling; can be passed any message object.',
-            'General message handling; can be passed any <a href="#' +
-            _get_class_category_href('Message Classes') +
-            '">message object</a>.')
-
-        return docs
-
-
-class BastdModuleGenerator(BaseGenerator):
-    """Generates docs for 'bastd' module and all submodules."""
-
-    top_module_name = 'bastd'
-    # Mypy complains if there is no type annotation
-    # (though it is in base class).
-    ignored_modules: list[str] = []
-    header = ('<p>This page documents the Python classes'
-              ' and functions in the \'bastd\' module,\n'
-              ' which are also often needed to modding.'
-              ' If you come across something you feel'
-              ' should be included here or could'
-              ' be better explained, please '
-              '<a href="mailto:support@froemling.net">'
-              'let me know</a>. Happy modding!</p>\n')
-
-
 def generate(projroot: str) -> None:
     """Main entry point."""
-    toolsdir = os.path.abspath(os.path.join(projroot, 'tools'))
+    import pdoc
 
     # Make sure we're running from the dir above this script.
     os.chdir(projroot)
 
-    ba_out_file_name = os.path.abspath('build/docs_ba.html')
-    bastd_out_file_name = os.path.abspath('build/docs_bastd.html')
-
-    # Let's build the cmake version; no sandboxing issues to contend
-    # with there. Also going with the headless build; will need to revisit
-    # if there's ever any functionality not available in that build.
-    subprocess.run(['make', 'cmake-server-build'], check=True)
-
-    # Launch ballisticacore and exec ourself from within it.
-    print('Launching ballisticacore to generate docs...')
+    pythondir = str(
+        Path(projroot, 'assets', 'src', 'ba_data', 'python').absolute())
+    sys.path.append(pythondir)
+    outdirname = Path('build', 'docs_html').absolute()
 
     try:
-        subprocess.run(
-            [
-                './ballisticacore',
-                '-exec',
-                f'try:\n'
-                f'    import sys\n'
-                f'    import ba\n'
-                f'    sys.path.append("{toolsdir}")\n'
-                f'    import batools.docs\n'
-                f'    batools.docs.BaModuleGenerator().run("{ba_out_file_name}")\n'
-                f'    batools.docs.BastdModuleGenerator().run("{bastd_out_file_name}")\n'
-                f'    ba.quit()\n'
-                f'except Exception:\n'
-                f'    import sys\n'
-                f'    import traceback\n'
-                f'    print("ERROR GENERATING DOCS")\n'
-                f'    traceback.print_exc()\n'
-                f'    sys.exit(255)\n',
-            ],
-            cwd='build/cmake/server-debug/dist',
-            check=True,
-        )
-    except Exception as exc2:
-        # Keep our error simple here; we want focus to be on what went
-        # wrong withing BallisticaCore.
-        raise CleanError('BallisticaCore docs generation failed.') from exc2
+        pdoc.pdoc('ba', 'bastd', output_directory=outdirname)
+    except Exception as exc:
+        import traceback
+        traceback.print_exc()
+        raise CleanError('Docs generation failed') from exc
 
-    print('Docs generation complete.')
+    print(f'{Clr.GRN}Docs generation complete.{Clr.RST}')

From 236a89e62b2a45f16d8324197639dd59c1059fe6 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Fri, 11 Feb 2022 10:06:08 +0300
Subject: [PATCH 05/21] cleanup docs.py

---
 tools/batools/docs.py | 293 +-----------------------------------------
 1 file changed, 1 insertion(+), 292 deletions(-)

diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index a436eab1..c45b23af 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -6,33 +6,15 @@ from __future__ import annotations
 
 import sys
 import os
-import inspect
 from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
-from enum import Enum
 
 from efro.error import CleanError
 from efro.terminal import Clr
 
 if TYPE_CHECKING:
-    from types import ModuleType
-    from typing import Optional, Callable, Any, Sequence
-
-CATEGORY_STRING = 'Category:'
-
-DO_STYLES = False
-DO_CSS_CLASSES = False
-
-STYLE_PAD_L0 = ' style="padding-left: 0px;"' if DO_STYLES else ''
-STYLE_PAD_L30 = ' style="padding-left: 30px;"' if DO_STYLES else ''
-STYLE_PAD_L60 = ' style="padding-left: 60px;"' if DO_STYLES else ''
-
-
-class CategoryType(Enum):
-    """Self explanatory."""
-    FUNCTION = 0
-    CLASS = 1
+    from typing import Optional
 
 
 @dataclass
@@ -43,29 +25,6 @@ class AttributeInfo:
     docs: Optional[str] = None
 
 
-@dataclass
-class FunctionInfo:
-    """Info about a function/method."""
-    name: str
-    category: Optional[str] = None
-    method_class: Optional[str] = None
-    docs: Optional[str] = None
-    is_class_method: bool = False
-
-
-@dataclass
-class ClassInfo:
-    """Info about a class of functions/classes."""
-    name: str
-    category: str
-    methods: list[FunctionInfo]
-    inherited_methods: list[FunctionInfo]
-    attributes: list[AttributeInfo]
-    parents: list[str]
-    docs: Optional[str]
-    enum_values: Optional[list[str]]
-
-
 def parse_docs_attrs(attrs: list[AttributeInfo], docs: str) -> str:
     """Given a docs str, parses attribute descriptions contained within."""
     docs_lines = docs.splitlines()
@@ -112,256 +71,6 @@ def parse_docs_attrs(attrs: list[AttributeInfo], docs: str) -> str:
     return docs
 
 
-def _get_defining_class(cls: type, name: str) -> Optional[type]:
-    for i in cls.mro()[1:]:
-        if hasattr(i, name):
-            return i
-    return None
-
-
-def _get_bases(cls: type) -> list[str]:
-    bases = []
-    for par in cls.mro()[1:]:
-        if par is not object:
-            bases.append(par.__module__ + '.' + par.__name__)
-    return bases
-
-
-def _split_into_paragraphs(docs: str, filter_type: str, indent: int) -> str:
-    indent_str = str(indent) + 'px'
-
-    # Ok, now break into paragraphs (2 newlines denotes a new paragraph).
-    paragraphs = docs.split('\n\n')
-    docs = ''
-    for i, par in enumerate(paragraphs):
-
-        # For function/method signatures, indent lines after the first so
-        # our big multi-line function signatures are readable.
-        if (filter_type in ['function', 'method'] and i == 0
-                and len(par.split('(')) > 1
-                and par.strip().split('(')[0].replace('.', '').replace(
-                    '_', '').isalnum()):
-            style = (' style="padding-left: ' + str(indent + 50) +
-                     'px; text-indent: -50px;"') if DO_STYLES else ''
-            style2 = ' style="color: #666677;"' if DO_STYLES else ''
-            docs += f'<p{style}><span{style2}>'
-
-            # Also, signatures seem to have quotes around annotations.
-            # Let's just strip them all out. This will look wrong if
-            # we have a string as a default value though, so don't
-            # in that case.
-            if " = '" not in par and ' = "' not in par:
-                par = par.replace("'", '')
-            docs += par
-            docs += '</span></p>\n\n'
-
-        # Emphasize a few specific lines.
-        elif par.strip() in [
-                'Conditions:', 'Available Conditions:', 'Actions:',
-                'Available Actions:', 'Play Types:',
-                'Available Setting Options:', 'Available Values:', 'Usage:'
-        ]:
-            style = (' style="padding-left: ' + indent_str +
-                     ';"' if DO_STYLES else '')
-            docs += f'<p{style}><strong>'
-            docs += par
-            docs += '</strong></p>\n\n'
-
-        elif par.lower().strip().startswith(CATEGORY_STRING.lower()):
-            style = (' style="padding-left: ' + indent_str +
-                     ';"' if DO_STYLES else '')
-            docs += f'<p{style}>'
-            docs += par
-            docs += '</p>\n\n'
-
-        elif par.strip().startswith('#'):
-            p_lines = par.split('\n')
-            for it2, line in enumerate(p_lines):
-                if line.strip().startswith('#'):
-                    style = (' style="color: #008800;"' if DO_STYLES else '')
-                    p_lines[it2] = (f'<span{style}><em><small>' + line +
-                                    '</small></em></span>')
-            par = '\n'.join(p_lines)
-            style = (' style="padding-left: ' + indent_str +
-                     ';"' if DO_STYLES else '')
-            docs += f'<pre{style}>'
-            docs += par
-            docs += '</pre>\n\n'
-        else:
-            style = (' style="padding-left: ' + indent_str +
-                     ';"' if DO_STYLES else '')
-            docs += f'<p{style}>'
-            docs += par
-            docs += '</p>\n\n'
-    return docs
-
-
-def _filter_type_settings(filter_type: str) -> tuple[Optional[Callable], int]:
-    get_category_href_func = None
-    if filter_type == 'class':
-        indent = 30
-        get_category_href_func = _get_class_category_href
-    elif filter_type == 'method':
-        indent = 60
-    elif filter_type == 'function':
-        indent = 30
-        get_category_href_func = _get_function_category_href
-    elif filter_type == 'attribute':
-        indent = 60
-    else:
-        raise Exception('invalid filter_type: ' + str(filter_type))
-    return get_category_href_func, indent
-
-
-def _get_defining_class_backwards(cls: type, name: str) -> Optional[type]:
-    mro = cls.mro()
-    mro.reverse()
-    for i in mro:
-        if hasattr(i, name):
-            return i
-    return None
-
-
-def _get_module_classes(module: ModuleType) -> list[tuple[str, type]]:
-    names = dir(module)
-
-    # Look for all public classes in the provided module.
-    class_objs = [
-        getattr(module, name) for name in names if not name.startswith('_')
-    ]
-    class_objs = [
-        c for c in class_objs if str(c).startswith('<class ')
-        or str(c).startswith('<type ') or str(c).startswith('<enum ')
-    ]
-
-    # Build a map of full names and their corresponding classes.
-    classes_by_name = [(c.__module__ + '.' + c.__name__, c)
-                       for c in class_objs]
-
-    # Strip duplicates (for instance ba.Dep and ba.Dependency are the same
-    # thing at runtime)
-    classes_by_name = list(set(classes_by_name))
-
-    # And add those classes' inner classes.
-    _add_inner_classes(class_objs, classes_by_name)
-    return classes_by_name
-
-
-def _is_inherited(cls: type, name: str) -> bool:
-    method = getattr(cls, name)
-
-    # Classmethods are already bound with the class as self.
-    # we need to just look at the im_func in that case
-    is_class_method = (inspect.ismethod(method) and method.__self__ is cls)
-    if is_class_method:
-        for mth in cls.mro()[1:]:
-            mth2 = getattr(mth, name, None)
-            if mth2 is not None:
-                if method.__func__ == mth2.__func__:
-                    return True
-    else:
-        return any(method == getattr(i, name, None) for i in cls.mro()[1:])
-    return False
-
-
-def _get_function_category_href(c_name: str) -> str:
-    """Return a href for linking to the specified function category."""
-    return 'function_category_' + c_name.replace('.', '_').replace(' ', '_')
-
-
-def _get_class_category_href(c_name: str) -> str:
-    """Return a href for linking to the specified class category."""
-    return 'class_category_' + c_name.replace('.', '_').replace(' ', '_')
-
-
-def _get_class_href(c_name: str) -> str:
-    """Return a href for linking to the specified class."""
-    return 'class_' + c_name.replace('.', '_')
-
-
-def _get_function_href(f_name: str) -> str:
-    """Return a href for linking to the specified function."""
-    return 'function_' + f_name.replace('.', '_')
-
-
-def _get_method_href(c_name: str, f_name: str) -> str:
-    """Return a href for linking to the specified method."""
-    return 'method_' + c_name.replace('.', '_') + '__' + f_name.replace(
-        '.', '_')
-
-
-def _get_attribute_href(c_name: str, a_name: str) -> str:
-    return 'attr_' + c_name.replace('.', '_') + '__' + a_name.replace('.', '_')
-
-
-def _get_category(docs: str, category_type: CategoryType) -> str:
-    """Parse the category name from a docstring."""
-    category_lines = [
-        l for l in docs.splitlines()
-        if l.lower().strip().startswith(CATEGORY_STRING.lower())
-    ]
-    if category_lines:
-        category = category_lines[0].strip()[len(CATEGORY_STRING):].strip()
-    else:
-        category = {
-            CategoryType.CLASS: 'Misc Classes',
-            CategoryType.FUNCTION: 'Misc Functions'
-        }[category_type]
-    return category
-
-
-def _print_child_classes(category_classes: list[ClassInfo], parent: str,
-                         indent: int) -> str:
-    out = ''
-    valid_classes = []
-    for cls in category_classes:
-        if cls.parents:
-            c_parent = cls.parents[0]
-        else:
-            c_parent = ''
-
-        # If it has a parent not in this category, consider it to
-        # have no parent.
-        if c_parent != '':
-            found = False
-            for ctest in category_classes:
-                if c_parent == ctest.name:
-                    found = True
-                    break
-            if not found:
-                c_parent = ''
-
-        # Print only if its parent matches what we want.
-        if c_parent == parent:
-            valid_classes.append(cls)
-    if valid_classes:
-        out += '   ' * indent + '<ul>\n'
-    for cls in valid_classes:
-        out += ('   ' * indent + '   <li><a href="#' +
-                _get_class_href(cls.name) + '">' + cls.name + '</a></li>\n')
-        out += _print_child_classes(category_classes, cls.name, indent + 1)
-    if valid_classes:
-        out += '   ' * indent + '</ul>\n'
-    return out
-
-
-def _add_inner_classes(class_objs: Sequence[type],
-                       classes_by_name: list[tuple[str, type]]) -> None:
-    # Ok, now go through all existing classes and look for classes
-    # defined within.
-    for cls in class_objs:
-        for name in dir(cls):
-            if name.startswith('_'):
-                continue
-            obj = getattr(cls, name)
-            if not inspect.isclass(obj):
-                continue
-            if _get_defining_class_backwards(cls, name) != cls:
-                continue
-            classes_by_name.append(
-                (cls.__module__ + '.' + cls.__name__ + '.' + name, obj))
-
-
 def generate(projroot: str) -> None:
     """Main entry point."""
     import pdoc

From 7673e01b9b710b59fed0b6a38debf27a8b05e3ec Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Fri, 11 Feb 2022 11:51:00 +0300
Subject: [PATCH 06/21] workaround with docs

---
 assets/src/ba_data/python/._ba_sources_hash   |  2 +-
 assets/src/ba_data/python/_ba.py              | 35 ++++--------
 assets/src/ba_data/python/ba/_general.py      | 56 ++++++++++---------
 .../python/class/python_class_input_device.cc | 22 ++++----
 .../python/class/python_class_material.cc     |  2 +-
 tools/batools/docs.py                         | 13 +++--
 6 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index e00d6c53..29666224 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-142084453862763162635228312125641718455
\ No newline at end of file
+175217515325031448193730963697929841246
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index f67d9196..af61f73e 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -235,41 +235,41 @@ class InputDevice:
 
     Attributes:
 
-       allows_configuring: bool
+       allows_configuring
           Whether the input-device can be configured.
 
-       has_meaningful_button_names: bool
+       has_meaningful_button_names
           Whether button names returned by this instance match labels
           on the actual device. (Can be used to determine whether to show
-          them in controls-overlays, etc.)
+          them in controls-overlays, etc.).
 
-       player: Optional[ba.SessionPlayer]
+       player
           The player associated with this input device.
 
-       client_id: int
+       client_id
           The numeric client-id this device is associated with.
           This is only meaningful for remote client inputs; for
           all local devices this will be -1.
 
-       name: str
+       name
           The name of the device.
 
-       unique_identifier: str
+       unique_identifier
           A string that can be used to persistently identify the device,
           even among other devices of the same type. Used for saving
           prefs, etc.
 
-       id: int
+       id
           The unique numeric id of this device.
 
-       instance_number: int
+       instance_number
           The number of this device among devices of the same type.
 
-       is_controller_app: bool
+       is_controller_app
           Whether this input-device represents a locally-connected
           controller-app.
 
-       is_remote_client: bool
+       is_remote_client
           Whether this input-device represents a remotely-connected
           client.
 
@@ -375,7 +375,7 @@ class Material:
 
     Attributes:
 
-        label: str
+        label
             A label for the material; only used for debugging.
     """
 
@@ -839,14 +839,6 @@ class SessionPlayer:
         activityplayer: Optional[ba.Player]
             The current game-specific instance for this player.
     """
-    id: int
-    in_game: bool
-    sessionteam: ba.SessionTeam
-    inputdevice: ba.InputDevice
-    color: Sequence[float]
-    highlight: Sequence[float]
-    character: str
-    activityplayer: Optional[ba.Player]
 
     def assigninput(self, type: Union[ba.InputType, tuple[ba.InputType, ...]],
                     call: Callable) -> None:
@@ -1056,9 +1048,6 @@ class Vec3(Sequence[float]):
        z: float
           The vector's Z component.
     """
-    x: float
-    y: float
-    z: float
 
     # pylint: disable=function-redefined
 
diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py
index e919138a..a025c9f0 100644
--- a/assets/src/ba_data/python/ba/_general.py
+++ b/assets/src/ba_data/python/ba/_general.py
@@ -150,24 +150,25 @@ class _WeakCall:
     Think of this as a handy way to tell an object to do something
     at some point in the future if it happens to still exist.
 
-    # EXAMPLE A: this code will create a FooClass instance and call its
-    # bar() method 5 seconds later; it will be kept alive even though
-    # we overwrite its variable with None because the bound method
-    # we pass as a timer callback (foo.bar) strong-references it
-    foo = FooClass()
-    ba.timer(5.0, foo.bar)
-    foo = None
+    Examples:
+        EXAMPLE A: this code will create a FooClass instance and call its
+        bar() method 5 seconds later; it will be kept alive even though
+        we overwrite its variable with None because the bound method
+        we pass as a timer callback (foo.bar) strong-references it
+        >>> foo = FooClass()
+        ... ba.timer(5.0, foo.bar)
+        ... foo = None
 
-    # EXAMPLE B: this code will *not* keep our object alive; it will die
-    # when we overwrite it with None and the timer will be a no-op when it
-    # fires
-    foo = FooClass()
-    ba.timer(5.0, ba.WeakCall(foo.bar))
-    foo = None
+        EXAMPLE B: this code will *not* keep our object alive; it will die
+        when we overwrite it with None and the timer will be a no-op when it
+        fires
+        >>> foo = FooClass()
+        ... ba.timer(5.0, ba.WeakCall(foo.bar))
+        ... foo = None
 
-    Note: additional args and keywords you provide to the WeakCall()
-    constructor are stored as regular strong-references; you'll need
-    to wrap them in weakrefs manually if desired.
+        Note: additional args and keywords you provide to the WeakCall()
+        constructor are stored as regular strong-references; you'll need
+        to wrap them in weakrefs manually if desired.
     """
 
     def __init__(self, *args: Any, **keywds: Any) -> None:
@@ -176,14 +177,16 @@ class _WeakCall:
         Pass a callable as the first arg, followed by any number of
         arguments or keywords.
 
-        # Example: wrap a method call with some positional and
-        # keyword args:
-        myweakcall = ba.WeakCall(myobj.dostuff, argval1, namedarg=argval2)
-
-        # Now we have a single callable to run that whole mess.
-        # The same as calling myobj.dostuff(argval1, namedarg=argval2)
-        # (provided my_obj still exists; this will do nothing otherwise)
-        myweakcall()
+        Examples:
+            Example: wrap a method call with some positional and
+            keyword args:
+            >>> myweakcall = ba.WeakCall(myobj.dostuff, argval1,
+            ...                          namedarg=argval2)
+            ... # Now we have a single callable to run that whole mess.
+            ... # The same as calling myobj.dostuff(argval1, namedarg=argval2)
+            ... # (provided my_obj still exists; this will do nothing
+            ... # otherwise).
+            ... myweakcall()
         """
         if hasattr(args[0], '__func__'):
             self._call = WeakMethod(args[0])
@@ -217,8 +220,8 @@ class _Call:
     The callable is strong-referenced so it won't die until this
     object does.
 
-    Note that a bound method (ex: myobj.dosomething) contains a reference
-    to 'self' (myobj in that case), so you will be keeping that object
+    Note that a bound method (ex: ``myobj.dosomething``) contains a reference
+    to ``self`` (``myobj`` in that case), so you will be keeping that object
     alive too. Use ba.WeakCall if you want to pass a method to callback
     without keeping its object alive.
     """
@@ -248,6 +251,7 @@ class _Call:
                 str(self._args) + ' _keywds=' + str(self._keywds) + '>')
 
 
+# Hack: pdoc won't run this
 if TYPE_CHECKING:
     WeakCall = Call
     Call = Call
diff --git a/src/ballistica/python/class/python_class_input_device.cc b/src/ballistica/python/class/python_class_input_device.cc
index de70685d..c6840e7c 100644
--- a/src/ballistica/python/class/python_class_input_device.cc
+++ b/src/ballistica/python/class/python_class_input_device.cc
@@ -23,41 +23,41 @@ void PythonClassInputDevice::SetupType(PyTypeObject* obj) {
       "\n"
       "Attributes:\n"
       "\n"
-      "   allows_configuring: bool\n"
+      "   allows_configuring (bool):\n"
       "      Whether the input-device can be configured.\n"
       "\n"
-      "   has_meaningful_button_names: bool\n"
+      "   has_meaningful_button_names (bool):\n"
       "      Whether button names returned by this instance match labels\n"
       "      on the actual device. (Can be used to determine whether to show\n"
-      "      them in controls-overlays, etc.)\n"
+      "      them in controls-overlays, etc.).\n"
       "\n"
-      "   player: Optional[ba.SessionPlayer]\n"
+      "   player (Optional[ba.SessionPlayer]):\n"
       "      The player associated with this input device.\n"
       "\n"
-      "   client_id: int\n"
+      "   client_id (int):\n"
       "      The numeric client-id this device is associated with.\n"
       "      This is only meaningful for remote client inputs; for\n"
       "      all local devices this will be -1.\n"
       "\n"
-      "   name: str\n"
+      "   name (str):\n"
       "      The name of the device.\n"
       "\n"
-      "   unique_identifier: str\n"
+      "   unique_identifier (str):\n"
       "      A string that can be used to persistently identify the device,\n"
       "      even among other devices of the same type. Used for saving\n"
       "      prefs, etc.\n"
       "\n"
-      "   id: int\n"
+      "   id (int):\n"
       "      The unique numeric id of this device.\n"
       "\n"
-      "   instance_number: int\n"
+      "   instance_number (int):\n"
       "      The number of this device among devices of the same type.\n"
       "\n"
-      "   is_controller_app: bool\n"
+      "   is_controller_app (bool):\n"
       "      Whether this input-device represents a locally-connected\n"
       "      controller-app.\n"
       "\n"
-      "   is_remote_client: bool\n"
+      "   is_remote_client (bool):\n"
       "      Whether this input-device represents a remotely-connected\n"
       "      client.\n"
       "\n";
diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index fb6717e1..b5175919 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -69,7 +69,7 @@ void PythonClassMaterial::SetupType(PyTypeObject* obj) {
       "\n"
       "Attributes:\n"
       "\n"
-      "    " ATTR_LABEL ": str\n"
+      "    " ATTR_LABEL " (str):\n"
       "        A label for the material; only used for debugging.\n";
   // clang-format on
 
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index c45b23af..08dcfa2d 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -33,8 +33,8 @@ def parse_docs_attrs(attrs: list[AttributeInfo], docs: str) -> str:
         if line.strip() in ['Attributes:', 'Attrs:']:
             attr_line = i
             break
-    if attr_line is not None:
 
+    if attr_line is not None:
         # Docs is now everything *up to* this.
         docs = '\n'.join(docs_lines[:attr_line])
 
@@ -45,14 +45,16 @@ def parse_docs_attrs(attrs: list[AttributeInfo], docs: str) -> str:
 
             # A line with a single alphanumeric word preceding a colon
             # is a new attr.
-            splits = line.split(':')
-            if (len(splits) in (1, 2) and splits[0]
+            splits = line.split(' ')
+            if (len(splits) in (1, 2)
                     and splits[0].replace('_', '').isalnum()):
                 if cur_attr is not None:
                     attrs.append(cur_attr)
                 cur_attr = AttributeInfo(name=splits[0])
                 if len(splits) == 2:
-                    cur_attr.attr_type = splits[1]
+                    # Remove brackets and convert from
+                    # (type): to type.
+                    cur_attr.attr_type = splits[1][1:-2]
 
             # Any other line gets tacked onto the current attr.
             else:
@@ -84,6 +86,9 @@ def generate(projroot: str) -> None:
     outdirname = Path('build', 'docs_html').absolute()
 
     try:
+        pdoc.render.configure(docformat='google',
+                              search=True,
+                              show_source=True)
         pdoc.pdoc('ba', 'bastd', output_directory=outdirname)
     except Exception as exc:
         import traceback

From 7ecd804c1bc2539906b02c7be9bcd3d8acc42b04 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Fri, 11 Feb 2022 14:10:47 +0300
Subject: [PATCH 07/21] update examples

---
 assets/src/ba_data/python/._ba_sources_hash   |   2 +-
 assets/src/ba_data/python/_ba.py              | 411 ++++++++++--------
 assets/src/ba_data/python/ba/_actor.py        |  35 +-
 assets/src/ba_data/python/ba/_general.py      |  54 +--
 assets/src/ba_data/python/ba/_language.py     |  35 +-
 .../python/class/python_class_context.cc      |  30 +-
 .../python/class/python_class_context_call.cc |  24 +-
 .../python/class/python_class_material.cc     | 222 +++++-----
 .../python/class/python_class_node.cc         |  13 +-
 .../python/class/python_class_timer.cc        |  23 +-
 .../python/methods/python_methods_app.cc      |  65 +--
 .../python/methods/python_methods_system.cc   |  11 +-
 tools/batools/docs.py                         |   2 +-
 13 files changed, 493 insertions(+), 434 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 29666224..44b0b236 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-175217515325031448193730963697929841246
\ No newline at end of file
+225891607870108897605481763130834194451
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index af61f73e..aff6e065 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -102,7 +102,7 @@ class Context:
 
     Category: General Utility Classes
 
-    Many operations such as ba.newnode() or ba.gettexture() operate
+    Many operations such as ba.newnode or ba.gettexture operate
     implicitly on the current context. Each ba.Activity has its own
     Context and objects within that activity (nodes, media, etc) can only
     interact with other objects from that context.
@@ -114,17 +114,17 @@ class Context:
     the UI (there is a special 'ui' context for all user-interface-related
     functionality)
 
-    When instantiating a ba.Context instance, a single 'source' argument
+    When instantiating a ba.Context instance, a single ``'source'`` argument
     is passed, which can be one of the following strings/objects:
 
-    'empty':
+    ``'empty'``:
       Gives an empty context; it can be handy to run code here to ensure
       it does no loading of media, creation of nodes, etc.
 
-    'current':
+    ``'current'``:
       Sets the context object to the current context.
 
-    'ui':
+    ``'ui'``:
       Sets to the UI context. UI functions as well as loading of media to
       be used in said functions must happen in the UI context.
 
@@ -138,16 +138,18 @@ class Context:
 
 
     Usage:
+        Contexts are generally used with the python 'with' statement, which
+        sets the context as current on entry and resets it to the previous
+        value on exit.
 
-    Contexts are generally used with the python 'with' statement, which
-    sets the context as current on entry and resets it to the previous
-    value on exit.
-
-    # Example: load a few textures into the UI context
-    # (for use in widgets, etc):
-    with ba.Context('ui'):
-       tex1 = ba.gettexture('foo_tex_1')
-       tex2 = ba.gettexture('foo_tex_2')
+    Example:
+        Load a few textures into the UI context
+        (for use in widgets, etc):
+        ```python
+        >>> with ba.Context('ui'):
+        ...     tex1 = ba.gettexture('foo_tex_1')
+        ...     tex2 = ba.gettexture('foo_tex_2')
+        ```
     """
 
     def __init__(self, source: Any):
@@ -189,17 +191,21 @@ class ContextCall:
     shutdown, whereas ba.WeakCall simply looks at whether the target
     object still exists.
 
-    # Example A: code like this can inadvertently prevent our activity
-    # (self) from ending until the operation completes, since the bound
-    # method we're passing (self.dosomething) contains a strong-reference
-    # to self).
-    start_some_long_action(callback_when_done=self.dosomething)
+    Examples:
+        Example A: code like this can inadvertently prevent our activity
+        (self) from ending until the operation completes, since the bound
+        method we're passing (self.dosomething) contains a strong-reference
+        to self).
+        >>> start_some_long_action(callback_when_done=self.dosomething)
 
-    # Example B: in this case our activity (self) can still die
-    # properly; the callback will clear itself when the activity starts
-    # shutting down, becoming a harmless no-op and releasing the reference
-    # to our activity.
-    start_long_action(callback_when_done=ba.ContextCall(self.mycallback))
+        Example B: in this case our activity (self) can still die
+        properly; the callback will clear itself when the activity starts
+        shutting down, becoming a harmless no-op and releasing the reference
+        to our activity.
+        ```python
+        >>> start_long_action(
+        ...     callback_when_done=ba.ContextCall(self.mycallback))
+        ```
     """
 
     def __init__(self, call: Callable):
@@ -235,41 +241,41 @@ class InputDevice:
 
     Attributes:
 
-       allows_configuring
+       allows_configuring (bool):
           Whether the input-device can be configured.
 
-       has_meaningful_button_names
+       has_meaningful_button_names (bool):
           Whether button names returned by this instance match labels
           on the actual device. (Can be used to determine whether to show
           them in controls-overlays, etc.).
 
-       player
+       player (Optional[ba.SessionPlayer]):
           The player associated with this input device.
 
-       client_id
+       client_id (int):
           The numeric client-id this device is associated with.
           This is only meaningful for remote client inputs; for
           all local devices this will be -1.
 
-       name
+       name (str):
           The name of the device.
 
-       unique_identifier
+       unique_identifier (str):
           A string that can be used to persistently identify the device,
           even among other devices of the same type. Used for saving
           prefs, etc.
 
-       id
+       id (int):
           The unique numeric id of this device.
 
-       instance_number
+       instance_number (int):
           The number of this device among devices of the same type.
 
-       is_controller_app
+       is_controller_app (bool):
           Whether this input-device represents a locally-connected
           controller-app.
 
-       is_remote_client
+       is_remote_client (bool):
           Whether this input-device represents a remotely-connected
           client.
 
@@ -362,20 +368,20 @@ class Material:
     A material can affect physical characteristics, generate sounds,
     or trigger callback functions when collisions occur.
 
-    Materials are applied to 'parts', which are groups of one or more
-    rigid bodies created as part of a ba.Node.  Nodes can have any number
+    Materials are applied to ``'parts'``, which are groups of one or more
+    rigid bodies created as part of a ba.Node. Nodes can have any number
     of parts, each with its own set of materials. Generally materials are
-    specified as array attributes on the Node. The 'spaz' node, for
-    example, has various attributes such as 'materials',
-    'roller_materials', and 'punch_materials', which correspond to the
+    specified as array attributes on the Node. The ``'spaz'`` node, for
+    example, has various attributes such as ``'materials'``,
+    ``'roller_materials'``, and ``'punch_materials'``, which correspond to the
     various parts it creates.
 
-    Use ba.Material() to instantiate a blank material, and then use its
-    add_actions() method to define what the material does.
+    Use ba.Material to instantiate a blank material, and then use its
+    ba.Material.add_actions method to define what the material does.
 
     Attributes:
 
-        label
+        label (str):
             A label for the material; only used for debugging.
     """
 
@@ -393,133 +399,139 @@ class Material:
         Add one or more actions to the material, optionally with conditions.
 
         Conditions:
+            Conditions are provided as tuples which can be combined to form boolean
+            logic. A single condition might look like ``('condition_name', cond_arg)``,
+            or a more complex nested one might look like ``(('some_condition',
+            cond_arg), 'or', ('another_condition', cond2_arg))``.
 
-        Conditions are provided as tuples which can be combined to form boolean
-        logic. A single condition might look like ('condition_name', cond_arg),
-        or a more complex nested one might look like (('some_condition',
-        cond_arg), 'or', ('another_condition', cond2_arg)).
-
-        'and', 'or', and 'xor' are available to chain together 2 conditions, as
-          seen above.
+            ``'and'``, ``'or'``, and ``'xor'`` are available to chain together 2 conditions, as
+            seen above.
 
         Available Conditions:
+            ``('they_have_material', material)`` - does the part we're hitting have a
+            given ba.Material?
 
-        ('they_have_material', material) - does the part we're hitting have a
-          given ba.Material?
+            ``('they_dont_have_material', material)`` - does the part we're hitting
+            not have a given ba.Material?
 
-        ('they_dont_have_material', material) - does the part we're hitting
-          not have a given ba.Material?
+            ``('eval_colliding')`` - is ``'collide'`` true at this point in material
+            evaluation? (see the modify_part_collision action)
 
-        ('eval_colliding') - is 'collide' true at this point in material
-          evaluation? (see the modify_part_collision action)
+            ``('eval_not_colliding')`` - is 'collide' false at this point in material
+            evaluation? (see the modify_part_collision action)
 
-        ('eval_not_colliding') - is 'collide' false at this point in material
-          evaluation? (see the modify_part_collision action)
+            ``('we_are_younger_than', age)`` - is our part younger than ``'age'``
+            (in milliseconds)?
 
-        ('we_are_younger_than', age) - is our part younger than 'age'
-          (in milliseconds)?
+            ``('we_are_older_than', age)`` - is our part older than ``'age'``
+            (in milliseconds)?
 
-        ('we_are_older_than', age) - is our part older than 'age'
-          (in milliseconds)?
+            ``('they_are_younger_than', age)`` - is the part we're hitting younger than
+            ``'age'`` (in milliseconds)?
 
-        ('they_are_younger_than', age) - is the part we're hitting younger than
-          'age' (in milliseconds)?
+            ``('they_are_older_than', age)`` - is the part we're hitting older than
+            ``'age'`` (in milliseconds)?
 
-        ('they_are_older_than', age) - is the part we're hitting older than
-          'age' (in milliseconds)?
+            ``('they_are_same_node_as_us')`` - does the part we're hitting belong to
+            the same ba.Node as us?
 
-        ('they_are_same_node_as_us') - does the part we're hitting belong to
-          the same ba.Node as us?
-
-        ('they_are_different_node_than_us') - does the part we're hitting
-          belong to a different ba.Node than us?
+            ``('they_are_different_node_than_us')`` - does the part we're hitting
+            belong to a different ba.Node than us?
 
         Actions:
-
-        In a similar manner, actions are specified as tuples. Multiple actions
-        can be specified by providing a tuple of tuples.
+            In a similar manner, actions are specified as tuples. Multiple actions
+            can be specified by providing a tuple of tuples.
 
         Available Actions:
+            ``('call', when, callable)`` - calls the provided callable; ``'when'`` can be
+            either ``'at_connect'`` or ``'at_disconnect'``. ``'at_connect'`` means to fire
+            when the two parts first come in contact; ``'at_disconnect'`` means to
+            fire once they cease being in contact.
 
-        ('call', when, callable) - calls the provided callable; 'when' can be
-          either 'at_connect' or 'at_disconnect'. 'at_connect' means to fire
-          when the two parts first come in contact; 'at_disconnect' means to
-          fire once they cease being in contact.
+            ``('message', who, when, message_obj)`` - sends a message object; ``'who'`` can
+            be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be ``'at_connect'`` or
+            ``'at_disconnect'``, and message_obj is the message object to send.
+            This has the same effect as calling the node's ba.Node.handlemessage
+            method.
 
-        ('message', who, when, message_obj) - sends a message object; 'who' can
-          be either 'our_node' or 'their_node', 'when' can be 'at_connect' or
-          'at_disconnect', and message_obj is the message object to send.
-          This has the same effect as calling the node's handlemessage()
-          method.
+            ``('modify_part_collision', attr, value)`` - changes some characteristic
+            of the physical collision that will occur between our part and their
+            part. This change will remain in effect as long as the two parts
+            remain overlapping. This means if you have a part with a material
+            that turns ``'collide'`` off against parts younger than 100ms, and it
+            touches another part that is 50ms old, it will continue to not
+            collide with that part until they separate, even if the 100ms
+            threshold is passed. Options for attr/value are: ``'physical'`` (boolean
+            value; whether a *physical* response will occur at all), ``'friction'``
+            (float value; how friction-y the physical response will be),
+            ``'collide'`` (boolean value; whether *any* collision will occur at all,
+            including non-physical stuff like callbacks), ``'use_node_collide'``
+            (boolean value; whether to honor modify_node_collision overrides for
+            this collision), ``'stiffness'`` (float value, how springy the physical
+            response is), ``'damping'`` (float value, how damped the physical
+            response is), ``'bounce'`` (float value; how bouncy the physical response
+            is).
 
-        ('modify_part_collision', attr, value) - changes some characteristic
-          of the physical collision that will occur between our part and their
-          part.  This change will remain in effect as long as the two parts
-          remain overlapping. This means if you have a part with a material
-          that turns 'collide' off against parts younger than 100ms, and it
-          touches another part that is 50ms old, it will continue to not
-          collide with that part until they separate, even if the 100ms
-          threshold is passed. Options for attr/value are: 'physical' (boolean
-          value; whether a *physical* response will occur at all), 'friction'
-          (float value; how friction-y the physical response will be),
-          'collide' (boolean value; whether *any* collision will occur at all,
-          including non-physical stuff like callbacks), 'use_node_collide'
-          (boolean value; whether to honor modify_node_collision overrides for
-          this collision), 'stiffness' (float value, how springy the physical
-          response is), 'damping' (float value, how damped the physical
-          response is), 'bounce' (float value; how bouncy the physical response
-          is).
+            ``('modify_node_collision', attr, value)`` - similar to
+            ``modify_part_collision``, but operates at a node-level.
+            collision attributes set here will remain in effect as long as
+            *anything* from our part's node and their part's node overlap.
+            A key use of this functionality is to prevent new nodes from
+            colliding with each other if they appear overlapped;
+            if ``modify_part_collision`` is used, only the individual parts that
+            were overlapping would avoid contact, but other parts could still
+            contact leaving the two nodes 'tangled up'.  Using
+            ``modify_node_collision ensures`` that the nodes must completely
+            separate before they can start colliding.  Currently the only attr
+            available here is ``'collide'`` (a boolean value).
 
-        ('modify_node_collision', attr, value) - similar to
-          modify_part_collision, but operates at a node-level.
-          collision attributes set here will remain in effect as long as
-          *anything* from our part's node and their part's node overlap.
-          A key use of this functionality is to prevent new nodes from
-          colliding with each other if they appear overlapped;
-          if modify_part_collision is used, only the individual parts that
-          were overlapping would avoid contact, but other parts could still
-          contact leaving the two nodes 'tangled up'.  Using
-          modify_node_collision ensures that the nodes must completely
-          separate before they can start colliding.  Currently the only attr
-          available here is 'collide' (a boolean value).
+            ``('sound', sound, volume)`` - plays a ba.Sound when a collision occurs, at
+            a given volume, regardless of the collision speed/etc.
 
-        ('sound', sound, volume) - plays a ba.Sound when a collision occurs, at
-          a given volume, regardless of the collision speed/etc.
+            ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound when a
+            collision occurs, based on the speed of impact. Provide a ba.Sound, a
+            target-impulse, and a volume.
 
-        ('impact_sound', sound, targetImpulse, volume) - plays a sound when a
-          collision occurs, based on the speed of impact. Provide a ba.Sound, a
-          target-impulse, and a volume.
+            ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound during a
+            collision when parts are 'scraping' against each other. Provide a
+            ba.Sound, a target-impulse, and a volume.
 
-        ('skid_sound', sound, targetImpulse, volume) - plays a sound during a
-          collision when parts are 'scraping' against each other. Provide a
-          ba.Sound, a target-impulse, and a volume.
+          ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound during a
+            collision when parts are 'rolling' against each other. Provide a
+            ba.Sound, a target-impulse, and a volume.
 
-        ('roll_sound', sound, targetImpulse, volume) - plays a sound during a
-          collision when parts are 'rolling' against each other. Provide a
-          ba.Sound, a target-impulse, and a volume.
+        Examples:
+            example 1: create a material that lets us ignore
+            collisions against any nodes we touch in the first
+            100 ms of our existence; handy for preventing us from
+            exploding outward if we spawn on top of another object:
+            ```python
+            >>> m = ba.Material()
+            ... m.add_actions(
+            ...     conditions=(('we_are_younger_than', 100),
+            ...                 'or', ('they_are_younger_than', 100)),
+            ...     actions=('modify_node_collision', 'collide', False))
+            ```
 
-        # example 1: create a material that lets us ignore
-        # collisions against any nodes we touch in the first
-        # 100 ms of our existence; handy for preventing us from
-        # exploding outward if we spawn on top of another object:
-        m = ba.Material()
-        m.add_actions(conditions=(('we_are_younger_than', 100),
-                                 'or',('they_are_younger_than', 100)),
-                     actions=('modify_node_collision', 'collide', False))
+            example 2: send a ba.DieMessage to anything we touch, but cause
+            no physical response. This should cause any ba.Actor to drop dead:
+            ```python
+            >>> m = ba.Material()
+            ... m.add_actions(
+            ...     actions=(('modify_part_collision', 'physical', False),
+            ...              ('message', 'their_node', 'at_connect',
+            ...                  ba.DieMessage())))
+            ```
 
-        # example 2: send a DieMessage to anything we touch, but cause
-        # no physical response.  This should cause any ba.Actor to drop dead:
-        m = ba.Material()
-        m.add_actions(actions=(('modify_part_collision', 'physical', False),
-                              ('message', 'their_node', 'at_connect',
-                               ba.DieMessage())))
-
-        # example 3: play some sounds when we're contacting the ground:
-        m = ba.Material()
-        m.add_actions(conditions=('they_have_material',
-                                  shared.footing_material),
-                      actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),
-                               ('skid_sound', ba.getsound('metalSkid'), 2, 5)))
+            example 3: play some sounds when we're contacting the ground:
+            ```python
+            >>> m = ba.Material()
+            ... m.add_actions(
+            ...     conditions=('they_have_material',
+                                shared.footing_material),
+            ...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),
+            ...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))
+            ```
 
         """
         return None
@@ -688,14 +700,17 @@ class Node:
         Connect one of this node's attributes to an attribute on another node.
         This will immediately set the target attribute's value to that of the
         source attribute, and will continue to do so once per step as long as
-        the two nodes exist.  The connection can be severed by setting the
+        the two nodes exist. The connection can be severed by setting the
         target attribute to any value or connecting another node attribute
         to it.
 
-        # Example: create a locator and attach a light to it:
-        light = ba.newnode('light')
-        loc = ba.newnode('locator', attrs={'position': (0,10,0)})
-        loc.connectattr('position', light, 'position')
+        Example:
+            Create a locator and attach a light to it:
+            ```python
+            >>> light = ba.newnode('light')
+            ... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})
+            ... loc.connectattr('position', light, 'position')
+            ```
         """
         return None
 
@@ -1005,16 +1020,19 @@ class Timer:
     timeformat: A ba.TimeFormat value determining how the passed time is
     interpreted.
 
-    # Example: use a Timer object to print repeatedly for a few seconds:
-    def say_it():
-        ba.screenmessage('BADGER!')
-    def stop_saying_it():
-        self.t = None
-        ba.screenmessage('MUSHROOM MUSHROOM!')
-    # Create our timer; it will run as long as we have the self.t ref.
-    self.t = ba.Timer(0.3, say_it, repeat=True)
-    # Now fire off a one-shot timer to kill it.
-    ba.timer(3.89, stop_saying_it)
+    Example:
+        Use a Timer object to print repeatedly for a few seconds:
+        ```python
+        >>> def say_it():
+        ...     ba.screenmessage('BADGER!')
+        ... def stop_saying_it():
+        ...     self.t = None
+        ... ba.screenmessage('MUSHROOM MUSHROOM!')
+        ... # Create our timer; it will run as long as we have the self.t ref.
+        ... self.t = ba.Timer(0.3, say_it, repeat=True)
+        ... # Now fire off a one-shot timer to kill it.
+        ... ba.timer(3.89, stop_saying_it)
+        ```
     """
 
     def __init__(self,
@@ -1797,10 +1815,13 @@ def do_once() -> bool:
     The call is made from.  Returns True if this location has not been
     registered already, and False if it has.
 
-    # Example: this print will only fire for the first loop iteration:
-    for i in range(10):
-        if ba.do_once():
-            print('Hello once from loop!')
+    Example:
+        This print will only fire for the first loop iteration:
+        ```python
+        >>> for i in range(10):
+        ... if ba.do_once():
+        ...     print('Hello once from loop!')
+        ```
     """
     return bool()
 
@@ -3572,8 +3593,8 @@ def set_have_mods(have_mods: bool) -> None:
 
 
 def set_internal_language_keys(
-        listobj: list[tuple[str, str]],
-        random_names_list: list[tuple[str, str]]) -> None:
+    listobj: list[tuple[str, str]],
+    random_names_list: list[tuple[str, str]]) -> None:
     """set_internal_language_keys(listobj: list[tuple[str, str]],
       random_names_list: list[tuple[str, str]]) -> None
 
@@ -3591,7 +3612,7 @@ def set_low_level_config_value(key: str, value: int) -> None:
 
 
 def set_map_bounds(
-        bounds: tuple[float, float, float, float, float, float]) -> None:
+    bounds: tuple[float, float, float, float, float, float]) -> None:
     """set_map_bounds(bounds: tuple[float, float, float, float, float, float])
       -> None
 
@@ -3943,8 +3964,8 @@ def textwidget(edit: ba.Widget = None,
 
 @overload
 def time(
-        timetype: ba.TimeType = TimeType.SIM,
-        timeformat: Literal[TimeFormat.SECONDS] = TimeFormat.SECONDS) -> float:
+    timetype: ba.TimeType = TimeType.SIM,
+    timeformat: Literal[TimeFormat.SECONDS] = TimeFormat.SECONDS) -> float:
     ...
 
 
@@ -4037,45 +4058,53 @@ def timer(time: float,
     This timer cannot be canceled or modified once created. If you
      require the ability to do so, use the ba.Timer class instead.
 
-    time: length of time (in seconds by default) that the timer will wait
-    before firing. Note that the actual delay experienced may vary
-     depending on the timetype. (see below)
+    Arguments:
+        time (float):
+            Length of time (in seconds by default) that the timer will wait
+            before firing. Note that the actual delay experienced may vary
+             depending on the timetype. (see below)
 
-    call: A callable Python object. Note that the timer will retain a
-    strong reference to the callable for as long as it exists, so you
-    may want to look into concepts such as ba.WeakCall if that is not
-    desired.
+        call (Callable[[], Any]):
+            A callable Python object. Note that the timer will retain a
+            strong reference to the callable for as long as it exists, so you
+            may want to look into concepts such as ba.WeakCall if that is not
+            desired.
 
-    repeat: if True, the timer will fire repeatedly, with each successive
-    firing having the same delay as the first.
+        repeat (bool):
+            If True, the timer will fire repeatedly, with each successive
+            firing having the same delay as the first.
 
-    timetype can be either 'sim', 'base', or 'real'. It defaults to
-    'sim'. Types are explained below:
 
-    'sim' time maps to local simulation time in ba.Activity or ba.Session
+        timetype (ba.TimeType):
+            Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults to
+            ``SIM``.
+
+        timeformat (ba.TimeFormat):
+            Defaults to seconds but can also be milliseconds.
+
+    - SIM time maps to local simulation time in ba.Activity or ba.Session
     Contexts. This means that it may progress slower in slow-motion play
     modes, stop when the game is paused, etc.  This time type is not
     available in UI contexts.
-
-    'base' time is also linked to gameplay in ba.Activity or ba.Session
+    - BASE time is also linked to gameplay in ba.Activity or ba.Session
     Contexts, but it progresses at a constant rate regardless of
      slow-motion states or pausing.  It can, however, slow down or stop
     in certain cases such as network outages or game slowdowns due to
     cpu load. Like 'sim' time, this is unavailable in UI contexts.
-
-    'real' time always maps to actual clock time with a bit of filtering
-    added, regardless of Context.  (the filtering prevents it from going
+    - REAL time always maps to actual clock time with a bit of filtering
+    added, regardless of Context. (The filtering prevents it from going
     backwards or jumping forward by large amounts due to the app being
     backgrounded, system time changing, etc.)
     Real time timers are currently only available in the UI context.
 
-    the 'timeformat' arg defaults to seconds but can also be milliseconds.
-
-    # timer example: print some stuff through time:
-    ba.screenmessage('hello from now!')
-    ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))
-    ba.timer(2.0, ba.Call(ba.screenmessage, 'hello from the future 2!'))
-    """
+    Examples:
+        Print some stuff through time:
+        ```python
+        >>> ba.screenmessage('hello from now!')
+        >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))
+        >>> ba.timer(2.0, ba.Call(ba.screenmessage,
+        ...                       'hello from the future 2!'))
+        ```"""
     return None
 
 
diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py
index 53cdca2a..d5471679 100644
--- a/assets/src/ba_data/python/ba/_actor.py
+++ b/assets/src/ba_data/python/ba/_actor.py
@@ -33,15 +33,18 @@ class Actor:
     (killing off or transitioning out their nodes) when the last Python
     reference to them disappears, so you can use logic such as:
 
-    # Create a flag Actor in our game activity:
-    from bastd.actor.flag import Flag
-    self.flag = Flag(position=(0, 10, 0))
-
-    # Later, destroy the flag.
-    # (provided nothing else is holding a reference to it)
-    # We could also just assign a new flag to this value.
-    # Either way, the old flag disappears.
-    self.flag = None
+    Example:
+        ```python
+        >>> # Create a flag Actor in our game activity:
+        >>> from bastd.actor.flag import Flag
+        >>> self.flag = Flag(position=(0, 10, 0))
+        >>>
+        >>> # Later, destroy the flag.
+        >>> # (provided nothing else is holding a reference to it)
+        >>> # We could also just assign a new flag to this value.
+        >>> # Either way, the old flag disappears.
+        >>> self.flag = None
+        ```
 
     This is in contrast to the behavior of the more low level ba.Nodes,
     which are always explicitly created and destroyed and don't care
@@ -51,18 +54,18 @@ class Actor:
     if you want an Actor to stick around until explicitly killed
     regardless of references.
 
-    Another key feature of ba.Actor is its handlemessage() method, which
+    Another key feature of ba.Actor is its ba.Actor.handlemessage method, which
     takes a single arbitrary object as an argument. This provides a safe way
     to communicate between ba.Actor, ba.Activity, ba.Session, and any other
     class providing a handlemessage() method.  The most universally handled
     message type for Actors is the ba.DieMessage.
 
-    # Another way to kill the flag from the example above:
-    # We can safely call this on any type with a 'handlemessage' method
-    # (though its not guaranteed to always have a meaningful effect).
-    # In this case the Actor instance will still be around, but its exists()
-    # and is_alive() methods will both return False.
-    self.flag.handlemessage(ba.DieMessage())
+    Another way to kill the flag from the example above:
+    We can safely call this on any type with a 'handlemessage' method
+    (though its not guaranteed to always have a meaningful effect).
+    In this case the Actor instance will still be around, but its exists()
+    and is_alive() methods will both return False.
+    >>> self.flag.handlemessage(ba.DieMessage())
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py
index a025c9f0..220b1ccd 100644
--- a/assets/src/ba_data/python/ba/_general.py
+++ b/assets/src/ba_data/python/ba/_general.py
@@ -166,6 +166,15 @@ class _WeakCall:
         ... ba.timer(5.0, ba.WeakCall(foo.bar))
         ... foo = None
 
+        EXAMPLE C: Wrap a method call with some positional and keyword args:
+        >>> myweakcall = ba.WeakCall(self.dostuff, argval1,
+        ...                          namedarg=argval2)
+        ... # Now we have a single callable to run that whole mess.
+        ... # The same as calling myobj.dostuff(argval1, namedarg=argval2)
+        ... # (provided my_obj still exists; this will do nothing
+        ... # otherwise).
+        ... myweakcall()
+
         Note: additional args and keywords you provide to the WeakCall()
         constructor are stored as regular strong-references; you'll need
         to wrap them in weakrefs manually if desired.
@@ -176,17 +185,6 @@ class _WeakCall:
 
         Pass a callable as the first arg, followed by any number of
         arguments or keywords.
-
-        Examples:
-            Example: wrap a method call with some positional and
-            keyword args:
-            >>> myweakcall = ba.WeakCall(myobj.dostuff, argval1,
-            ...                          namedarg=argval2)
-            ... # Now we have a single callable to run that whole mess.
-            ... # The same as calling myobj.dostuff(argval1, namedarg=argval2)
-            ... # (provided my_obj still exists; this will do nothing
-            ... # otherwise).
-            ... myweakcall()
         """
         if hasattr(args[0], '__func__'):
             self._call = WeakMethod(args[0])
@@ -232,12 +230,12 @@ class _Call:
         Pass a callable as the first arg, followed by any number of
         arguments or keywords.
 
-        # Example: wrap a method call with 1 positional and 1 keyword arg:
-        mycall = ba.Call(myobj.dostuff, argval1, namedarg=argval2)
-
-        # Now we have a single callable to run that whole mess.
-        # ..the same as calling myobj.dostuff(argval1, namedarg=argval2)
-        mycall()
+        Example:
+            Wrap a method call with 1 positional and 1 keyword arg:
+            >>> mycall = ba.Call(myobj.dostuff, argval, namedarg=argval2)
+            ... # Now we have a single callable to run that whole mess.
+            ... # ..the same as calling myobj.dostuff(argval, namedarg=argval2)
+            ... mycall()
         """
         self._call = args[0]
         self._args = args[1:]
@@ -251,7 +249,6 @@ class _Call:
                 str(self._args) + ' _keywds=' + str(self._keywds) + '>')
 
 
-# Hack: pdoc won't run this
 if TYPE_CHECKING:
     WeakCall = Call
     Call = Call
@@ -375,15 +372,18 @@ def storagename(suffix: str = None) -> str:
 
     Note that this will function even if called in the class definition.
 
-    # Example: generate a unique name for storage purposes:
-    class MyThingie:
-
-        # This will give something like '_mymodule_submodule_mythingie_data'.
-        _STORENAME = ba.storagename('data')
-
-        # Use that name to store some data in the Activity we were passed.
-        def __init__(self, activity):
-            activity.customdata[self._STORENAME] = {}
+    Examples:
+        Generate a unique name for storage purposes:
+        ```python
+        >>> class MyThingie:
+        ...     # This will give something like
+        ...     # '_mymodule_submodule_mythingie_data'.
+        ...     _STORENAME = ba.storagename('data')
+        ...
+        ...     # Use that name to store some data in the Activity we were passed.
+        ...     def __init__(self, activity):
+        ...         activity.customdata[self._STORENAME] = {}
+        ```
     """
     frame = inspect.currentframe()
     if frame is None:
diff --git a/assets/src/ba_data/python/ba/_language.py b/assets/src/ba_data/python/ba/_language.py
index 6bf49f3e..a7fac030 100644
--- a/assets/src/ba_data/python/ba/_language.py
+++ b/assets/src/ba_data/python/ba/_language.py
@@ -376,24 +376,29 @@ class Lstr:
     To see available resource keys, look at any of the bs_language_*.py files
     in the game or the translations pages at bombsquadgame.com/translate.
 
-    # EXAMPLE 1: specify a string from a resource path
-    mynode.text = ba.Lstr(resource='audioSettingsWindow.titleText')
+    Examples:
+        EXAMPLE 1: specify a string from a resource path
+        >>> mynode.text = ba.Lstr(resource='audioSettingsWindow.titleText')
 
-    # EXAMPLE 2: specify a translated string via a category and english value;
-    # if a translated value is available, it will be used; otherwise the
-    # english value will be. To see available translation categories, look
-    # under the 'translations' resource section.
-    mynode.text = ba.Lstr(translate=('gameDescriptions', 'Defeat all enemies'))
+        EXAMPLE 2: specify a translated string via a category and english
+        value; if a translated value is available, it will be used; otherwise
+        the english value will be. To see available translation categories,
+        look under the 'translations' resource section.
+        >>> mynode.text = ba.Lstr(translate=('gameDescriptions', 'Defeat all enemies'))
 
-    # EXAMPLE 3: specify a raw value and some substitutions.  Substitutions can
-    # be used with resource and translate modes as well.
-    mynode.text = ba.Lstr(value='${A} / ${B}',
-                          subs=[('${A}', str(score)), ('${B}', str(total))])
+        EXAMPLE 3: specify a raw value and some substitutions. Substitutions
+        can be used with resource and translate modes as well.
+        >>> mynode.text = ba.Lstr(value='${A} / ${B}',
+        ...               subs=[('${A}', str(score)), ('${B}', str(total))])
 
-    # EXAMPLE 4: Lstrs can be nested.  This example would display the resource
-    # at res_a but replace ${NAME} with the value of the resource at res_b
-    mytextnode.text = ba.Lstr(resource='res_a',
-                              subs=[('${NAME}', ba.Lstr(resource='res_b'))])
+        EXAMPLE 4: ba.Lstr's can be nested. This example would display the
+        resource at res_a but replace ${NAME} with the value of the
+        resource at res_b
+        ```python
+        >>> mytextnode.text = ba.Lstr(
+        ...     resource='res_a',
+        ...     subs=[('${NAME}', ba.Lstr(resource='res_b'))])
+        ```
     """
 
     # pylint: disable=dangerous-default-value
diff --git a/src/ballistica/python/class/python_class_context.cc b/src/ballistica/python/class/python_class_context.cc
index 4c65011f..6927f66d 100644
--- a/src/ballistica/python/class/python_class_context.cc
+++ b/src/ballistica/python/class/python_class_context.cc
@@ -21,7 +21,7 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "\n"
       "Category: General Utility Classes\n"
       "\n"
-      "Many operations such as ba.newnode() or ba.gettexture() operate\n"
+      "Many operations such as ba.newnode or ba.gettexture operate\n"
       "implicitly on the current context. Each ba.Activity has its own\n"
       "Context and objects within that activity (nodes, media, etc) can only\n"
       "interact with other objects from that context.\n"
@@ -33,16 +33,16 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "the UI (there is a special 'ui' context for all user-interface-related\n"
       "functionality)\n"
       "\n"
-      "When instantiating a ba.Context instance, a single 'source' argument\n"
+      "When instantiating a ba.Context instance, a single ``'source'`` argument\n"
       "is passed, which can be one of the following strings/objects:\n\n"
-      "'empty':\n"
+      "``'empty'``:\n"
       "  Gives an empty context; it can be handy to run code here to ensure\n"
       "  it does no loading of media, creation of nodes, etc.\n"
       "\n"
-      "'current':\n"
+      "``'current'``:\n"
       "  Sets the context object to the current context.\n"
       "\n"
-      "'ui':\n"
+      "``'ui'``:\n"
       "  Sets to the UI context. UI functions as well as loading of media to\n"
       "  be used in said functions must happen in the UI context.\n"
       "\n"
@@ -56,16 +56,18 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "\n"
       "\n"
       "Usage:\n"
+      "    Contexts are generally used with the python 'with' statement, which\n"
+      "    sets the context as current on entry and resets it to the previous\n"
+      "    value on exit.\n"
       "\n"
-      "Contexts are generally used with the python 'with' statement, which\n"
-      "sets the context as current on entry and resets it to the previous\n"
-      "value on exit.\n"
-      "\n"
-      "# Example: load a few textures into the UI context\n"
-      "# (for use in widgets, etc):\n"
-      "with ba.Context('ui'):\n"
-      "   tex1 = ba.gettexture('foo_tex_1')\n"
-      "   tex2 = ba.gettexture('foo_tex_2')\n";
+      "Example:\n"
+      "    Load a few textures into the UI context\n"
+      "    (for use in widgets, etc):\n"
+      "    ```python\n"
+      "    >>> with ba.Context('ui'):\n"
+      "    ...     tex1 = ba.gettexture('foo_tex_1')\n"
+      "    ...     tex2 = ba.gettexture('foo_tex_2')\n"
+      "    ```\n";
 
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_context_call.cc b/src/ballistica/python/class/python_class_context_call.cc
index 10273e2d..d7f66941 100644
--- a/src/ballistica/python/class/python_class_context_call.cc
+++ b/src/ballistica/python/class/python_class_context_call.cc
@@ -38,17 +38,21 @@ void PythonClassContextCall::SetupType(PyTypeObject* obj) {
       "shutdown, whereas ba.WeakCall simply looks at whether the target\n"
       "object still exists.\n"
       "\n"
-      "# Example A: code like this can inadvertently prevent our activity\n"
-      "# (self) from ending until the operation completes, since the bound\n"
-      "# method we're passing (self.dosomething) contains a strong-reference\n"
-      "# to self).\n"
-      "start_some_long_action(callback_when_done=self.dosomething)\n"
+      "Examples:\n"
+      "    Example A: code like this can inadvertently prevent our activity\n"
+      "    (self) from ending until the operation completes, since the bound\n"
+      "    method we're passing (self.dosomething) contains a strong-reference\n"
+      "    to self).\n"
+      "    >>> start_some_long_action(callback_when_done=self.dosomething)\n"
       "\n"
-      "# Example B: in this case our activity (self) can still die\n"
-      "# properly; the callback will clear itself when the activity starts\n"
-      "# shutting down, becoming a harmless no-op and releasing the reference\n"
-      "# to our activity.\n"
-      "start_long_action(callback_when_done=ba.ContextCall(self.mycallback))\n";
+      "    Example B: in this case our activity (self) can still die\n"
+      "    properly; the callback will clear itself when the activity starts\n"
+      "    shutting down, becoming a harmless no-op and releasing the reference\n"
+      "    to our activity.\n"
+      "    ```python\n"
+      "    >>> start_long_action(\n"
+      "    ...     callback_when_done=ba.ContextCall(self.mycallback))\n"
+      "    ```\n";
 
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index b5175919..4685dfdf 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -56,16 +56,16 @@ void PythonClassMaterial::SetupType(PyTypeObject* obj) {
       "A material can affect physical characteristics, generate sounds,\n"
       "or trigger callback functions when collisions occur.\n"
       "\n"
-      "Materials are applied to 'parts', which are groups of one or more\n"
-      "rigid bodies created as part of a ba.Node.  Nodes can have any number\n"
+      "Materials are applied to ``'parts'``, which are groups of one or more\n"
+      "rigid bodies created as part of a ba.Node. Nodes can have any number\n"
       "of parts, each with its own set of materials. Generally materials are\n"
-      "specified as array attributes on the Node. The 'spaz' node, for\n"
-      "example, has various attributes such as 'materials',\n"
-      "'roller_materials', and 'punch_materials', which correspond to the\n"
+      "specified as array attributes on the Node. The ``'spaz'`` node, for\n"
+      "example, has various attributes such as ``'materials'``,\n"
+      "``'roller_materials'``, and ``'punch_materials'``, which correspond to the\n"
       "various parts it creates.\n"
       "\n"
-      "Use ba.Material() to instantiate a blank material, and then use its\n"
-      "add_actions() method to define what the material does.\n"
+      "Use ba.Material to instantiate a blank material, and then use its\n"
+      "ba.Material.add_actions method to define what the material does.\n"
       "\n"
       "Attributes:\n"
       "\n"
@@ -281,133 +281,139 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "Add one or more actions to the material, optionally with conditions.\n"
      "\n"
      "Conditions:\n"
+     "    Conditions are provided as tuples which can be combined to form boolean\n"
+     "    logic. A single condition might look like ``('condition_name', cond_arg)``,\n"
+     "    or a more complex nested one might look like ``(('some_condition',\n"
+     "    cond_arg), 'or', ('another_condition', cond2_arg))``.\n"
      "\n"
-     "Conditions are provided as tuples which can be combined to form boolean\n"
-     "logic. A single condition might look like ('condition_name', cond_arg),\n"
-     "or a more complex nested one might look like (('some_condition',\n"
-     "cond_arg), 'or', ('another_condition', cond2_arg)).\n"
-     "\n"
-     "'and', 'or', and 'xor' are available to chain together 2 conditions, as\n"
-     "  seen above.\n"
+     "    ``'and'``, ``'or'``, and ``'xor'`` are available to chain together 2 conditions, as\n"
+     "    seen above.\n"
      "\n"
      "Available Conditions:\n"
+     "    ``('they_have_material', material)`` - does the part we\'re hitting have a\n"
+     "    given ba.Material?\n"
      "\n"
-     "('they_have_material', material) - does the part we\'re hitting have a\n"
-     "  given ba.Material?\n"
+     "    ``('they_dont_have_material', material)`` - does the part we\'re hitting\n"
+     "    not have a given ba.Material?\n"
      "\n"
-     "('they_dont_have_material', material) - does the part we\'re hitting\n"
-     "  not have a given ba.Material?\n"
+     "    ``('eval_colliding')`` - is ``'collide'`` true at this point in material\n"
+     "    evaluation? (see the modify_part_collision action)\n"
      "\n"
-     "('eval_colliding') - is 'collide' true at this point in material\n"
-     "  evaluation? (see the modify_part_collision action)\n"
+     "    ``('eval_not_colliding')`` - is 'collide' false at this point in material\n"
+     "    evaluation? (see the modify_part_collision action)\n"
      "\n"
-     "('eval_not_colliding') - is 'collide' false at this point in material\n"
-     "  evaluation? (see the modify_part_collision action)\n"
+     "    ``('we_are_younger_than', age)`` - is our part younger than ``'age'``\n"
+     "    (in milliseconds)?\n"
      "\n"
-     "('we_are_younger_than', age) - is our part younger than 'age'\n"
-     "  (in milliseconds)?\n"
+     "    ``('we_are_older_than', age)`` - is our part older than ``'age'``\n"
+     "    (in milliseconds)?\n"
      "\n"
-     "('we_are_older_than', age) - is our part older than 'age'\n"
-     "  (in milliseconds)?\n"
+     "    ``('they_are_younger_than', age)`` - is the part we're hitting younger than\n"
+     "    ``'age'`` (in milliseconds)?\n"
      "\n"
-     "('they_are_younger_than', age) - is the part we're hitting younger than\n"
-     "  'age' (in milliseconds)?\n"
+     "    ``('they_are_older_than', age)`` - is the part we're hitting older than\n"
+     "    ``'age'`` (in milliseconds)?\n"
      "\n"
-     "('they_are_older_than', age) - is the part we're hitting older than\n"
-     "  'age' (in milliseconds)?\n"
+     "    ``('they_are_same_node_as_us')`` - does the part we're hitting belong to\n"
+     "    the same ba.Node as us?\n"
      "\n"
-     "('they_are_same_node_as_us') - does the part we're hitting belong to\n"
-     "  the same ba.Node as us?\n"
-     "\n"
-     "('they_are_different_node_than_us') - does the part we're hitting\n"
-     "  belong to a different ba.Node than us?\n"
+     "    ``('they_are_different_node_than_us')`` - does the part we're hitting\n"
+     "    belong to a different ba.Node than us?\n"
      "\n"
      "Actions:\n"
-     "\n"
-     "In a similar manner, actions are specified as tuples. Multiple actions\n"
-     "can be specified by providing a tuple of tuples.\n"
+     "    In a similar manner, actions are specified as tuples. Multiple actions\n"
+     "    can be specified by providing a tuple of tuples.\n"
      "\n"
      "Available Actions:\n"
+     "    ``('call', when, callable)`` - calls the provided callable; ``'when'`` can be\n"
+     "    either ``'at_connect'`` or ``'at_disconnect'``. ``'at_connect'`` means to fire\n"
+     "    when the two parts first come in contact; ``'at_disconnect'`` means to\n"
+     "    fire once they cease being in contact.\n"
      "\n"
-     "('call', when, callable) - calls the provided callable; 'when' can be\n"
-     "  either 'at_connect' or 'at_disconnect'. 'at_connect' means to fire\n"
-     "  when the two parts first come in contact; 'at_disconnect' means to\n"
-     "  fire once they cease being in contact.\n"
+     "    ``('message', who, when, message_obj)`` - sends a message object; ``'who'`` can\n"
+     "    be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be ``'at_connect'`` or\n"
+     "    ``'at_disconnect'``, and message_obj is the message object to send.\n"
+     "    This has the same effect as calling the node's ba.Node.handlemessage\n"
+     "    method.\n"
      "\n"
-     "('message', who, when, message_obj) - sends a message object; 'who' can\n"
-     "  be either 'our_node' or 'their_node', 'when' can be 'at_connect' or\n"
-     "  'at_disconnect', and message_obj is the message object to send.\n"
-     "  This has the same effect as calling the node's handlemessage()\n"
-     "  method.\n"
+     "    ``('modify_part_collision', attr, value)`` - changes some characteristic\n"
+     "    of the physical collision that will occur between our part and their\n"
+     "    part. This change will remain in effect as long as the two parts\n"
+     "    remain overlapping. This means if you have a part with a material\n"
+     "    that turns ``'collide'`` off against parts younger than 100ms, and it\n"
+     "    touches another part that is 50ms old, it will continue to not\n"
+     "    collide with that part until they separate, even if the 100ms\n"
+     "    threshold is passed. Options for attr/value are: ``'physical'`` (boolean\n"
+     "    value; whether a *physical* response will occur at all), ``'friction'``\n"
+     "    (float value; how friction-y the physical response will be),\n"
+     "    ``'collide'`` (boolean value; whether *any* collision will occur at all,\n"
+     "    including non-physical stuff like callbacks), ``'use_node_collide'``\n"
+     "    (boolean value; whether to honor modify_node_collision overrides for\n"
+     "    this collision), ``'stiffness'`` (float value, how springy the physical\n"
+     "    response is), ``'damping'`` (float value, how damped the physical\n"
+     "    response is), ``'bounce'`` (float value; how bouncy the physical response\n"
+     "    is).\n"
      "\n"
-     "('modify_part_collision', attr, value) - changes some characteristic\n"
-     "  of the physical collision that will occur between our part and their\n"
-     "  part.  This change will remain in effect as long as the two parts\n"
-     "  remain overlapping. This means if you have a part with a material\n"
-     "  that turns 'collide' off against parts younger than 100ms, and it\n"
-     "  touches another part that is 50ms old, it will continue to not\n"
-     "  collide with that part until they separate, even if the 100ms\n"
-     "  threshold is passed. Options for attr/value are: 'physical' (boolean\n"
-     "  value; whether a *physical* response will occur at all), 'friction'\n"
-     "  (float value; how friction-y the physical response will be),\n"
-     "  'collide' (boolean value; whether *any* collision will occur at all,\n"
-     "  including non-physical stuff like callbacks), 'use_node_collide'\n"
-     "  (boolean value; whether to honor modify_node_collision overrides for\n"
-     "  this collision), 'stiffness' (float value, how springy the physical\n"
-     "  response is), 'damping' (float value, how damped the physical\n"
-     "  response is), 'bounce' (float value; how bouncy the physical response\n"
-     "  is).\n"
+     "    ``('modify_node_collision', attr, value)`` - similar to\n"
+     "    ``modify_part_collision``, but operates at a node-level.\n"
+     "    collision attributes set here will remain in effect as long as\n"
+     "    *anything* from our part's node and their part's node overlap.\n"
+     "    A key use of this functionality is to prevent new nodes from\n"
+     "    colliding with each other if they appear overlapped;\n"
+     "    if ``modify_part_collision`` is used, only the individual parts that\n"
+     "    were overlapping would avoid contact, but other parts could still\n"
+     "    contact leaving the two nodes 'tangled up'.  Using\n"
+     "    ``modify_node_collision ensures`` that the nodes must completely\n"
+     "    separate before they can start colliding.  Currently the only attr\n"
+     "    available here is ``'collide'`` (a boolean value).\n"
      "\n"
-     "('modify_node_collision', attr, value) - similar to\n"
-     "  modify_part_collision, but operates at a node-level.\n"
-     "  collision attributes set here will remain in effect as long as\n"
-     "  *anything* from our part's node and their part's node overlap.\n"
-     "  A key use of this functionality is to prevent new nodes from\n"
-     "  colliding with each other if they appear overlapped;\n"
-     "  if modify_part_collision is used, only the individual parts that\n"
-     "  were overlapping would avoid contact, but other parts could still\n"
-     "  contact leaving the two nodes 'tangled up'.  Using\n"
-     "  modify_node_collision ensures that the nodes must completely\n"
-     "  separate before they can start colliding.  Currently the only attr\n"
-     "  available here is 'collide' (a boolean value).\n"
+     "    ``('sound', sound, volume)`` - plays a ba.Sound when a collision occurs, at\n"
+     "    a given volume, regardless of the collision speed/etc.\n"
      "\n"
-     "('sound', sound, volume) - plays a ba.Sound when a collision occurs, at\n"
-     "  a given volume, regardless of the collision speed/etc.\n"
+     "    ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound when a\n"
+     "    collision occurs, based on the speed of impact. Provide a ba.Sound, a\n"
+     "    target-impulse, and a volume.\n"
      "\n"
-     "('impact_sound', sound, targetImpulse, volume) - plays a sound when a\n"
-     "  collision occurs, based on the speed of impact. Provide a ba.Sound, a\n"
-     "  target-impulse, and a volume.\n"
+     "    ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound during a\n"
+     "    collision when parts are 'scraping' against each other. Provide a\n"
+     "    ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "('skid_sound', sound, targetImpulse, volume) - plays a sound during a\n"
-     "  collision when parts are 'scraping' against each other. Provide a\n"
-     "  ba.Sound, a target-impulse, and a volume.\n"
+     "  ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound during a\n"
+     "    collision when parts are 'rolling' against each other. Provide a\n"
+     "    ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "('roll_sound', sound, targetImpulse, volume) - plays a sound during a\n"
-     "  collision when parts are 'rolling' against each other. Provide a\n"
-     "  ba.Sound, a target-impulse, and a volume.\n"
+     "Examples:\n"
+     "    example 1: create a material that lets us ignore\n"
+     "    collisions against any nodes we touch in the first\n"
+     "    100 ms of our existence; handy for preventing us from\n"
+     "    exploding outward if we spawn on top of another object:\n"
+     "    ```python\n"
+     "    >>> m = ba.Material()\n"
+     "    ... m.add_actions(\n"
+     "    ...     conditions=(('we_are_younger_than', 100),\n"
+     "    ...                 'or', ('they_are_younger_than', 100)),\n"
+     "    ...     actions=('modify_node_collision', 'collide', False))\n"
+     "    ```\n"
      "\n"
-     "# example 1: create a material that lets us ignore\n"
-     "# collisions against any nodes we touch in the first\n"
-     "# 100 ms of our existence; handy for preventing us from\n"
-     "# exploding outward if we spawn on top of another object:\n"
-     "m = ba.Material()\n"
-     "m.add_actions(conditions=(('we_are_younger_than', 100),\n"
-     "                         'or',('they_are_younger_than', 100)),\n"
-     "             actions=('modify_node_collision', 'collide', False))\n"
+     "    example 2: send a ba.DieMessage to anything we touch, but cause\n"
+     "    no physical response. This should cause any ba.Actor to drop dead:\n"
+     "    ```python\n"
+     "    >>> m = ba.Material()\n"
+     "    ... m.add_actions(\n"
+     "    ...     actions=(('modify_part_collision', 'physical', False),\n"
+     "    ...              ('message', 'their_node', 'at_connect',\n"
+     "    ...                  ba.DieMessage())))\n"
+     "    ```\n"
      "\n"
-     "# example 2: send a DieMessage to anything we touch, but cause\n"
-     "# no physical response.  This should cause any ba.Actor to drop dead:\n"
-     "m = ba.Material()\n"
-     "m.add_actions(actions=(('modify_part_collision', 'physical', False),\n"
-     "                      ('message', 'their_node', 'at_connect',\n"
-     "                       ba.DieMessage())))\n"
-     "\n"
-     "# example 3: play some sounds when we're contacting the ground:\n"
-     "m = ba.Material()\n"
-     "m.add_actions(conditions=('they_have_material',\n"
-     "                          shared.footing_material),\n"
-     "              actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),\n"
-     "                       ('skid_sound', ba.getsound('metalSkid'), 2, 5)))\n"
+     "    example 3: play some sounds when we're contacting the ground:\n"
+     "    ```python\n"
+     "    >>> m = ba.Material()\n"
+     "    ... m.add_actions(\n"
+     "    ...     conditions=('they_have_material',\n"
+     "                        shared.footing_material),\n"
+     "    ...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),\n"
+     "    ...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))\n"
+     "    ```\n"
      "\n"},
     {"__dir__", (PyCFunction)Dir, METH_NOARGS,
      "allows inclusion of our custom attrs in standard python dir()"},
diff --git a/src/ballistica/python/class/python_class_node.cc b/src/ballistica/python/class/python_class_node.cc
index 2b0d74df..a1f69cbf 100644
--- a/src/ballistica/python/class/python_class_node.cc
+++ b/src/ballistica/python/class/python_class_node.cc
@@ -440,14 +440,17 @@ PyMethodDef PythonClassNode::tp_methods[] = {
      "Connect one of this node's attributes to an attribute on another node.\n"
      "This will immediately set the target attribute's value to that of the\n"
      "source attribute, and will continue to do so once per step as long as\n"
-     "the two nodes exist.  The connection can be severed by setting the\n"
+     "the two nodes exist. The connection can be severed by setting the\n"
      "target attribute to any value or connecting another node attribute\n"
      "to it.\n"
      "\n"
-     "# Example: create a locator and attach a light to it:\n"
-     "light = ba.newnode('light')\n"
-     "loc = ba.newnode('locator', attrs={'position': (0,10,0)})\n"
-     "loc.connectattr('position', light, 'position')"},
+     "Example:\n"
+     "    Create a locator and attach a light to it:\n"
+     "    ```python\n"
+     "    >>> light = ba.newnode('light')\n"
+     "    ... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})\n"
+     "    ... loc.connectattr('position', light, 'position')\n"
+     "    ```\n"},
     {"__dir__", (PyCFunction)Dir, METH_NOARGS,
      "allows inclusion of our custom attrs in standard python dir()"},
     {nullptr}};
diff --git a/src/ballistica/python/class/python_class_timer.cc b/src/ballistica/python/class/python_class_timer.cc
index 81ea7537..61884dd8 100644
--- a/src/ballistica/python/class/python_class_timer.cc
+++ b/src/ballistica/python/class/python_class_timer.cc
@@ -45,16 +45,19 @@ void PythonClassTimer::SetupType(PyTypeObject* obj) {
       "timeformat: A ba.TimeFormat value determining how the passed time is\n"
       "interpreted.\n"
       "\n"
-      "# Example: use a Timer object to print repeatedly for a few seconds:\n"
-      "def say_it():\n"
-      "    ba.screenmessage('BADGER!')\n"
-      "def stop_saying_it():\n"
-      "    self.t = None\n"
-      "    ba.screenmessage('MUSHROOM MUSHROOM!')\n"
-      "# Create our timer; it will run as long as we have the self.t ref.\n"
-      "self.t = ba.Timer(0.3, say_it, repeat=True)\n"
-      "# Now fire off a one-shot timer to kill it.\n"
-      "ba.timer(3.89, stop_saying_it)";
+      "Example:\n"
+      "    Use a Timer object to print repeatedly for a few seconds:\n"
+      "    ```python\n"
+      "    >>> def say_it():\n"
+      "    ...     ba.screenmessage('BADGER!')\n"
+      "    ... def stop_saying_it():\n"
+      "    ...     self.t = None\n"
+      "    ... ba.screenmessage('MUSHROOM MUSHROOM!')\n"
+      "    ... # Create our timer; it will run as long as we have the self.t ref.\n"
+      "    ... self.t = ba.Timer(0.3, say_it, repeat=True)\n"
+      "    ... # Now fire off a one-shot timer to kill it.\n"
+      "    ... ba.timer(3.89, stop_saying_it)\n"
+      "    ```\n";
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
 }
diff --git a/src/ballistica/python/methods/python_methods_app.cc b/src/ballistica/python/methods/python_methods_app.cc
index a2ae06a0..b1f07bcb 100644
--- a/src/ballistica/python/methods/python_methods_app.cc
+++ b/src/ballistica/python/methods/python_methods_app.cc
@@ -1033,52 +1033,53 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "This timer cannot be canceled or modified once created. If you\n"
          " require the ability to do so, use the ba.Timer class instead.\n"
          "\n"
-         "time: length of time (in seconds by default) that the timer will "
-         "wait\n"
-         "before firing. Note that the actual delay experienced may vary\n "
-         "depending on the timetype. (see below)\n"
+	 "Arguments:\n"
+         "    time (float):\n"
+	 "        Length of time (in seconds by default) that the timer will wait\n"
+         "        before firing. Note that the actual delay experienced may vary\n "
+         "        depending on the timetype. (see below)\n"
          "\n"
-         "call: A callable Python object. Note that the timer will retain a\n"
-         "strong reference to the callable for as long as it exists, so you\n"
-         "may want to look into concepts such as ba.WeakCall if that is not\n"
-         "desired.\n"
+         "    call (Callable[[], Any]):\n"
+	 "        A callable Python object. Note that the timer will retain a\n"
+         "        strong reference to the callable for as long as it exists, so you\n"
+         "        may want to look into concepts such as ba.WeakCall if that is not\n"
+         "        desired.\n"
          "\n"
-         "repeat: if True, the timer will fire repeatedly, with each "
-         "successive\n"
-         "firing having the same delay as the first.\n"
+         "    repeat (bool):\n"
+	 "        If True, the timer will fire repeatedly, with each successive\n"
+         "        firing having the same delay as the first.\n"
          "\n"
-         "timetype can be either 'sim', 'base', or 'real'. It defaults to\n"
-         "'sim'. Types are explained below:\n"
+	 "\n"
+         "    timetype (ba.TimeType):\n"
+	 "        Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults to\n"
+         "        ``SIM``. \n"
+	 "\n"
+         "    timeformat (ba.TimeFormat):\n"
+	 "        Defaults to seconds but can also be milliseconds.\n"
          "\n"
-         "'sim' time maps to local simulation time in ba.Activity or "
-         "ba.Session\n"
-         "Contexts. This means that it may progress slower in slow-motion "
-         "play\n"
+         "- SIM time maps to local simulation time in ba.Activity or ba.Session\n"
+         "Contexts. This means that it may progress slower in slow-motion play\n"
          "modes, stop when the game is paused, etc.  This time type is not\n"
          "available in UI contexts.\n"
-         "\n"
-         "'base' time is also linked to gameplay in ba.Activity or ba.Session\n"
+         "- BASE time is also linked to gameplay in ba.Activity or ba.Session\n"
          "Contexts, but it progresses at a constant rate regardless of\n "
          "slow-motion states or pausing.  It can, however, slow down or stop\n"
          "in certain cases such as network outages or game slowdowns due to\n"
          "cpu load. Like 'sim' time, this is unavailable in UI contexts.\n"
-         "\n"
-         "'real' time always maps to actual clock time with a bit of "
-         "filtering\n"
-         "added, regardless of Context.  (the filtering prevents it from "
-         "going\n"
+         "- REAL time always maps to actual clock time with a bit of filtering\n"
+         "added, regardless of Context. (The filtering prevents it from going\n"
          "backwards or jumping forward by large amounts due to the app being\n"
          "backgrounded, system time changing, etc.)\n"
          "Real time timers are currently only available in the UI context.\n"
          "\n"
-         "the 'timeformat' arg defaults to seconds but can also be "
-         "milliseconds.\n"
-         "\n"
-         "# timer example: print some stuff through time:\n"
-         "ba.screenmessage('hello from now!')\n"
-         "ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))\n"
-         "ba.timer(2.0, ba.Call(ba.screenmessage, 'hello from the future "
-         "2!'))\n"},
+	 "Examples:\n"
+         "    Print some stuff through time:\n"
+         "    ```python\n"
+         "    >>> ba.screenmessage('hello from now!')\n"
+         "    >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))\n"
+         "    >>> ba.timer(2.0, ba.Call(ba.screenmessage,\n"
+	 "    ...                       'hello from the future 2!'))\n"
+         "    ```\n"},
 
         {"time", (PyCFunction)PyTime, METH_VARARGS | METH_KEYWORDS,
          "time(timetype: ba.TimeType = TimeType.SIM,\n"
diff --git a/src/ballistica/python/methods/python_methods_system.cc b/src/ballistica/python/methods/python_methods_system.cc
index 0a64f147..46d2e627 100644
--- a/src/ballistica/python/methods/python_methods_system.cc
+++ b/src/ballistica/python/methods/python_methods_system.cc
@@ -846,10 +846,13 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "The call is made from.  Returns True if this location has not been\n"
        "registered already, and False if it has.\n"
        "\n"
-       "# Example: this print will only fire for the first loop iteration:\n"
-       "for i in range(10):\n"
-       "    if ba.do_once():\n"
-       "        print('Hello once from loop!')"},
+       "Example:\n"
+       "    This print will only fire for the first loop iteration:\n"
+       "    ```python\n"
+       "    >>> for i in range(10):\n"
+       "    ... if ba.do_once():\n"
+       "    ...     print('Hello once from loop!')\n"
+       "    ```\n"},
 
       {"_app", (PyCFunction)PyApp, METH_VARARGS | METH_KEYWORDS,
        "_app() -> ba.App\n"
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index 08dcfa2d..c4d8e46f 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -89,7 +89,7 @@ def generate(projroot: str) -> None:
         pdoc.render.configure(docformat='google',
                               search=True,
                               show_source=True)
-        pdoc.pdoc('ba', 'bastd', output_directory=outdirname)
+        pdoc.pdoc('ba', output_directory=outdirname)
     except Exception as exc:
         import traceback
         traceback.print_exc()

From b06a2efcfce007568720937b082b50c6710ff713 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Fri, 11 Feb 2022 15:13:40 +0300
Subject: [PATCH 08/21] update docstrings

---
 assets/src/ba_data/python/._ba_sources_hash   |   2 +-
 assets/src/ba_data/python/_ba.py              | 185 ++++++++++--------
 assets/src/ba_data/python/ba/_activity.py     |  22 +--
 assets/src/ba_data/python/ba/_actor.py        |   2 +-
 assets/src/ba_data/python/ba/_campaign.py     |   4 +-
 assets/src/ba_data/python/ba/_general.py      |   3 +-
 assets/src/ba_data/python/ba/_language.py     |   3 +-
 assets/src/ba_data/python/ba/_map.py          |   2 +-
 assets/src/ba_data/python/ba/_messages.py     |   2 +-
 .../ba_data/python/ba/_multiteamsession.py    |   2 +-
 assets/src/ba_data/python/ba/_session.py      |   8 +-
 assets/src/ba_data/python/bastd/actor/bomb.py |   4 +-
 assets/src/ba_data/python/bastd/actor/flag.py |   2 +-
 .../ba_data/python/bastd/actor/spazfactory.py |   6 +-
 .../python/class/python_class_context.cc      |   6 +-
 .../python/class/python_class_context_call.cc |   6 +-
 .../python/class/python_class_material.cc     | 136 +++++++------
 .../class/python_class_session_player.cc      |  17 +-
 .../python/class/python_class_timer.cc        |   3 +-
 .../python/class/python_class_vec3.cc         |   7 +-
 .../python/methods/python_methods_app.cc      |  50 +++--
 tools/batools/docs.py                         |   2 +-
 22 files changed, 255 insertions(+), 219 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 44b0b236..8fc7c329 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-225891607870108897605481763130834194451
\ No newline at end of file
+144616568017325747730083301686242056706
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index aff6e065..d655f62d 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -399,106 +399,111 @@ class Material:
         Add one or more actions to the material, optionally with conditions.
 
         Conditions:
-            Conditions are provided as tuples which can be combined to form boolean
-            logic. A single condition might look like ``('condition_name', cond_arg)``,
-            or a more complex nested one might look like ``(('some_condition',
-            cond_arg), 'or', ('another_condition', cond2_arg))``.
+            Conditions are provided as tuples which can be combined
+            to form boolean logic. A single condition might look like
+            ``('condition_name', cond_arg)``, or a more complex nested one
+            might look like ``(('some_condition', cond_arg), 'or',
+            ('another_condition', cond2_arg))``.
 
-            ``'and'``, ``'or'``, and ``'xor'`` are available to chain together 2 conditions, as
-            seen above.
+            ``'and'``, ``'or'``, and ``'xor'`` are available to chain
+           together 2 conditions, as seen above.
 
         Available Conditions:
-            ``('they_have_material', material)`` - does the part we're hitting have a
-            given ba.Material?
+            ``('they_have_material', material)`` - does the part we're
+            hitting have a given ba.Material?
 
-            ``('they_dont_have_material', material)`` - does the part we're hitting
-            not have a given ba.Material?
+            ``('they_dont_have_material', material)`` - does the part we're
+            hitting not have a given ba.Material?
 
-            ``('eval_colliding')`` - is ``'collide'`` true at this point in material
-            evaluation? (see the modify_part_collision action)
+            ``('eval_colliding')`` - is ``'collide'`` true at this point
+            in material evaluation? (see the modify_part_collision action)
 
-            ``('eval_not_colliding')`` - is 'collide' false at this point in material
-            evaluation? (see the modify_part_collision action)
+            ``('eval_not_colliding')`` - is 'collide' false at this point
+         in material evaluation? (see the modify_part_collision action)
 
-            ``('we_are_younger_than', age)`` - is our part younger than ``'age'``
-            (in milliseconds)?
+            ``('we_are_younger_than', age)`` - is our part younger than
+            ``'age'`` (in milliseconds)?
 
             ``('we_are_older_than', age)`` - is our part older than ``'age'``
             (in milliseconds)?
 
-            ``('they_are_younger_than', age)`` - is the part we're hitting younger than
-            ``'age'`` (in milliseconds)?
+            ``('they_are_younger_than', age)`` - is the part we're hitting
+            younger than ``'age'`` (in milliseconds)?
 
-            ``('they_are_older_than', age)`` - is the part we're hitting older than
-            ``'age'`` (in milliseconds)?
+            ``('they_are_older_than', age)`` - is the part we're hitting
+            older than ``'age'`` (in milliseconds)?
 
-            ``('they_are_same_node_as_us')`` - does the part we're hitting belong to
-            the same ba.Node as us?
+            ``('they_are_same_node_as_us')`` - does the part we're hitting
+            belong to the same ba.Node as us?
 
-            ``('they_are_different_node_than_us')`` - does the part we're hitting
-            belong to a different ba.Node than us?
+            ``('they_are_different_node_than_us')`` - does the part we're
+            hitting belong to a different ba.Node than us?
 
         Actions:
-            In a similar manner, actions are specified as tuples. Multiple actions
-            can be specified by providing a tuple of tuples.
+            In a similar manner, actions are specified as tuples.
+            Multiple actions can be specified by providing a tuple
+            of tuples.
 
         Available Actions:
-            ``('call', when, callable)`` - calls the provided callable; ``'when'`` can be
-            either ``'at_connect'`` or ``'at_disconnect'``. ``'at_connect'`` means to fire
-            when the two parts first come in contact; ``'at_disconnect'`` means to
-            fire once they cease being in contact.
+            ``('call', when, callable)`` - calls the provided callable;
+            ``'when'`` can be either ``'at_connect'`` or ``'at_disconnect'``.
+            ``'at_connect'`` means to fire
+            when the two parts first come in contact; ``'at_disconnect'``
+            means to fire once they cease being in contact.
 
-            ``('message', who, when, message_obj)`` - sends a message object; ``'who'`` can
-            be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be ``'at_connect'`` or
+            ``('message', who, when, message_obj)`` - sends a message object;
+            ``'who'`` can
+            be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be
+            ``'at_connect'`` or
             ``'at_disconnect'``, and message_obj is the message object to send.
-            This has the same effect as calling the node's ba.Node.handlemessage
-            method.
-
-            ``('modify_part_collision', attr, value)`` - changes some characteristic
-            of the physical collision that will occur between our part and their
-            part. This change will remain in effect as long as the two parts
-            remain overlapping. This means if you have a part with a material
-            that turns ``'collide'`` off against parts younger than 100ms, and it
-            touches another part that is 50ms old, it will continue to not
-            collide with that part until they separate, even if the 100ms
-            threshold is passed. Options for attr/value are: ``'physical'`` (boolean
-            value; whether a *physical* response will occur at all), ``'friction'``
-            (float value; how friction-y the physical response will be),
-            ``'collide'`` (boolean value; whether *any* collision will occur at all,
-            including non-physical stuff like callbacks), ``'use_node_collide'``
-            (boolean value; whether to honor modify_node_collision overrides for
-            this collision), ``'stiffness'`` (float value, how springy the physical
-            response is), ``'damping'`` (float value, how damped the physical
-            response is), ``'bounce'`` (float value; how bouncy the physical response
-            is).
+            This has the same effect as calling the node's
+            ba.Node.handlemessage method.
 
+            ``('modify_part_collision', attr, value)`` - changes some
+            characteristic of the physical collision that will occur between
+            our part and their part. This change will remain in effect as
+            long as the two parts remain overlapping. This means if you have a
+            part with a material that turns ``'collide'`` off against parts
+            younger than 100ms, and it touches another part that is 50ms old,
+            it will continue to not collide with that part until they separate,
+            even if the 100ms threshold is passed. Options for attr/value are:
+            ``'physical'`` (boolean value; whether a *physical* response will
+            occur at all), ``'friction'`` (float value; how friction-y the
+            physical response will be), ``'collide'`` (boolean value;
+            whether *any* collision will occur at all, including non-physical
+            stuff like callbacks), ``'use_node_collide'``
+            (boolean value; whether to honor modify_node_collision
+            overrides for this collision), ``'stiffness'`` (float value,
+            how springy the physical response is), ``'damping'`` (float
+            value, how damped the physical response is), ``'bounce'`` (float
+            value; how bouncy the physical response is).
             ``('modify_node_collision', attr, value)`` - similar to
             ``modify_part_collision``, but operates at a node-level.
             collision attributes set here will remain in effect as long as
             *anything* from our part's node and their part's node overlap.
             A key use of this functionality is to prevent new nodes from
             colliding with each other if they appear overlapped;
-            if ``modify_part_collision`` is used, only the individual parts that
-            were overlapping would avoid contact, but other parts could still
-            contact leaving the two nodes 'tangled up'.  Using
+            if ``modify_part_collision`` is used, only the individual
+            parts that were overlapping would avoid contact, but other parts
+            could still contact leaving the two nodes 'tangled up'. Using
             ``modify_node_collision ensures`` that the nodes must completely
             separate before they can start colliding.  Currently the only attr
             available here is ``'collide'`` (a boolean value).
 
-            ``('sound', sound, volume)`` - plays a ba.Sound when a collision occurs, at
-            a given volume, regardless of the collision speed/etc.
+            ``('sound', sound, volume)`` - plays a ba.Sound when a collision
+            occurs, at a given volume, regardless of the collision speed/etc.
 
-            ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound when a
-            collision occurs, based on the speed of impact. Provide a ba.Sound, a
-            target-impulse, and a volume.
+            ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound
+            when a collision occurs, based on the speed of impact.
+            Provide a ba.Sound, a target-impulse, and a volume.
 
-            ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound during a
-            collision when parts are 'scraping' against each other. Provide a
-            ba.Sound, a target-impulse, and a volume.
+            ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound
+            during a collision when parts are 'scraping' against each other.
+            Provide a ba.Sound, a target-impulse, and a volume.
 
-          ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound during a
-            collision when parts are 'rolling' against each other. Provide a
-            ba.Sound, a target-impulse, and a volume.
+          ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound
+            during a collision when parts are 'rolling' against each other.
+            Provide a ba.Sound, a target-impulse, and a volume.
 
         Examples:
             example 1: create a material that lets us ignore
@@ -818,42 +823,49 @@ class SessionPlayer:
     for any length of time.
 
     Attributes:
-
-        id: int
+        id (int):
             The unique numeric ID of the Player.
 
             Note that you can also use the boolean operator for this same
             functionality, so a statement such as "if player" will do
             the right thing both for Player objects and values of None.
 
-        in_game: bool
+        in_game (bool):
             This bool value will be True once the Player has completed
             any lobby character/team selection.
 
-        sessionteam: ba.SessionTeam
+        sessionteam (ba.SessionTeam):
             The ba.SessionTeam this Player is on. If the SessionPlayer
             is still in its lobby selecting a team/etc. then a
             ba.SessionTeamNotFoundError will be raised.
 
-        inputdevice: ba.InputDevice
+        inputdevice (ba.InputDevice):
             The input device associated with the player.
 
-        color: Sequence[float]
+        color (Sequence[float]):
             The base color for this Player.
             In team games this will match the ba.SessionTeam's color.
 
-        highlight: Sequence[float]
+        highlight (Sequence[float]):
             A secondary color for this player.
             This is used for minor highlights and accents
             to allow a player to stand apart from his teammates
             who may all share the same team (primary) color.
 
-        character: str
+        character (str):
             The character this player has selected in their profile.
 
-        activityplayer: Optional[ba.Player]
+        activityplayer (Optional[ba.Player]):
             The current game-specific instance for this player.
     """
+    id: int
+    in_game: bool
+    sessionteam: ba.SessionTeam
+    inputdevice: ba.InputDevice
+    color: Sequence[float]
+    highlight: Sequence[float]
+    character: str
+    activityplayer: Optional[ba.Player]
 
     def assigninput(self, type: Union[ba.InputType, tuple[ba.InputType, ...]],
                     call: Callable) -> None:
@@ -1056,16 +1068,18 @@ class Vec3(Sequence[float]):
     - with a single three-member sequence arg, sequence values are copied
     - otherwise assumes individual x/y/z args (positional or keywords)
     Attributes:
-
-       x: float
+       x (float):
           The vector's X component.
 
-       y: float
+       y (float):
           The vector's Y component.
 
-       z: float
+       z (float):
           The vector's Z component.
     """
+    x: float
+    y: float
+    z: float
 
     # pylint: disable=function-redefined
 
@@ -3593,8 +3607,8 @@ def set_have_mods(have_mods: bool) -> None:
 
 
 def set_internal_language_keys(
-    listobj: list[tuple[str, str]],
-    random_names_list: list[tuple[str, str]]) -> None:
+        listobj: list[tuple[str, str]],
+        random_names_list: list[tuple[str, str]]) -> None:
     """set_internal_language_keys(listobj: list[tuple[str, str]],
       random_names_list: list[tuple[str, str]]) -> None
 
@@ -3612,7 +3626,7 @@ def set_low_level_config_value(key: str, value: int) -> None:
 
 
 def set_map_bounds(
-    bounds: tuple[float, float, float, float, float, float]) -> None:
+        bounds: tuple[float, float, float, float, float, float]) -> None:
     """set_map_bounds(bounds: tuple[float, float, float, float, float, float])
       -> None
 
@@ -3964,8 +3978,8 @@ def textwidget(edit: ba.Widget = None,
 
 @overload
 def time(
-    timetype: ba.TimeType = TimeType.SIM,
-    timeformat: Literal[TimeFormat.SECONDS] = TimeFormat.SECONDS) -> float:
+        timetype: ba.TimeType = TimeType.SIM,
+        timeformat: Literal[TimeFormat.SECONDS] = TimeFormat.SECONDS) -> float:
     ...
 
 
@@ -4104,7 +4118,8 @@ def timer(time: float,
         >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))
         >>> ba.timer(2.0, ba.Call(ba.screenmessage,
         ...                       'hello from the future 2!'))
-        ```"""
+        ```
+    """
     return None
 
 
diff --git a/assets/src/ba_data/python/ba/_activity.py b/assets/src/ba_data/python/ba/_activity.py
index 701de8e1..bfaf16c6 100644
--- a/assets/src/ba_data/python/ba/_activity.py
+++ b/assets/src/ba_data/python/ba/_activity.py
@@ -42,14 +42,14 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
           passed to the Activity __init__ call.
 
        teams
-          The list of ba.Teams in the Activity. This gets populated just before
+          The list of ba.Team-s in the Activity. This gets populated just
           before on_begin() is called and is updated automatically as players
           join or leave the game. (at least in free-for-all mode where every
           player gets their own team; in teams mode there are always 2 teams
           regardless of the player count).
 
        players
-          The list of ba.Players in the Activity. This gets populated just
+          The list of ba.Player-s in the Activity. This gets populated just
           before on_begin() is called and is updated automatically as players
           join or leave the game.
     """
@@ -129,7 +129,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
     def __init__(self, settings: dict):
         """Creates an Activity in the current ba.Session.
 
-        The activity will not be actually run until ba.Session.setactivity()
+        The activity will not be actually run until ba.Session.setactivity
         is called. 'settings' should be a dict of key/value pairs specific
         to the activity.
 
@@ -363,14 +363,14 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         Upon this call, the Activity should fade in backgrounds,
         start playing music, etc. It does not yet have access to players
         or teams, however. They remain owned by the previous Activity
-        up until ba.Activity.on_begin() is called.
+        up until ba.Activity.on_begin is called.
         """
 
     def on_transition_out(self) -> None:
         """Called when your activity begins transitioning out.
 
-        Note that this may happen at any time even if end() has not been
-        called.
+        Note that this may happen at any time even if ba.Activity.end has
+        not been called.
         """
 
     def on_begin(self) -> None:
@@ -386,11 +386,11 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return UNHANDLED
 
     def has_transitioned_in(self) -> bool:
-        """Return whether on_transition_in() has been called."""
+        """Return whether ba.Activity.on_transition_in() has been called."""
         return self._has_transitioned_in
 
     def has_begun(self) -> bool:
-        """Return whether on_begin() has been called."""
+        """Return whether ba.Activity.on_begin() has been called."""
         return self._has_begun
 
     def has_ended(self) -> bool:
@@ -398,7 +398,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return self._has_ended
 
     def is_transitioning_out(self) -> bool:
-        """Return whether on_transition_out() has been called."""
+        """Return whether ba.Activity.on_transition_out() has been called."""
         return self._transitioning_out
 
     def transition_in(self, prev_globals: Optional[ba.Node]) -> None:
@@ -517,8 +517,8 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         Subclasses can override this if the activity's player class
         requires a custom constructor; otherwise it will be called with
         no args. Note that the player object should not be used at this
-        point as it is not yet fully wired up; wait for on_player_join()
-        for that.
+        point as it is not yet fully wired up; wait for
+        ba.Activity.on_player_join() for that.
         """
         del sessionplayer  # Unused.
         player = self._playertype()
diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py
index d5471679..cbc6f114 100644
--- a/assets/src/ba_data/python/ba/_actor.py
+++ b/assets/src/ba_data/python/ba/_actor.py
@@ -115,7 +115,7 @@ class Actor:
         return self
 
     def on_expire(self) -> None:
-        """Called for remaining ba.Actors when their ba.Activity shuts down.
+        """Called for remaining ba.Actor-s when their ba.Activity shuts down.
 
         Actors can use this opportunity to clear callbacks or other
         references which have the potential of keeping the ba.Activity
diff --git a/assets/src/ba_data/python/ba/_campaign.py b/assets/src/ba_data/python/ba/_campaign.py
index e7f53153..76942876 100644
--- a/assets/src/ba_data/python/ba/_campaign.py
+++ b/assets/src/ba_data/python/ba/_campaign.py
@@ -23,7 +23,7 @@ def getcampaign(name: str) -> ba.Campaign:
 
 
 class Campaign:
-    """Represents a unique set or series of ba.Levels.
+    """Represents a unique set or series of ba.Level-s.
 
     Category: App Classes
     """
@@ -52,7 +52,7 @@ class Campaign:
 
     @property
     def levels(self) -> list[ba.Level]:
-        """The list of ba.Levels in the Campaign."""
+        """The list of ba.Level-s in the Campaign."""
         return self._levels
 
     def getlevel(self, name: str) -> ba.Level:
diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py
index 220b1ccd..43d02ef4 100644
--- a/assets/src/ba_data/python/ba/_general.py
+++ b/assets/src/ba_data/python/ba/_general.py
@@ -380,7 +380,8 @@ def storagename(suffix: str = None) -> str:
         ...     # '_mymodule_submodule_mythingie_data'.
         ...     _STORENAME = ba.storagename('data')
         ...
-        ...     # Use that name to store some data in the Activity we were passed.
+        ...     # Use that name to store some data in the Activity we were
+        ...     # passed.
         ...     def __init__(self, activity):
         ...         activity.customdata[self._STORENAME] = {}
         ```
diff --git a/assets/src/ba_data/python/ba/_language.py b/assets/src/ba_data/python/ba/_language.py
index a7fac030..60b88a4d 100644
--- a/assets/src/ba_data/python/ba/_language.py
+++ b/assets/src/ba_data/python/ba/_language.py
@@ -384,7 +384,8 @@ class Lstr:
         value; if a translated value is available, it will be used; otherwise
         the english value will be. To see available translation categories,
         look under the 'translations' resource section.
-        >>> mynode.text = ba.Lstr(translate=('gameDescriptions', 'Defeat all enemies'))
+        >>> mynode.text = ba.Lstr(translate=('gameDescriptions',
+        ...                                  'Defeat all enemies'))
 
         EXAMPLE 3: specify a raw value and some substitutions. Substitutions
         can be used with resource and translate modes as well.
diff --git a/assets/src/ba_data/python/ba/_map.py b/assets/src/ba_data/python/ba/_map.py
index c5adf977..f8739a7c 100644
--- a/assets/src/ba_data/python/ba/_map.py
+++ b/assets/src/ba_data/python/ba/_map.py
@@ -345,7 +345,7 @@ class Map(Actor):
             self, players: Sequence[ba.Player]) -> Sequence[float]:
         """Return a random starting position in one of the FFA spawn areas.
 
-        If a list of ba.Players is provided; the returned points will be
+        If a list of ba.Player-s is provided; the returned points will be
         as far from these players as possible.
         """
 
diff --git a/assets/src/ba_data/python/ba/_messages.py b/assets/src/ba_data/python/ba/_messages.py
index a871d4bd..92a7c366 100644
--- a/assets/src/ba_data/python/ba/_messages.py
+++ b/assets/src/ba_data/python/ba/_messages.py
@@ -52,7 +52,7 @@ class DieMessage:
 
     Category: Message Classes
 
-    Most ba.Actors respond to this.
+    Most ba.Actor-s respond to this.
 
     Attributes:
 
diff --git a/assets/src/ba_data/python/ba/_multiteamsession.py b/assets/src/ba_data/python/ba/_multiteamsession.py
index 683ddde9..8a1b7bae 100644
--- a/assets/src/ba_data/python/ba/_multiteamsession.py
+++ b/assets/src/ba_data/python/ba/_multiteamsession.py
@@ -141,7 +141,7 @@ class MultiTeamSession(Session):
         team.customdata['previous_score'] = team.customdata['score'] = 0
 
     def get_max_players(self) -> int:
-        """Return max number of ba.Players allowed to join the game at once."""
+        """Return max number of ba.Player-s allowed to join the game at once"""
         if self.use_teams:
             return _ba.app.config.get('Team Game Max Players', 8)
         return _ba.app.config.get('Free-for-All Max Players', 8)
diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py
index 0b59fed4..9bf62082 100644
--- a/assets/src/ba_data/python/ba/_session.py
+++ b/assets/src/ba_data/python/ba/_session.py
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
 
 
 class Session:
-    """Defines a high level series of ba.Activities with a common purpose.
+    """Defines a high level series of ba.Activity-es with a common purpose.
 
     category: Gameplay Classes
 
@@ -32,11 +32,11 @@ class Session:
 
         sessionteams
             All the ba.SessionTeams in the Session. Most things should use the
-            list of ba.Teams in ba.Activity; not this.
+            list of ba.Team-s in ba.Activity; not this.
 
         sessionplayers
             All ba.SessionPlayers in the Session. Most things should use the
-            list of ba.Players in ba.Activity; not this. Some players, such as
+            list of ba.Player-s in ba.Activity; not this. Some players, such as
             those who have not yet selected a character, will only be
             found on this list.
 
@@ -48,7 +48,7 @@ class Session:
             The maximum number of players allowed in the Session.
 
         lobby
-            The ba.Lobby instance where new ba.Players go to select a
+            The ba.Lobby instance where new ba.Player-s go to select a
             Profile/Team/etc. before being added to games.
             Be aware this value may be None if a Session does not allow
             any such selection.
diff --git a/assets/src/ba_data/python/bastd/actor/bomb.py b/assets/src/ba_data/python/bastd/actor/bomb.py
index 6528367a..ebfc9f01 100644
--- a/assets/src/ba_data/python/bastd/actor/bomb.py
+++ b/assets/src/ba_data/python/bastd/actor/bomb.py
@@ -78,7 +78,7 @@ class BombFactory:
           A ba.Sound for random wood debris falling after an explosion.
 
        explode_sounds: Sequence[ba.Sound]
-          A tuple of ba.Sounds for explosions.
+          A tuple of ba.Sound-s for explosions.
 
        freeze_sound: ba.Sound
           A ba.Sound of an ice bomb freezing something.
@@ -119,7 +119,7 @@ class BombFactory:
           events with what it touches.
 
        dink_sounds: Sequence[ba.Sound]
-          A tuple of ba.Sounds for when bombs hit the ground.
+          A tuple of ba.Sound-s for when bombs hit the ground.
 
        sticky_impact_sound: ba.Sound
           The ba.Sound for a squish made by a sticky bomb hitting something.
diff --git a/assets/src/ba_data/python/bastd/actor/flag.py b/assets/src/ba_data/python/bastd/actor/flag.py
index 5bb693dc..21fafb62 100644
--- a/assets/src/ba_data/python/bastd/actor/flag.py
+++ b/assets/src/ba_data/python/bastd/actor/flag.py
@@ -189,7 +189,7 @@ class Flag(ba.Actor):
         useful for things like king-of-the-hill where players should
         not be moving the flag around.
 
-        'materials can be a list of extra ba.Materials to apply to the flag.
+        'materials can be a list of extra ba.Material-s to apply to the flag.
 
         If 'dropped_timeout' is provided (in seconds), the flag will die
         after remaining untouched for that long once it has been moved
diff --git a/assets/src/ba_data/python/bastd/actor/spazfactory.py b/assets/src/ba_data/python/bastd/actor/spazfactory.py
index af7eb868..128d3098 100644
--- a/assets/src/ba_data/python/bastd/actor/spazfactory.py
+++ b/assets/src/ba_data/python/bastd/actor/spazfactory.py
@@ -26,13 +26,13 @@ class SpazFactory:
     Attributes:
 
        impact_sounds_medium: Sequence[ba.Sound]
-          A tuple of ba.Sounds for when a ba.Spaz hits something kinda hard.
+          A tuple of ba.Sound-s for when a ba.Spaz hits something kinda hard.
 
        impact_sounds_hard: Sequence[ba.Sound]
-          A tuple of ba.Sounds for when a ba.Spaz hits something really hard.
+          A tuple of ba.Sound-s for when a ba.Spaz hits something really hard.
 
        impact_sounds_harder: Sequence[ba.Sound]
-          A tuple of ba.Sounds for when a ba.Spaz hits something really
+          A tuple of ba.Sound-s for when a ba.Spaz hits something really
           really hard.
 
        single_player_death_sound: ba.Sound
diff --git a/src/ballistica/python/class/python_class_context.cc b/src/ballistica/python/class/python_class_context.cc
index 6927f66d..c3ec6879 100644
--- a/src/ballistica/python/class/python_class_context.cc
+++ b/src/ballistica/python/class/python_class_context.cc
@@ -33,7 +33,8 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "the UI (there is a special 'ui' context for all user-interface-related\n"
       "functionality)\n"
       "\n"
-      "When instantiating a ba.Context instance, a single ``'source'`` argument\n"
+      "When instantiating a ba.Context instance, a single ``'source'`` "
+      "argument\n"
       "is passed, which can be one of the following strings/objects:\n\n"
       "``'empty'``:\n"
       "  Gives an empty context; it can be handy to run code here to ensure\n"
@@ -56,7 +57,8 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "\n"
       "\n"
       "Usage:\n"
-      "    Contexts are generally used with the python 'with' statement, which\n"
+      "    Contexts are generally used with the python 'with' statement, "
+      "which\n"
       "    sets the context as current on entry and resets it to the previous\n"
       "    value on exit.\n"
       "\n"
diff --git a/src/ballistica/python/class/python_class_context_call.cc b/src/ballistica/python/class/python_class_context_call.cc
index d7f66941..c0f304c3 100644
--- a/src/ballistica/python/class/python_class_context_call.cc
+++ b/src/ballistica/python/class/python_class_context_call.cc
@@ -41,13 +41,15 @@ void PythonClassContextCall::SetupType(PyTypeObject* obj) {
       "Examples:\n"
       "    Example A: code like this can inadvertently prevent our activity\n"
       "    (self) from ending until the operation completes, since the bound\n"
-      "    method we're passing (self.dosomething) contains a strong-reference\n"
+      "    method we're passing (self.dosomething) contains a "
+      "strong-reference\n"
       "    to self).\n"
       "    >>> start_some_long_action(callback_when_done=self.dosomething)\n"
       "\n"
       "    Example B: in this case our activity (self) can still die\n"
       "    properly; the callback will clear itself when the activity starts\n"
-      "    shutting down, becoming a harmless no-op and releasing the reference\n"
+      "    shutting down, becoming a harmless no-op and releasing the "
+      "reference\n"
       "    to our activity.\n"
       "    ```python\n"
       "    >>> start_long_action(\n"
diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index 4685dfdf..66f7610a 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -281,78 +281,84 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "Add one or more actions to the material, optionally with conditions.\n"
      "\n"
      "Conditions:\n"
-     "    Conditions are provided as tuples which can be combined to form boolean\n"
-     "    logic. A single condition might look like ``('condition_name', cond_arg)``,\n"
-     "    or a more complex nested one might look like ``(('some_condition',\n"
-     "    cond_arg), 'or', ('another_condition', cond2_arg))``.\n"
+     "    Conditions are provided as tuples which can be combined\n"
+     "    to form boolean logic. A single condition might look like\n"
+     "    ``('condition_name', cond_arg)``, or a more complex nested one\n"
+     "    might look like ``(('some_condition', cond_arg), 'or',\n"
+     "    ('another_condition', cond2_arg))``.\n"
      "\n"
-     "    ``'and'``, ``'or'``, and ``'xor'`` are available to chain together 2 conditions, as\n"
-     "    seen above.\n"
+     "    ``'and'``, ``'or'``, and ``'xor'`` are available to chain\n"
+     "   together 2 conditions, as seen above.\n"
      "\n"
      "Available Conditions:\n"
-     "    ``('they_have_material', material)`` - does the part we\'re hitting have a\n"
-     "    given ba.Material?\n"
+     "    ``('they_have_material', material)`` - does the part we\'re\n"
+     "    hitting have a given ba.Material?\n"
      "\n"
-     "    ``('they_dont_have_material', material)`` - does the part we\'re hitting\n"
-     "    not have a given ba.Material?\n"
+     "    ``('they_dont_have_material', material)`` - does the part we\'re\n"
+     "    hitting not have a given ba.Material?\n"
      "\n"
-     "    ``('eval_colliding')`` - is ``'collide'`` true at this point in material\n"
-     "    evaluation? (see the modify_part_collision action)\n"
+     "    ``('eval_colliding')`` - is ``'collide'`` true at this point\n"
+     "    in material evaluation? (see the modify_part_collision action)\n"
      "\n"
-     "    ``('eval_not_colliding')`` - is 'collide' false at this point in material\n"
-     "    evaluation? (see the modify_part_collision action)\n"
+     "    ``('eval_not_colliding')`` - is 'collide' false at this point\n"
+     " in material evaluation? (see the modify_part_collision action)\n"
      "\n"
-     "    ``('we_are_younger_than', age)`` - is our part younger than ``'age'``\n"
-     "    (in milliseconds)?\n"
+     "    ``('we_are_younger_than', age)`` - is our part younger than\n"
+     "    ``'age'`` (in milliseconds)?\n"
      "\n"
      "    ``('we_are_older_than', age)`` - is our part older than ``'age'``\n"
      "    (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_younger_than', age)`` - is the part we're hitting younger than\n"
-     "    ``'age'`` (in milliseconds)?\n"
+     "    ``('they_are_younger_than', age)`` - is the part we're hitting\n"
+     "    younger than ``'age'`` (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_older_than', age)`` - is the part we're hitting older than\n"
-     "    ``'age'`` (in milliseconds)?\n"
+     "    ``('they_are_older_than', age)`` - is the part we're hitting\n"
+     "    older than ``'age'`` (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_same_node_as_us')`` - does the part we're hitting belong to\n"
-     "    the same ba.Node as us?\n"
+     "    ``('they_are_same_node_as_us')`` - does the part we're hitting\n"
+     "    belong to the same ba.Node as us?\n"
      "\n"
-     "    ``('they_are_different_node_than_us')`` - does the part we're hitting\n"
-     "    belong to a different ba.Node than us?\n"
+     "    ``('they_are_different_node_than_us')`` - does the part we're\n"
+     "    hitting belong to a different ba.Node than us?\n"
      "\n"
      "Actions:\n"
-     "    In a similar manner, actions are specified as tuples. Multiple actions\n"
-     "    can be specified by providing a tuple of tuples.\n"
+     "    In a similar manner, actions are specified as tuples.\n"
+     "    Multiple actions can be specified by providing a tuple\n"
+     "    of tuples.\n"
      "\n"
      "Available Actions:\n"
-     "    ``('call', when, callable)`` - calls the provided callable; ``'when'`` can be\n"
-     "    either ``'at_connect'`` or ``'at_disconnect'``. ``'at_connect'`` means to fire\n"
-     "    when the two parts first come in contact; ``'at_disconnect'`` means to\n"
-     "    fire once they cease being in contact.\n"
+     "    ``('call', when, callable)`` - calls the provided callable;\n"
+     "    ``'when'`` can be either ``'at_connect'`` or ``'at_disconnect'``.\n"
+     "    ``'at_connect'`` means to fire\n"
+     "    when the two parts first come in contact; ``'at_disconnect'``\n"
+     "    means to fire once they cease being in contact.\n"
      "\n"
-     "    ``('message', who, when, message_obj)`` - sends a message object; ``'who'`` can\n"
-     "    be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be ``'at_connect'`` or\n"
+     "    ``('message', who, when, message_obj)`` - sends a message object;\n"
+     "    ``'who'`` can\n"
+     "    be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be\n"
+     "    ``'at_connect'`` or\n"
      "    ``'at_disconnect'``, and message_obj is the message object to send.\n"
-     "    This has the same effect as calling the node's ba.Node.handlemessage\n"
-     "    method.\n"
+     "    This has the same effect as calling the node's\n"
+     "    ba.Node.handlemessage method.\n"
      "\n"
-     "    ``('modify_part_collision', attr, value)`` - changes some characteristic\n"
-     "    of the physical collision that will occur between our part and their\n"
-     "    part. This change will remain in effect as long as the two parts\n"
-     "    remain overlapping. This means if you have a part with a material\n"
-     "    that turns ``'collide'`` off against parts younger than 100ms, and it\n"
-     "    touches another part that is 50ms old, it will continue to not\n"
-     "    collide with that part until they separate, even if the 100ms\n"
-     "    threshold is passed. Options for attr/value are: ``'physical'`` (boolean\n"
-     "    value; whether a *physical* response will occur at all), ``'friction'``\n"
-     "    (float value; how friction-y the physical response will be),\n"
-     "    ``'collide'`` (boolean value; whether *any* collision will occur at all,\n"
-     "    including non-physical stuff like callbacks), ``'use_node_collide'``\n"
-     "    (boolean value; whether to honor modify_node_collision overrides for\n"
-     "    this collision), ``'stiffness'`` (float value, how springy the physical\n"
-     "    response is), ``'damping'`` (float value, how damped the physical\n"
-     "    response is), ``'bounce'`` (float value; how bouncy the physical response\n"
-     "    is).\n"
+     "    ``('modify_part_collision', attr, value)`` - changes some\n"
+     "    characteristic of the physical collision that will occur between\n"
+     "    our part and their part. This change will remain in effect as\n"
+     "    long as the two parts remain overlapping. This means if you have a\n"
+     "    part with a material that turns ``'collide'`` off against parts\n"
+     "    younger than 100ms, and it touches another part that is 50ms old,\n"
+     "    it will continue to not collide with that part until they separate,\n"
+     "    even if the 100ms threshold is passed. Options for attr/value are:\n"
+     "    ``'physical'`` (boolean value; whether a *physical* response will\n"
+     "    occur at all), ``'friction'`` (float value; how friction-y the\n"
+     "    physical response will be), ``'collide'`` (boolean value;\n"
+     "    whether *any* collision will occur at all, including non-physical\n"
+     "    stuff like callbacks), ``'use_node_collide'``\n"
+     "    (boolean value; whether to honor modify_node_collision\n"
+     "    overrides for this collision), ``'stiffness'`` (float value,\n"
+     "    how springy the physical response is), ``'damping'`` (float\n"
+     "    value, how damped the physical response is), ``'bounce'`` (float\n"
+     "    value; how bouncy the physical response is)."
      "\n"
      "    ``('modify_node_collision', attr, value)`` - similar to\n"
      "    ``modify_part_collision``, but operates at a node-level.\n"
@@ -360,27 +366,27 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "    *anything* from our part's node and their part's node overlap.\n"
      "    A key use of this functionality is to prevent new nodes from\n"
      "    colliding with each other if they appear overlapped;\n"
-     "    if ``modify_part_collision`` is used, only the individual parts that\n"
-     "    were overlapping would avoid contact, but other parts could still\n"
-     "    contact leaving the two nodes 'tangled up'.  Using\n"
+     "    if ``modify_part_collision`` is used, only the individual\n"
+     "    parts that were overlapping would avoid contact, but other parts\n"
+     "    could still contact leaving the two nodes 'tangled up'. Using\n"
      "    ``modify_node_collision ensures`` that the nodes must completely\n"
      "    separate before they can start colliding.  Currently the only attr\n"
      "    available here is ``'collide'`` (a boolean value).\n"
      "\n"
-     "    ``('sound', sound, volume)`` - plays a ba.Sound when a collision occurs, at\n"
-     "    a given volume, regardless of the collision speed/etc.\n"
+     "    ``('sound', sound, volume)`` - plays a ba.Sound when a collision\n"
+     "    occurs, at a given volume, regardless of the collision speed/etc.\n"
      "\n"
-     "    ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound when a\n"
-     "    collision occurs, based on the speed of impact. Provide a ba.Sound, a\n"
-     "    target-impulse, and a volume.\n"
+     "    ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound\n"
+     "    when a collision occurs, based on the speed of impact.\n"
+     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "    ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound during a\n"
-     "    collision when parts are 'scraping' against each other. Provide a\n"
-     "    ba.Sound, a target-impulse, and a volume.\n"
+     "    ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound\n"
+     "    during a collision when parts are 'scraping' against each other.\n"
+     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "  ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound during a\n"
-     "    collision when parts are 'rolling' against each other. Provide a\n"
-     "    ba.Sound, a target-impulse, and a volume.\n"
+     "  ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound\n"
+     "    during a collision when parts are 'rolling' against each other.\n"
+     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
      "Examples:\n"
      "    example 1: create a material that lets us ignore\n"
diff --git a/src/ballistica/python/class/python_class_session_player.cc b/src/ballistica/python/class/python_class_session_player.cc
index d1a45162..25d549e1 100644
--- a/src/ballistica/python/class/python_class_session_player.cc
+++ b/src/ballistica/python/class/python_class_session_player.cc
@@ -58,40 +58,39 @@ void PythonClassSessionPlayer::SetupType(PyTypeObject* obj) {
       "for any length of time.\n"
       "\n"
       "Attributes:\n"
-      "\n"
-      "    " ATTR_ID ": int\n"
+      "    " ATTR_ID " (int):\n"
       "        The unique numeric ID of the Player.\n"
       "\n"
       "        Note that you can also use the boolean operator for this same\n"
       "        functionality, so a statement such as \"if player\" will do\n"
       "        the right thing both for Player objects and values of None.\n"
       "\n"
-      "    " ATTR_IN_GAME ": bool\n"
+      "    " ATTR_IN_GAME " (bool):\n"
       "        This bool value will be True once the Player has completed\n"
       "        any lobby character/team selection.\n"
       "\n"
-      "    " ATTR_SESSIONTEAM ": ba.SessionTeam\n"
+      "    " ATTR_SESSIONTEAM " (ba.SessionTeam):\n"
       "        The ba.SessionTeam this Player is on. If the SessionPlayer\n"
       "        is still in its lobby selecting a team/etc. then a\n"
       "        ba.SessionTeamNotFoundError will be raised.\n"
       "\n"
-      "    " ATTR_INPUT_DEVICE ": ba.InputDevice\n"
+      "    " ATTR_INPUT_DEVICE " (ba.InputDevice):\n"
       "        The input device associated with the player.\n"
       "\n"
-      "    " ATTR_COLOR ": Sequence[float]\n"
+      "    " ATTR_COLOR " (Sequence[float]):\n"
       "        The base color for this Player.\n"
       "        In team games this will match the ba.SessionTeam's color.\n"
       "\n"
-      "    " ATTR_HIGHLIGHT ": Sequence[float]\n"
+      "    " ATTR_HIGHLIGHT " (Sequence[float]):\n"
       "        A secondary color for this player.\n"
       "        This is used for minor highlights and accents\n"
       "        to allow a player to stand apart from his teammates\n"
       "        who may all share the same team (primary) color.\n"
       "\n"
-      "    " ATTR_CHARACTER ": str\n"
+      "    " ATTR_CHARACTER " (str):\n"
       "        The character this player has selected in their profile.\n"
       "\n"
-      "    " ATTR_ACTIVITYPLAYER ": Optional[ba.Player]\n"
+      "    " ATTR_ACTIVITYPLAYER " (Optional[ba.Player]):\n"
       "        The current game-specific instance for this player.\n";
 
   // clang-format on
diff --git a/src/ballistica/python/class/python_class_timer.cc b/src/ballistica/python/class/python_class_timer.cc
index 61884dd8..37809f38 100644
--- a/src/ballistica/python/class/python_class_timer.cc
+++ b/src/ballistica/python/class/python_class_timer.cc
@@ -53,7 +53,8 @@ void PythonClassTimer::SetupType(PyTypeObject* obj) {
       "    ... def stop_saying_it():\n"
       "    ...     self.t = None\n"
       "    ... ba.screenmessage('MUSHROOM MUSHROOM!')\n"
-      "    ... # Create our timer; it will run as long as we have the self.t ref.\n"
+      "    ... # Create our timer; it will run as long as we have the self.t "
+      "ref.\n"
       "    ... self.t = ba.Timer(0.3, say_it, repeat=True)\n"
       "    ... # Now fire off a one-shot timer to kill it.\n"
       "    ... ba.timer(3.89, stop_saying_it)\n"
diff --git a/src/ballistica/python/class/python_class_vec3.cc b/src/ballistica/python/class/python_class_vec3.cc
index 3fbdfbf9..1955f398 100644
--- a/src/ballistica/python/class/python_class_vec3.cc
+++ b/src/ballistica/python/class/python_class_vec3.cc
@@ -38,14 +38,13 @@ void PythonClassVec3::SetupType(PyTypeObject* obj) {
       "- otherwise assumes individual x/y/z args (positional or keywords)"
       "\n"
       "Attributes:\n"
-      "\n"
-      "   x: float\n"
+      "   x (float):\n"
       "      The vector's X component.\n"
       "\n"
-      "   y: float\n"
+      "   y (float):\n"
       "      The vector's Y component.\n"
       "\n"
-      "   z: float\n"
+      "   z (float):\n"
       "      The vector's Z component.\n";
 
   obj->tp_new = tp_new;
diff --git a/src/ballistica/python/methods/python_methods_app.cc b/src/ballistica/python/methods/python_methods_app.cc
index b1f07bcb..e40c7e88 100644
--- a/src/ballistica/python/methods/python_methods_app.cc
+++ b/src/ballistica/python/methods/python_methods_app.cc
@@ -1033,32 +1033,40 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "This timer cannot be canceled or modified once created. If you\n"
          " require the ability to do so, use the ba.Timer class instead.\n"
          "\n"
-	 "Arguments:\n"
+         "Arguments:\n"
          "    time (float):\n"
-	 "        Length of time (in seconds by default) that the timer will wait\n"
-         "        before firing. Note that the actual delay experienced may vary\n "
+         "        Length of time (in seconds by default) that the timer will "
+         "wait\n"
+         "        before firing. Note that the actual delay experienced may "
+         "vary\n "
          "        depending on the timetype. (see below)\n"
          "\n"
          "    call (Callable[[], Any]):\n"
-	 "        A callable Python object. Note that the timer will retain a\n"
-         "        strong reference to the callable for as long as it exists, so you\n"
-         "        may want to look into concepts such as ba.WeakCall if that is not\n"
+         "        A callable Python object. Note that the timer will retain a\n"
+         "        strong reference to the callable for as long as it exists, "
+         "so you\n"
+         "        may want to look into concepts such as ba.WeakCall if that "
+         "is not\n"
          "        desired.\n"
          "\n"
          "    repeat (bool):\n"
-	 "        If True, the timer will fire repeatedly, with each successive\n"
+         "        If True, the timer will fire repeatedly, with each "
+         "successive\n"
          "        firing having the same delay as the first.\n"
          "\n"
-	 "\n"
-         "    timetype (ba.TimeType):\n"
-	 "        Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults to\n"
-         "        ``SIM``. \n"
-	 "\n"
-         "    timeformat (ba.TimeFormat):\n"
-	 "        Defaults to seconds but can also be milliseconds.\n"
          "\n"
-         "- SIM time maps to local simulation time in ba.Activity or ba.Session\n"
-         "Contexts. This means that it may progress slower in slow-motion play\n"
+         "    timetype (ba.TimeType):\n"
+         "        Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults "
+         "to\n"
+         "        ``SIM``.\n"
+         "\n"
+         "    timeformat (ba.TimeFormat):\n"
+         "        Defaults to seconds but can also be milliseconds.\n"
+         "\n"
+         "- SIM time maps to local simulation time in ba.Activity or "
+         "ba.Session\n"
+         "Contexts. This means that it may progress slower in slow-motion "
+         "play\n"
          "modes, stop when the game is paused, etc.  This time type is not\n"
          "available in UI contexts.\n"
          "- BASE time is also linked to gameplay in ba.Activity or ba.Session\n"
@@ -1066,19 +1074,21 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "slow-motion states or pausing.  It can, however, slow down or stop\n"
          "in certain cases such as network outages or game slowdowns due to\n"
          "cpu load. Like 'sim' time, this is unavailable in UI contexts.\n"
-         "- REAL time always maps to actual clock time with a bit of filtering\n"
+         "- REAL time always maps to actual clock time with a bit of "
+         "filtering\n"
          "added, regardless of Context. (The filtering prevents it from going\n"
          "backwards or jumping forward by large amounts due to the app being\n"
          "backgrounded, system time changing, etc.)\n"
          "Real time timers are currently only available in the UI context.\n"
          "\n"
-	 "Examples:\n"
+         "Examples:\n"
          "    Print some stuff through time:\n"
          "    ```python\n"
          "    >>> ba.screenmessage('hello from now!')\n"
-         "    >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))\n"
+         "    >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the "
+         "future!'))\n"
          "    >>> ba.timer(2.0, ba.Call(ba.screenmessage,\n"
-	 "    ...                       'hello from the future 2!'))\n"
+         "    ...                       'hello from the future 2!'))\n"
          "    ```\n"},
 
         {"time", (PyCFunction)PyTime, METH_VARARGS | METH_KEYWORDS,
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index c4d8e46f..08dcfa2d 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -89,7 +89,7 @@ def generate(projroot: str) -> None:
         pdoc.render.configure(docformat='google',
                               search=True,
                               show_source=True)
-        pdoc.pdoc('ba', output_directory=outdirname)
+        pdoc.pdoc('ba', 'bastd', output_directory=outdirname)
     except Exception as exc:
         import traceback
         traceback.print_exc()

From edf35e2d594ee1ee46b206f6c0f7d51603c01caa Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Fri, 11 Feb 2022 15:15:57 +0300
Subject: [PATCH 09/21] tidying

---
 src/ballistica/python/class/python_class_material.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index 66f7610a..d2d0c49c 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -61,8 +61,8 @@ void PythonClassMaterial::SetupType(PyTypeObject* obj) {
       "of parts, each with its own set of materials. Generally materials are\n"
       "specified as array attributes on the Node. The ``'spaz'`` node, for\n"
       "example, has various attributes such as ``'materials'``,\n"
-      "``'roller_materials'``, and ``'punch_materials'``, which correspond to the\n"
-      "various parts it creates.\n"
+      "``'roller_materials'``, and ``'punch_materials'``, which correspond\n"
+      "to the various parts it creates.\n"
       "\n"
       "Use ba.Material to instantiate a blank material, and then use its\n"
       "ba.Material.add_actions method to define what the material does.\n"

From 45cf54fda9427b69bc7e3a5ca65eee67b112cbc6 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Sat, 12 Feb 2022 15:54:20 +0300
Subject: [PATCH 10/21] update dummymodule.py

---
 assets/src/ba_data/python/._ba_sources_hash   |    2 +-
 assets/src/ba_data/python/_ba.py              | 1510 ++++-------------
 .../python/class/python_class_input_device.cc |    3 +-
 .../python/class/python_class_node.cc         |   15 +-
 .../class/python_class_session_player.cc      |    3 +-
 .../python/class/python_class_widget.cc       |   16 +-
 tools/batools/dummymodule.py                  |   19 +-
 7 files changed, 334 insertions(+), 1234 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 8fc7c329..1b6ebb63 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-144616568017325747730083301686242056706
\ No newline at end of file
+191473689765959071642564573343309028448
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index d655f62d..811ac366 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -56,32 +56,21 @@ class ActivityData:
     """(internal)"""
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Returns whether the ActivityData still exists.
+        """Returns whether the ActivityData still exists.
         Most functionality will fail on a nonexistent instance.
         """
         return bool()
 
     def expire(self) -> None:
-        """expire() -> None
-
-        Expires the internal data for the activity
-        """
+        """Expires the internal data for the activity"""
         return None
 
     def make_foreground(self) -> None:
-        """make_foreground() -> None
-
-        Sets this activity as the foreground one in its session.
-        """
+        """Sets this activity as the foreground one in its session."""
         return None
 
     def start(self) -> None:
-        """start() -> None
-
-        Begins the activity running
-        """
+        """Begins the activity running"""
         return None
 
 
@@ -96,9 +85,7 @@ class CollideModel:
 
 
 class Context:
-    """Context(source: Any)
-
-    A game context state.
+    """A game context state.
 
     Category: General Utility Classes
 
@@ -165,9 +152,7 @@ class Context:
 
 
 class ContextCall:
-    """ContextCall(call: Callable)
-
-    A context-preserving callable.
+    """A context-preserving callable.
 
     Category: General Utility Classes
 
@@ -221,9 +206,7 @@ class Data:
     """
 
     def getvalue(self) -> Any:
-        """getvalue() -> Any
-
-        Return the data object's value.
+        """Return the data object's value.
 
         This can consist of anything representable by json (dicts, lists,
         numbers, bools, None, etc).
@@ -292,34 +275,27 @@ class InputDevice:
     is_remote_client: bool
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Return whether the underlying device for this object is still present.
+        """Return whether the underlying device for this object is
+        still present.
         """
         return bool()
 
     def get_account_name(self, full: bool) -> str:
-        """get_account_name(full: bool) -> str
-
-        Returns the account name associated with this device.
+        """Returns the account name associated with this device.
 
         (can be used to get account names for remote players)
         """
         return str()
 
     def get_axis_name(self, axis_id: int) -> str:
-        """get_axis_name(axis_id: int) -> str
-
-        Given an axis ID, return the name of the axis on this device.
+        """Given an axis ID, return the name of the axis on this device.
 
         Can return an empty string if the value is not meaningful to humans.
         """
         return str()
 
     def get_button_name(self, button_id: int) -> ba.Lstr:
-        """get_button_name(button_id: int) -> ba.Lstr
-
-        Given a button ID, return a human-readable name for that key/button.
+        """Given a button ID, return a human-readable name for that key/button.
 
         Can return an empty string if the value is not meaningful to humans.
         """
@@ -327,9 +303,7 @@ class InputDevice:
         return ba.Lstr(value='')
 
     def get_default_player_name(self) -> str:
-        """get_default_player_name() -> str
-
-        (internal)
+        """(internal)
 
         Returns the default player name for this device. (used for the 'random'
         profile)
@@ -337,31 +311,20 @@ class InputDevice:
         return str()
 
     def get_player_profiles(self) -> dict:
-        """get_player_profiles() -> dict
-
-        (internal)
-        """
+        """(internal)"""
         return dict()
 
     def is_connected_to_remote_player(self) -> bool:
-        """is_connected_to_remote_player() -> bool
-
-        (internal)
-        """
+        """(internal)"""
         return bool()
 
     def remove_remote_player_from_game(self) -> None:
-        """remove_remote_player_from_game() -> None
-
-        (internal)
-        """
+        """(internal)"""
         return None
 
 
 class Material:
-    """Material(label: str = None)
-
-    An entity applied to game objects to modify collision behavior.
+    """An entity applied to game objects to modify collision behavior.
 
     Category: Gameplay Classes
 
@@ -373,8 +336,8 @@ class Material:
     of parts, each with its own set of materials. Generally materials are
     specified as array attributes on the Node. The ``'spaz'`` node, for
     example, has various attributes such as ``'materials'``,
-    ``'roller_materials'``, and ``'punch_materials'``, which correspond to the
-    various parts it creates.
+    ``'roller_materials'``, and ``'punch_materials'``, which correspond
+    to the various parts it creates.
 
     Use ba.Material to instantiate a blank material, and then use its
     ba.Material.add_actions method to define what the material does.
@@ -393,10 +356,7 @@ class Material:
     def add_actions(self,
                     actions: tuple,
                     conditions: Optional[tuple] = None) -> None:
-        """add_actions(actions: tuple, conditions: Optional[tuple] = None)
-          -> None
-
-        Add one or more actions to the material, optionally with conditions.
+        """Add one or more actions to the material, optionally with conditions.
 
         Conditions:
             Conditions are provided as tuples which can be combined
@@ -692,22 +652,18 @@ class Node:
     tint: Sequence[float] = (1.0, 1.0, 1.0)
 
     def add_death_action(self, action: Callable[[], None]) -> None:
-        """add_death_action(action: Callable[[], None]) -> None
-
-        Add a callable object to be called upon this node's death.
+        """Add a callable object to be called upon this node's death.
         Note that these actions are run just after the node dies, not before.
         """
         return None
 
     def connectattr(self, srcattr: str, dstnode: Node, dstattr: str) -> None:
-        """connectattr(srcattr: str, dstnode: Node, dstattr: str) -> None
-
-        Connect one of this node's attributes to an attribute on another node.
-        This will immediately set the target attribute's value to that of the
-        source attribute, and will continue to do so once per step as long as
-        the two nodes exist. The connection can be severed by setting the
-        target attribute to any value or connecting another node attribute
-        to it.
+        """Connect one of this node's attributes to an attribute on another
+        node. This will immediately set the target attribute's value to that
+        of the source attribute, and will continue to do so once per step
+        as long as the two nodes exist. The connection can be severed by
+        setting the target attribute to any value or connecting another
+        node attribute to it.
 
         Example:
             Create a locator and attach a light to it:
@@ -720,17 +676,13 @@ class Node:
         return None
 
     def delete(self, ignore_missing: bool = True) -> None:
-        """delete(ignore_missing: bool = True) -> None
-
-        Delete the node.  Ignores already-deleted nodes if ignore_missing
+        """Delete the node.  Ignores already-deleted nodes if ignore_missing
         is True; otherwise a ba.NodeNotFoundError is thrown.
         """
         return None
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Returns whether the Node still exists.
+        """Returns whether the Node still exists.
         Most functionality will fail on a nonexistent Node, so it's never a bad
         idea to check this.
 
@@ -752,9 +704,8 @@ class Node:
         ...
 
     def getdelegate(self, type: Any, doraise: bool = False) -> Any:
-        """getdelegate(type: type, doraise: bool = False) -> <varies>
-
-        Return the node's current delegate object if it matches a certain type.
+        """Return the node's current delegate object if it matches
+        a certain type.
 
         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
@@ -763,24 +714,17 @@ class Node:
         return None
 
     def getname(self) -> str:
-        """getname() -> str
-
-        Return the name assigned to a Node; used mainly for debugging
-        """
+        """Return the name assigned to a Node; used mainly for debugging"""
         return str()
 
     def getnodetype(self) -> str:
-        """getnodetype() -> str
-
-        Return the type of Node referenced by this object as a string.
+        """Return the type of Node referenced by this object as a string.
         (Note this is different from the Python type which is always ba.Node)
         """
         return str()
 
     def handlemessage(self, *args: Any) -> None:
-        """handlemessage(*args: Any) -> None
-
-        General message handling; can be passed any message object.
+        """General message handling; can be passed any message object.
 
         All standard message objects are forwarded along to the ba.Node's
         delegate for handling (generally the ba.Actor that made the node).
@@ -800,9 +744,7 @@ class SessionData:
     """(internal)"""
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Returns whether the SessionData still exists.
+        """Returns whether the SessionData still exists.
         Most functionality will fail on a nonexistent instance.
         """
         return bool()
@@ -869,24 +811,15 @@ class SessionPlayer:
 
     def assigninput(self, type: Union[ba.InputType, tuple[ba.InputType, ...]],
                     call: Callable) -> None:
-        """assigninput(type: Union[ba.InputType, tuple[ba.InputType, ...]],
-          call: Callable) -> None
-
-        Set the python callable to be run for one or more types of input.
-        """
+        """Set the python callable to be run for one or more types of input."""
         return None
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Return whether the underlying player is still in the game.
-        """
+        """Return whether the underlying player is still in the game."""
         return bool()
 
     def get_account_id(self) -> str:
-        """get_account_id() -> str
-
-        Return the Account ID this player is signed in under, if
+        """Return the Account ID this player is signed in under, if
         there is one and it can be determined with relative certainty.
         Returns None otherwise. Note that this may require an active
         internet connection (especially for network-connected players)
@@ -896,85 +829,56 @@ class SessionPlayer:
         return str()
 
     def get_icon(self) -> dict[str, Any]:
-        """get_icon() -> dict[str, Any]
-
-        Returns the character's icon (images, colors, etc contained in a dict)
+        """Returns the character's icon (images, colors, etc contained
+        in a dict.
         """
         return {'foo': 'bar'}
 
     def get_icon_info(self) -> dict[str, Any]:
-        """get_icon_info() -> dict[str, Any]
-
-        (internal)
-        """
+        """(internal)"""
         return {'foo': 'bar'}
 
     def getname(self, full: bool = False, icon: bool = True) -> str:
-        """getname(full: bool = False, icon: bool = True) -> str
-
-        Returns the player's name. If icon is True, the long version of the
+        """Returns the player's name. If icon is True, the long version of the
         name may include an icon.
         """
         return str()
 
     def remove_from_game(self) -> None:
-        """remove_from_game() -> None
-
-        Removes the player from the game.
-        """
+        """Removes the player from the game."""
         return None
 
     def resetinput(self) -> None:
-        """resetinput() -> None
-
-        Clears out the player's assigned input actions.
-        """
+        """Clears out the player's assigned input actions."""
         return None
 
     def set_icon_info(self, texture: str, tint_texture: str,
                       tint_color: Sequence[float],
                       tint2_color: Sequence[float]) -> None:
-        """set_icon_info(texture: str, tint_texture: str,
-          tint_color: Sequence[float], tint2_color: Sequence[float]) -> None
-
-        (internal)
-        """
+        """(internal)"""
         return None
 
     def setactivity(self, activity: Optional[ba.Activity]) -> None:
-        """setactivity(activity: Optional[ba.Activity]) -> None
-
-        (internal)
-        """
+        """(internal)"""
         return None
 
     def setdata(self, team: ba.SessionTeam, character: str,
                 color: Sequence[float], highlight: Sequence[float]) -> None:
-        """setdata(team: ba.SessionTeam, character: str,
-          color: Sequence[float], highlight: Sequence[float]) -> None
-
-        (internal)
-        """
+        """(internal)"""
         return None
 
     def setname(self,
                 name: str,
                 full_name: str = None,
                 real: bool = True) -> None:
-        """setname(name: str, full_name: str = None, real: bool = True)
-          -> None
-
-        Set the player's name to the provided string.
+        """Set the player's name to the provided string.
         A number will automatically be appended if the name is not unique from
         other players.
         """
         return None
 
     def setnode(self, node: Optional[Node]) -> None:
-        """setnode(node: Optional[Node]) -> None
-
-        (internal)
-        """
+        """(internal)"""
         return None
 
 
@@ -999,12 +903,7 @@ class Texture:
 
 
 class Timer:
-    """Timer(time: float, call: Callable[[], Any], repeat: bool = False,
-      timetype: ba.TimeType = TimeType.SIM,
-      timeformat: ba.TimeFormat = TimeFormat.SECONDS,
-      suppress_format_warning: bool = False)
-
-    Timers are used to run code at later points in time.
+    """Timers are used to run code at later points in time.
 
     Category: General Utility Classes
 
@@ -1151,31 +1050,19 @@ class Vec3(Sequence[float]):
         pass
 
     def cross(self, other: Vec3) -> Vec3:
-        """cross(other: Vec3) -> Vec3
-
-        Returns the cross product of this vector and another.
-        """
+        """Returns the cross product of this vector and another."""
         return Vec3()
 
     def dot(self, other: Vec3) -> float:
-        """dot(other: Vec3) -> float
-
-        Returns the dot product of this vector and another.
-        """
+        """Returns the dot product of this vector and another."""
         return float()
 
     def length(self) -> float:
-        """length() -> float
-
-        Returns the length of the vector.
-        """
+        """Returns the length of the vector."""
         return float()
 
     def normalized(self) -> Vec3:
-        """normalized() -> Vec3
-
-        Returns a normalized version of the vector.
-        """
+        """Returns a normalized version of the vector."""
         return Vec3()
 
 
@@ -1190,31 +1077,21 @@ class Widget:
     """
 
     def activate(self) -> None:
-        """activate() -> None
-
-        Activates a widget; the same as if it had been clicked.
-        """
+        """Activates a widget; the same as if it had been clicked."""
         return None
 
     def add_delete_callback(self, call: Callable) -> None:
-        """add_delete_callback(call: Callable) -> None
-
-        Add a call to be run immediately after this widget is destroyed.
-        """
+        """Add a call to be run immediately after this widget is destroyed."""
         return None
 
     def delete(self, ignore_missing: bool = True) -> None:
-        """delete(ignore_missing: bool = True) -> None
-
-        Delete the Widget.  Ignores already-deleted Widgets if ignore_missing
-          is True; otherwise an Exception is thrown.
+        """Delete the Widget. Ignores already-deleted Widgets if ignore_missing
+        is True; otherwise an Exception is thrown.
         """
         return None
 
     def exists(self) -> bool:
-        """exists() -> bool
-
-        Returns whether the Widget still exists.
+        """Returns whether the Widget still exists.
         Most functionality will fail on a nonexistent widget.
 
         Note that you can also use the boolean operator for this same
@@ -1224,59 +1101,41 @@ class Widget:
         return bool()
 
     def get_children(self) -> list[ba.Widget]:
-        """get_children() -> list[ba.Widget]
-
-        Returns any child Widgets of this Widget.
-        """
+        """Returns any child Widgets of this Widget."""
         return [Widget()]
 
     def get_screen_space_center(self) -> tuple[float, float]:
-        """get_screen_space_center() -> tuple[float, float]
-
-        Returns the coords of the Widget center relative to the center of the
-        screen. This can be useful for placing pop-up windows and other special
-        cases.
+        """Returns the coords of the ba.Widget center relative to the center
+        of the screen. This can be useful for placing pop-up windows and other
+        special cases.
         """
         return (0.0, 0.0)
 
     def get_selected_child(self) -> Optional[ba.Widget]:
-        """get_selected_child() -> Optional[ba.Widget]
-
-        Returns the selected child Widget or None if nothing is selected.
-        """
+        """Returns the selected child Widget or None if nothing is selected."""
         return Widget()
 
     def get_widget_type(self) -> str:
-        """get_widget_type() -> str
-
-        Return the internal type of the Widget as a string.  Note that this is
-        different from the Python ba.Widget type, which is the same for all
-        widgets.
+        """Return the internal type of the Widget as a string. Note that this
+        is different from the Python ba.Widget type, which is the same for
+        all widgets.
         """
         return str()
 
 
 def _app() -> ba.App:
-    """_app() -> ba.App
-
-    (internal)
-    """
+    """(internal)"""
     import ba  # pylint: disable=cyclic-import
     return ba.App()
 
 
 def accept_party_invitation(invite_id: str) -> None:
-    """accept_party_invitation(invite_id: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def add_clean_frame_callback(call: Callable) -> None:
-    """add_clean_frame_callback(call: Callable) -> None
-
-    (internal)
+    """(internal)
 
     Provide an object to be called once the next non-progress-bar-frame has
     been rendered. Useful for queueing things to load in the background
@@ -1286,17 +1145,12 @@ def add_clean_frame_callback(call: Callable) -> None:
 
 
 def add_transaction(transaction: dict, callback: Callable = None) -> None:
-    """add_transaction(transaction: dict, callback: Callable = None) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def android_get_external_storage_path() -> str:
-    """android_get_external_storage_path() -> str
-
-    (internal)
+    """(internal)
 
     Returns the android external storage path, or None if there is none on
     this device
@@ -1305,9 +1159,7 @@ def android_get_external_storage_path() -> str:
 
 
 def android_media_scan_file(file_name: str) -> None:
-    """android_media_scan_file(file_name: str) -> None
-
-    (internal)
+    """(internal)
 
     Refreshes Android MTP Index for a file; use this to get file
     modifications to be reflected in Android File Transfer.
@@ -1316,33 +1168,22 @@ def android_media_scan_file(file_name: str) -> None:
 
 
 def android_show_wifi_settings() -> None:
-    """android_show_wifi_settings() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def apply_config() -> None:
-    """apply_config() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def appname() -> str:
-    """appname() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def appnameupper() -> str:
-    """appnameupper() -> str
-
-    (internal)
+    """(internal)
 
     Return whether this build of the game can display full unicode such as
     Emoji, Asian languages, etc.
@@ -1351,18 +1192,12 @@ def appnameupper() -> str:
 
 
 def back_press() -> None:
-    """back_press() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def bless() -> None:
-    """bless() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
@@ -1403,45 +1238,7 @@ def buttonwidget(edit: ba.Widget = None,
                  text_flatness: float = None,
                  text_res_scale: float = None,
                  enabled: bool = None) -> ba.Widget:
-    """buttonwidget(edit: ba.Widget = None,
-      parent: ba.Widget = None,
-      size: Sequence[float] = None,
-      position: Sequence[float] = None,
-      on_activate_call: Callable = None,
-      label: Union[str, ba.Lstr] = None,
-      color: Sequence[float] = None,
-      down_widget: ba.Widget = None,
-      up_widget: ba.Widget = None,
-      left_widget: ba.Widget = None,
-      right_widget: ba.Widget = None,
-      texture: ba.Texture = None,
-      text_scale: float = None,
-      textcolor: Sequence[float] = None,
-      enable_sound: bool = None,
-      model_transparent: ba.Model = None,
-      model_opaque: ba.Model = None,
-      repeat: bool = None,
-      scale: float = None,
-      transition_delay: float = None,
-      on_select_call: Callable = None,
-      button_type: str = None,
-      extra_touch_border_scale: float = None,
-      selectable: bool = None,
-      show_buffer_top: float = None,
-      icon: ba.Texture = None,
-      iconscale: float = None,
-      icon_tint: float = None,
-      icon_color: Sequence[float] = None,
-      autoselect: bool = None,
-      mask_texture: ba.Texture = None,
-      tint_texture: ba.Texture = None,
-      tint_color: Sequence[float] = None,
-      tint2_color: Sequence[float] = None,
-      text_flatness: float = None,
-      text_res_scale: float = None,
-      enabled: bool = None) -> ba.Widget
-
-    Create or edit a button widget.
+    """Create or edit a button widget.
 
     Category: User Interface Functions
 
@@ -1454,9 +1251,7 @@ def buttonwidget(edit: ba.Widget = None,
 
 
 def camerashake(intensity: float = 1.0) -> None:
-    """camerashake(intensity: float = 1.0) -> None
-
-    Shake the camera.
+    """Shake the camera.
 
     Category: Gameplay Functions
 
@@ -1468,25 +1263,17 @@ def camerashake(intensity: float = 1.0) -> None:
 
 
 def can_display_full_unicode() -> bool:
-    """can_display_full_unicode() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def can_show_ad() -> bool:
-    """can_show_ad() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def capture_gamepad_input(call: Callable[[dict], None]) -> None:
-    """capture_gamepad_input(call: Callable[[dict], None]) -> None
-
-    (internal)
+    """(internal)
 
     Add a callable to be called for subsequent gamepad events.
     The method is passed a dict containing info about the event.
@@ -1495,9 +1282,7 @@ def capture_gamepad_input(call: Callable[[dict], None]) -> None:
 
 
 def capture_keyboard_input(call: Callable[[dict], None]) -> None:
-    """capture_keyboard_input(call: Callable[[dict], None]) -> None
-
-    (internal)
+    """(internal)
 
     Add a callable to be called for subsequent keyboard-game-pad events.
     The method is passed a dict containing info about the event.
@@ -1506,9 +1291,7 @@ def capture_keyboard_input(call: Callable[[dict], None]) -> None:
 
 
 def charstr(char_id: ba.SpecialChar) -> str:
-    """charstr(char_id: ba.SpecialChar) -> str
-
-    Get a unicode string representing a special character.
+    """Get a unicode string representing a special character.
 
     Category: General Utility Functions
 
@@ -1524,12 +1307,7 @@ def charstr(char_id: ba.SpecialChar) -> str:
 def chatmessage(message: Union[str, ba.Lstr],
                 clients: Sequence[int] = None,
                 sender_override: str = None) -> None:
-    """chatmessage(message: Union[str, ba.Lstr],
-      clients: Sequence[int] = None,
-      sender_override: str = None) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
@@ -1548,23 +1326,7 @@ def checkboxwidget(edit: ba.Widget = None,
                    maxwidth: float = None,
                    autoselect: bool = None,
                    color: Sequence[float] = None) -> ba.Widget:
-    """checkboxwidget(edit: ba.Widget = None,
-      parent: ba.Widget = None,
-      size: Sequence[float] = None,
-      position: Sequence[float] = None,
-      text: Union[ba.Lstr, str] = None,
-      value: bool = None,
-      on_value_change_call: Callable[[bool], None] = None,
-      on_select_call: Callable[[], None] = None,
-      text_scale: float = None,
-      textcolor: Sequence[float] = None,
-      scale: float = None,
-      is_radio_button: bool = None,
-      maxwidth: float = None,
-      autoselect: bool = None,
-      color: Sequence[float] = None) -> ba.Widget
-
-    Create or edit a check-box widget.
+    """Create or edit a check-box widget.
 
     Category: User Interface Functions
 
@@ -1577,17 +1339,12 @@ def checkboxwidget(edit: ba.Widget = None,
 
 
 def client_info_query_response(token: str, response: Any) -> None:
-    """client_info_query_response(token: str, response: Any) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def clipboard_get_text() -> str:
-    """clipboard_get_text() -> str
-
-    Return text currently on the system clipboard.
+    """Return text currently on the system clipboard.
 
     Category: General Utility Functions
 
@@ -1598,9 +1355,7 @@ def clipboard_get_text() -> str:
 
 
 def clipboard_has_text() -> bool:
-    """clipboard_has_text() -> bool
-
-    Return whether there is currently text on the clipboard.
+    """Return whether there is currently text on the clipboard.
 
     Category: General Utility Functions
 
@@ -1611,9 +1366,7 @@ def clipboard_has_text() -> bool:
 
 
 def clipboard_is_supported() -> bool:
-    """clipboard_is_supported() -> bool
-
-    Return whether this platform supports clipboard operations at all.
+    """Return whether this platform supports clipboard operations at all.
 
     Category: General Utility Functions
 
@@ -1624,9 +1377,7 @@ def clipboard_is_supported() -> bool:
 
 
 def clipboard_set_text(value: str) -> None:
-    """clipboard_set_text(value: str) -> None
-
-    Copy a string to the system clipboard.
+    """Copy a string to the system clipboard.
 
     Category: General Utility Functions
 
@@ -1653,25 +1404,7 @@ def columnwidget(edit: ba.Widget = None,
                  margin: float = None,
                  claims_left_right: bool = None,
                  claims_tab: bool = None) -> ba.Widget:
-    """columnwidget(edit: ba.Widget = None,
-      parent: ba.Widget = None,
-      size: Sequence[float] = None,
-      position: Sequence[float] = None,
-      background: bool = None,
-      selected_child: ba.Widget = None,
-      visible_child: ba.Widget = None,
-      single_depth: bool = None,
-      print_list_exit_instructions: bool = None,
-      left_border: float = None,
-      top_border: float = None,
-      bottom_border: float = None,
-      selection_loops_to_parent: bool = None,
-      border: float = None,
-      margin: float = None,
-      claims_left_right: bool = None,
-      claims_tab: bool = None) -> ba.Widget
-
-    Create or edit a column widget.
+    """Create or edit a column widget.
 
     Category: User Interface Functions
 
@@ -1684,28 +1417,19 @@ def columnwidget(edit: ba.Widget = None,
 
 
 def commit_config(config: str) -> None:
-    """commit_config(config: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def connect_to_party(address: str,
                      port: int = None,
                      print_progress: bool = True) -> None:
-    """connect_to_party(address: str, port: int = None,
-      print_progress: bool = True) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def console_print(*args: Any) -> None:
-    """console_print(*args: Any) -> None
-
-    (internal)
+    """(internal)
 
     Print the provided args to the game console (using str()).
     For most debugging/info purposes you should just use Python's standard
@@ -1745,39 +1469,7 @@ def containerwidget(edit: ba.Widget = None,
                     on_select_call: Callable[[], None] = None,
                     claim_outside_clicks: bool = None,
                     claims_up_down: bool = None) -> ba.Widget:
-    """containerwidget(edit: ba.Widget = None,
-      parent: ba.Widget = None,
-      size: Sequence[float] = None,
-      position: Sequence[float] = None,
-      background: bool = None,
-      selected_child: ba.Widget = None,
-      transition: str = None,
-      cancel_button: ba.Widget = None,
-      start_button: ba.Widget = None,
-      root_selectable: bool = None,
-      on_activate_call: Callable[[], None] = None,
-      claims_left_right: bool = None,
-      claims_tab: bool = None,
-      selection_loops: bool = None,
-      selection_loops_to_parent: bool = None,
-      scale: float = None,
-      on_outside_click_call: Callable[[], None] = None,
-      single_depth: bool = None,
-      visible_child: ba.Widget = None,
-      stack_offset: Sequence[float] = None,
-      color: Sequence[float] = None,
-      on_cancel_call: Callable[[], None] = None,
-      print_list_exit_instructions: bool = None,
-      click_activate: bool = None,
-      always_highlight: bool = None,
-      selectable: bool = None,
-      scale_origin_stack_offset: Sequence[float] = None,
-      toolbar_visibility: str = None,
-      on_select_call: Callable[[], None] = None,
-      claim_outside_clicks: bool = None,
-      claims_up_down: bool = None) -> ba.Widget
-
-    Create or edit a container widget.
+    """Create or edit a container widget.
 
     Category: User Interface Functions
 
@@ -1790,9 +1482,7 @@ def containerwidget(edit: ba.Widget = None,
 
 
 def debug_print_py_err() -> None:
-    """debug_print_py_err() -> None
-
-    (internal)
+    """(internal)
 
     Debugging func for tracking leaked Python errors in the C++ layer..
     """
@@ -1800,17 +1490,12 @@ def debug_print_py_err() -> None:
 
 
 def disconnect_client(client_id: int, ban_time: int = 300) -> bool:
-    """disconnect_client(client_id: int, ban_time: int = 300) -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def disconnect_from_host() -> None:
-    """disconnect_from_host() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -1818,9 +1503,7 @@ def disconnect_from_host() -> None:
 
 
 def do_once() -> bool:
-    """do_once() -> bool
-
-    Return whether this is the first time running a line of code.
+    """Return whether this is the first time running a line of code.
 
     Category: General Utility Functions
 
@@ -1841,10 +1524,7 @@ def do_once() -> bool:
 
 
 def ehv() -> None:
-    """ehv() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
@@ -1856,13 +1536,7 @@ def emitfx(position: Sequence[float],
            chunk_type: str = 'rock',
            emit_type: str = 'chunks',
            tendril_type: str = 'smoke') -> None:
-    """emitfx(position: Sequence[float],
-      velocity: Optional[Sequence[float]] = None,
-      count: int = 10, scale: float = 1.0, spread: float = 1.0,
-      chunk_type: str = 'rock', emit_type: str ='chunks',
-      tendril_type: str = 'smoke') -> None
-
-    Emit particles, smoke, etc. into the fx sim layer.
+    """Emit particles, smoke, etc. into the fx sim layer.
 
     Category: Gameplay Functions
 
@@ -1875,9 +1549,7 @@ def emitfx(position: Sequence[float],
 
 
 def end_host_scanning() -> None:
-    """end_host_scanning() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -1885,9 +1557,7 @@ def end_host_scanning() -> None:
 
 
 def env() -> dict:
-    """env() -> dict
-
-    (internal)
+    """(internal)
 
     Returns a dict containing general info about the operating environment
     such as version, platform, etc.
@@ -1898,20 +1568,14 @@ def env() -> dict:
 
 
 def evaluate_lstr(value: str) -> str:
-    """evaluate_lstr(value: str) -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def fade_screen(to: int = 0,
                 time: float = 0.25,
                 endcall: Optional[Callable[[], None]] = None) -> None:
-    """fade_screen(to: int = 0, time: float = 0.25,
-      endcall: Optional[Callable[[], None]] = None) -> None
-
-    (internal)
+    """(internal)
 
     Fade the local game screen in our out from black over a duration of
     time. if "to" is 0, the screen will fade out to black.  Otherwise it
@@ -1922,9 +1586,7 @@ def fade_screen(to: int = 0,
 
 
 def focus_window() -> None:
-    """focus_window() -> None
-
-    (internal)
+    """(internal)
 
     A workaround for some unintentional backgrounding that occurs on mac
     """
@@ -1932,9 +1594,7 @@ def focus_window() -> None:
 
 
 def game_service_has_leaderboard(game: str, config: str) -> bool:
-    """game_service_has_leaderboard(game: str, config: str) -> bool
-
-    (internal)
+    """(internal)
 
     Given a game and config string, returns whether there is a leaderboard
     for it on the game service.
@@ -1943,65 +1603,42 @@ def game_service_has_leaderboard(game: str, config: str) -> bool:
 
 
 def get_account_display_string(full: bool = True) -> str:
-    """get_account_display_string(full: bool = True) -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_account_misc_read_val(name: str, default_value: Any) -> Any:
-    """get_account_misc_read_val(name: str, default_value: Any) -> Any
-
-    (internal)
-    """
+    """(internal)"""
     return _uninferrable()
 
 
 def get_account_misc_read_val_2(name: str, default_value: Any) -> Any:
-    """get_account_misc_read_val_2(name: str, default_value: Any) -> Any
-
-    (internal)
-    """
+    """(internal)"""
     return _uninferrable()
 
 
 def get_account_misc_val(name: str, default_value: Any) -> Any:
-    """get_account_misc_val(name: str, default_value: Any) -> Any
-
-    (internal)
-    """
+    """(internal)"""
     return _uninferrable()
 
 
 def get_account_name() -> str:
-    """get_account_name() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_account_state() -> str:
-    """get_account_state() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_account_state_num() -> int:
-    """get_account_state_num() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_account_ticket_count() -> int:
-    """get_account_ticket_count() -> int
-
-    (internal)
+    """(internal)
 
     Returns the number of tickets for the current account.
     """
@@ -2009,33 +1646,22 @@ def get_account_ticket_count() -> int:
 
 
 def get_account_type() -> str:
-    """get_account_type() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_appconfig_builtin_keys() -> list[str]:
-    """get_appconfig_builtin_keys() -> list[str]
-
-    (internal)
-    """
+    """(internal)"""
     return ['blah', 'blah2']
 
 
 def get_appconfig_default_value(key: str) -> Any:
-    """get_appconfig_default_value(key: str) -> Any
-
-    (internal)
-    """
+    """(internal)"""
     return _uninferrable()
 
 
 def get_camera_position() -> tuple[float, ...]:
-    """get_camera_position() -> tuple[float, ...]
-
-    (internal)
+    """(internal)
 
     WARNING: these camera controls will not apply to network clients
     and may behave unpredictably in other ways. Use them only for
@@ -2045,9 +1671,7 @@ def get_camera_position() -> tuple[float, ...]:
 
 
 def get_camera_target() -> tuple[float, ...]:
-    """get_camera_target() -> tuple[float, ...]
-
-    (internal)
+    """(internal)
 
     WARNING: these camera controls will not apply to network clients
     and may behave unpredictably in other ways. Use them only for
@@ -2057,17 +1681,12 @@ def get_camera_target() -> tuple[float, ...]:
 
 
 def get_chat_messages() -> list[str]:
-    """get_chat_messages() -> list[str]
-
-    (internal)
-    """
+    """(internal)"""
     return ['blah', 'blah2']
 
 
 def get_collision_info(*args: Any) -> Any:
-    """get_collision_info(*args: Any) -> Any
-
-    Return collision related values
+    """Return collision related values
 
     Category: Gameplay Functions
 
@@ -2079,9 +1698,7 @@ def get_collision_info(*args: Any) -> Any:
 
 
 def get_configurable_game_pads() -> list:
-    """get_configurable_game_pads() -> list
-
-    (internal)
+    """(internal)
 
     Returns a list of the currently connected gamepads that can be
     configured.
@@ -2090,17 +1707,12 @@ def get_configurable_game_pads() -> list:
 
 
 def get_connection_to_host_info() -> dict:
-    """get_connection_to_host_info() -> dict
-
-    (internal)
-    """
+    """(internal)"""
     return dict()
 
 
 def get_display_resolution() -> Optional[tuple[int, int]]:
-    """get_display_resolution() -> Optional[tuple[int, int]]
-
-    (internal)
+    """(internal)
 
     Return the currently selected display resolution for fullscreen
     display. Returns None if resolutions cannot be directly set.
@@ -2109,9 +1721,7 @@ def get_display_resolution() -> Optional[tuple[int, int]]:
 
 
 def get_foreground_host_activity() -> Optional[ba.Activity]:
-    """get_foreground_host_activity() -> Optional[ba.Activity]
-
-    (internal)
+    """(internal)
 
     Returns the ba.Activity currently in the foreground, or None if there
     is none.
@@ -2121,9 +1731,7 @@ def get_foreground_host_activity() -> Optional[ba.Activity]:
 
 
 def get_foreground_host_session() -> Optional[ba.Session]:
-    """get_foreground_host_session() -> Optional[ba.Session]
-
-    (internal)
+    """(internal)
 
     Return the ba.Session currently being displayed, or None if there is
     none.
@@ -2133,9 +1741,7 @@ def get_foreground_host_session() -> Optional[ba.Session]:
 
 
 def get_game_port() -> int:
-    """get_game_port() -> int
-
-    (internal)
+    """(internal)
 
     Return the port ballistica is hosting on.
     """
@@ -2143,25 +1749,17 @@ def get_game_port() -> int:
 
 
 def get_game_roster() -> list[dict[str, Any]]:
-    """get_game_roster() -> list[dict[str, Any]]
-
-    (internal)
-    """
+    """(internal)"""
     return [{'foo': 'bar'}]
 
 
 def get_google_play_party_client_count() -> int:
-    """get_google_play_party_client_count() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_idle_time() -> int:
-    """get_idle_time() -> int
-
-    (internal)
+    """(internal)
 
     Returns the amount of time since any game input has been received.
     """
@@ -2169,17 +1767,12 @@ def get_idle_time() -> int:
 
 
 def get_local_active_input_devices_count() -> int:
-    """get_local_active_input_devices_count() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_log_file_path() -> str:
-    """get_log_file_path() -> str
-
-    (internal)
+    """(internal)
 
     Return the path to the app log file.
     """
@@ -2187,20 +1780,14 @@ def get_log_file_path() -> str:
 
 
 def get_low_level_config_value(key: str, default_value: int) -> int:
-    """get_low_level_config_value(key: str, default_value: int) -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_master_server_address(source: int = -1,
                               version: int = 1,
                               internal: bool = False) -> str:
-    """get_master_server_address(source: int = -1, version: int = 1,
-      internal: bool = False) -> str
-
-    (internal)
+    """(internal)
 
     Return the address of the master server.
     """
@@ -2208,9 +1795,7 @@ def get_master_server_address(source: int = -1,
 
 
 def get_max_graphics_quality() -> str:
-    """get_max_graphics_quality() -> str
-
-    (internal)
+    """(internal)
 
     Return the max graphics-quality supported on the current hardware.
     """
@@ -2218,121 +1803,79 @@ def get_max_graphics_quality() -> str:
 
 
 def get_news_show() -> str:
-    """get_news_show() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_package_collide_model(package: ba.AssetPackage,
                               name: str) -> ba.CollideModel:
-    """get_package_collide_model(package: ba.AssetPackage, name: str)
-    -> ba.CollideModel
-
-    (internal)
-    """
+    """(internal)"""
     import ba  # pylint: disable=cyclic-import
     return ba.CollideModel()
 
 
 def get_package_data(package: ba.AssetPackage, name: str) -> ba.Data:
-    """get_package_data(package: ba.AssetPackage, name: str) -> ba.Data
-
-    (internal).
-    """
+    """(internal)."""
     import ba  # pylint: disable=cyclic-import
     return ba.Data()
 
 
 def get_package_model(package: ba.AssetPackage, name: str) -> ba.Model:
-    """get_package_model(package: ba.AssetPackage, name: str) -> ba.Model
-
-    (internal)
-    """
+    """(internal)"""
     import ba  # pylint: disable=cyclic-import
     return ba.Model()
 
 
 def get_package_sound(package: ba.AssetPackage, name: str) -> ba.Sound:
-    """get_package_sound(package: ba.AssetPackage, name: str) -> ba.Sound
-
-    (internal).
-    """
+    """(internal)."""
     import ba  # pylint: disable=cyclic-import
     return ba.Sound()
 
 
 def get_package_texture(package: ba.AssetPackage, name: str) -> ba.Texture:
-    """get_package_texture(package: ba.AssetPackage, name: str) -> ba.Texture
-
-    (internal)
-    """
+    """(internal)"""
     import ba  # pylint: disable=cyclic-import
     return ba.Texture()
 
 
 def get_price(item: str) -> Optional[str]:
-    """get_price(item: str) -> Optional[str]
-
-    (internal)
-    """
+    """(internal)"""
     return ''
 
 
 def get_public_login_id() -> Optional[str]:
-    """get_public_login_id() -> Optional[str]
-
-    (internal)
-    """
+    """(internal)"""
     return ''
 
 
 def get_public_party_enabled() -> bool:
-    """get_public_party_enabled() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def get_public_party_max_size() -> int:
-    """get_public_party_max_size() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_purchased(item: str) -> bool:
-    """get_purchased(item: str) -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def get_purchases_state() -> int:
-    """get_purchases_state() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def get_qrcode_texture(url: str) -> ba.Texture:
-    """get_qrcode_texture(url: str) -> ba.Texture
-
-    (internal)
-    """
+    """(internal)"""
     import ba  # pylint: disable=cyclic-import
     return ba.Texture()
 
 
 def get_random_names() -> list:
-    """get_random_names() -> list
-
-    (internal)
+    """(internal)
 
     Returns the random names used by the game.
     """
@@ -2340,9 +1883,7 @@ def get_random_names() -> list:
 
 
 def get_replay_speed_exponent() -> int:
-    """get_replay_speed_exponent() -> int
-
-    (internal)
+    """(internal)
 
     Returns current replay speed value. Actual displayed speed is pow(2,speed).
     """
@@ -2350,33 +1891,22 @@ def get_replay_speed_exponent() -> int:
 
 
 def get_replays_dir() -> str:
-    """get_replays_dir() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def get_scores_to_beat(level: str, config: str, callback: Callable) -> None:
-    """get_scores_to_beat(level: str, config: str, callback: Callable) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def get_special_widget(name: str) -> Widget:
-    """get_special_widget(name: str) -> Widget
-
-    (internal)
-    """
+    """(internal)"""
     return Widget()
 
 
 def get_string_height(string: str, suppress_warning: bool = False) -> float:
-    """get_string_height(string: str, suppress_warning: bool = False) -> float
-
-    (internal)
+    """(internal)
 
     Given a string, returns its height using the standard small app
     font.
@@ -2385,9 +1915,7 @@ def get_string_height(string: str, suppress_warning: bool = False) -> float:
 
 
 def get_string_width(string: str, suppress_warning: bool = False) -> float:
-    """get_string_width(string: str, suppress_warning: bool = False) -> float
-
-    (internal)
+    """(internal)
 
     Given a string, returns its width using the standard small app
     font.
@@ -2396,9 +1924,7 @@ def get_string_width(string: str, suppress_warning: bool = False) -> float:
 
 
 def get_thread_name() -> str:
-    """get_thread_name() -> str
-
-    (internal)
+    """(internal)
 
     Returns the name of the current thread.
     This may vary depending on platform and should not be used in logic;
@@ -2408,9 +1934,7 @@ def get_thread_name() -> str:
 
 
 def get_ui_input_device() -> ba.InputDevice:
-    """get_ui_input_device() -> ba.InputDevice
-
-    (internal)
+    """(internal)
 
     Returns the input-device that currently owns the user interface, or
     None if there is none.
@@ -2420,10 +1944,7 @@ def get_ui_input_device() -> ba.InputDevice:
 
 
 def get_v2_fleet() -> str:
-    """get_v2_fleet() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
@@ -2439,9 +1960,7 @@ def getactivity(doraise: Literal[False]) -> Optional[ba.Activity]:
 
 
 def getactivity(doraise: bool = True) -> Optional[ba.Activity]:
-    """getactivity(doraise: bool = True) -> <varies>
-
-    Return the current ba.Activity instance.
+    """Return the current ba.Activity instance.
 
     Category: Gameplay Functions
 
@@ -2455,9 +1974,7 @@ def getactivity(doraise: bool = True) -> Optional[ba.Activity]:
 
 
 def getcollidemodel(name: str) -> ba.CollideModel:
-    """getcollidemodel(name: str) -> ba.CollideModel
-
-    Return a collide-model, loading it if necessary.
+    """Return a collide-model, loading it if necessary.
 
     Category: Asset Functions
 
@@ -2474,9 +1991,7 @@ def getcollidemodel(name: str) -> ba.CollideModel:
 
 
 def getdata(name: str) -> ba.Data:
-    """getdata(name: str) -> ba.Data
-
-    Return a data, loading it if necessary.
+    """Return a data, loading it if necessary.
 
     Category: Asset Functions
 
@@ -2504,10 +2019,7 @@ def getinputdevice(name: str, unique_id: str,
 
 
 def getinputdevice(name: str, unique_id: str, doraise: bool = True) -> Any:
-    """getinputdevice(name: str, unique_id: str, doraise: bool = True)
-      -> <varies>
-
-    (internal)
+    """(internal)
 
     Given a type name and a unique identifier, returns an InputDevice.
     Throws an Exception if the input-device is not found, or returns None
@@ -2517,17 +2029,12 @@ def getinputdevice(name: str, unique_id: str, doraise: bool = True) -> Any:
 
 
 def getlog() -> str:
-    """getlog() -> str
-
-    (internal)
-    """
+    """(internal)"""
     return str()
 
 
 def getmodel(name: str) -> ba.Model:
-    """getmodel(name: str) -> ba.Model
-
-    Return a model, loading it if necessary.
+    """Return a model, loading it if necessary.
 
     Category: Asset Functions
 
@@ -2541,9 +2048,7 @@ def getmodel(name: str) -> ba.Model:
 
 
 def getnodes() -> list:
-    """getnodes() -> list
-
-    Return all nodes in the current ba.Context.
+    """Return all nodes in the current ba.Context.
     Category: Gameplay Functions
     """
     return list()
@@ -2561,9 +2066,7 @@ def getsession(doraise: Literal[False]) -> Optional[ba.Session]:
 
 
 def getsession(doraise: bool = True) -> Optional[ba.Session]:
-    """getsession(doraise: bool = True) -> <varies>
-
-    Category: Gameplay Functions
+    """Category: Gameplay Functions
 
     Returns the current ba.Session instance.
     Note that this is based on context; thus code being run in the UI
@@ -2575,9 +2078,7 @@ def getsession(doraise: bool = True) -> Optional[ba.Session]:
 
 
 def getsound(name: str) -> ba.Sound:
-    """getsound(name: str) -> ba.Sound
-
-    Return a sound, loading it if necessary.
+    """Return a sound, loading it if necessary.
 
     Category: Asset Functions
 
@@ -2591,9 +2092,7 @@ def getsound(name: str) -> ba.Sound:
 
 
 def gettexture(name: str) -> ba.Texture:
-    """gettexture(name: str) -> ba.Texture
-
-    Return a texture, loading it if necessary.
+    """Return a texture, loading it if necessary.
 
     Category: Asset Functions
 
@@ -2607,9 +2106,7 @@ def gettexture(name: str) -> ba.Texture:
 
 
 def has_gamma_control() -> bool:
-    """has_gamma_control() -> bool
-
-    (internal)
+    """(internal)
 
     Returns whether the system can adjust overall screen gamma)
     """
@@ -2617,9 +2114,7 @@ def has_gamma_control() -> bool:
 
 
 def has_user_mods() -> bool:
-    """has_user_mods() -> bool
-
-    (internal)
+    """(internal)
 
     Returns whether the system varies from default configuration
     (by user mods, etc)
@@ -2628,33 +2123,22 @@ def has_user_mods() -> bool:
 
 
 def has_user_run_commands() -> bool:
-    """has_user_run_commands() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def has_video_ads() -> bool:
-    """has_video_ads() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def have_chars(text: str) -> bool:
-    """have_chars(text: str) -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def have_connected_clients() -> bool:
-    """have_connected_clients() -> bool
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -2662,33 +2146,22 @@ def have_connected_clients() -> bool:
 
 
 def have_incentivized_ad() -> bool:
-    """have_incentivized_ad() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def have_outstanding_transactions() -> bool:
-    """have_outstanding_transactions() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def have_permission(permission: ba.Permission) -> bool:
-    """have_permission(permission: ba.Permission) -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def have_touchscreen_input() -> bool:
-    """have_touchscreen_input() -> bool
-
-    (internal)
+    """(internal)
 
     Returns whether or not a touch-screen input is present
     """
@@ -2696,10 +2169,7 @@ def have_touchscreen_input() -> bool:
 
 
 def host_scan_cycle() -> list:
-    """host_scan_cycle() -> list
-
-    (internal)
-    """
+    """(internal)"""
     return list()
 
 
@@ -2719,19 +2189,7 @@ def hscrollwidget(edit: ba.Widget = None,
                   claims_left_right: bool = None,
                   claims_up_down: bool = None,
                   claims_tab: bool = None) -> ba.Widget:
-    """hscrollwidget(edit: ba.Widget = None, parent: ba.Widget = None,
-      size: Sequence[float] = None, position: Sequence[float] = None,
-      background: bool = None, selected_child: ba.Widget = None,
-      capture_arrows: bool = None,
-      on_select_call: Callable[[], None] = None,
-      center_small_content: bool = None, color: Sequence[float] = None,
-      highlight: bool = None, border_opacity: float = None,
-      simple_culling_h: float = None,
-      claims_left_right: bool = None,
-      claims_up_down: bool = None,
-      claims_tab: bool = None)  -> ba.Widget
-
-    Create or edit a horizontal scroll widget.
+    """Create or edit a horizontal scroll widget.
 
     Category: User Interface Functions
 
@@ -2761,18 +2219,7 @@ def imagewidget(edit: ba.Widget = None,
                 tilt_scale: float = None,
                 mask_texture: ba.Texture = None,
                 radial_amount: float = None) -> ba.Widget:
-    """imagewidget(edit: ba.Widget = None, parent: ba.Widget = None,
-      size: Sequence[float] = None, position: Sequence[float] = None,
-      color: Sequence[float] = None, texture: ba.Texture = None,
-      opacity: float = None, model_transparent: ba.Model = None,
-      model_opaque: ba.Model = None, has_alpha_channel: bool = True,
-      tint_texture: ba.Texture = None, tint_color: Sequence[float] = None,
-      transition_delay: float = None, draw_controller: ba.Widget = None,
-      tint2_color: Sequence[float] = None, tilt_scale: float = None,
-      mask_texture: ba.Texture = None, radial_amount: float = None)
-      -> ba.Widget
-
-    Create or edit an image widget.
+    """Create or edit an image widget.
 
     Category: User Interface Functions
 
@@ -2785,17 +2232,12 @@ def imagewidget(edit: ba.Widget = None,
 
 
 def in_game_purchase(item: str, price: int) -> None:
-    """in_game_purchase(item: str, price: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def in_game_thread() -> bool:
-    """in_game_thread() -> bool
-
-    (internal)
+    """(internal)
 
     Returns whether or not the current thread is the game thread.
     """
@@ -2803,69 +2245,46 @@ def in_game_thread() -> bool:
 
 
 def increment_analytics_count(name: str, increment: int = 1) -> None:
-    """increment_analytics_count(name: str, increment: int = 1) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def increment_analytics_count_raw_2(name: str,
                                     uses_increment: bool = True,
                                     increment: int = 1) -> None:
-    """increment_analytics_count_raw_2(name: str,
-      uses_increment: bool = True, increment: int = 1) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def increment_analytics_counts_raw(name: str, increment: int = 1) -> None:
-    """increment_analytics_counts_raw(name: str, increment: int = 1) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def invite_players() -> None:
-    """invite_players() -> None
-
-    (internal)
+    """(internal)
     Category: General Utility Functions
     """
     return None
 
 
 def is_blessed() -> bool:
-    """is_blessed() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_in_replay() -> bool:
-    """is_in_replay() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_log_full() -> bool:
-    """is_log_full() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_os_playing_music() -> bool:
-    """is_os_playing_music() -> bool
-
-    (internal)
+    """(internal)
 
     Tells whether the OS is currently playing music of some sort.
 
@@ -2875,9 +2294,7 @@ def is_os_playing_music() -> bool:
 
 
 def is_ouya_build() -> bool:
-    """is_ouya_build() -> bool
-
-    (internal)
+    """(internal)
 
     Returns whether we're running the ouya-specific version
     """
@@ -2885,41 +2302,27 @@ def is_ouya_build() -> bool:
 
 
 def is_party_icon_visible() -> bool:
-    """is_party_icon_visible() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_running_on_fire_tv() -> bool:
-    """is_running_on_fire_tv() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_running_on_ouya() -> bool:
-    """is_running_on_ouya() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def is_xcode_build() -> bool:
-    """is_xcode_build() -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def lock_all_input() -> None:
-    """lock_all_input() -> None
-
-    (internal)
+    """(internal)
 
     Prevents all keyboard, mouse, and gamepad events from being processed.
     """
@@ -2927,10 +2330,7 @@ def lock_all_input() -> None:
 
 
 def log(message: str, to_stdout: bool = True, to_server: bool = True) -> None:
-    """log(message: str, to_stdout: bool = True,
-        to_server: bool = True) -> None
-
-    Category: General Utility Functions
+    """Category: General Utility Functions
 
     Log a message. This goes to the default logging mechanism depending
     on the platform (stdout on mac, android log on android, etc).
@@ -2946,65 +2346,42 @@ def log(message: str, to_stdout: bool = True, to_server: bool = True) -> None:
 
 
 def mac_music_app_get_library_source() -> None:
-    """mac_music_app_get_library_source() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def mac_music_app_get_playlists() -> list[str]:
-    """mac_music_app_get_playlists() -> list[str]
-
-    (internal)
-    """
+    """(internal)"""
     return ['blah', 'blah2']
 
 
 def mac_music_app_get_volume() -> int:
-    """mac_music_app_get_volume() -> int
-
-    (internal)
-    """
+    """(internal)"""
     return int()
 
 
 def mac_music_app_init() -> None:
-    """mac_music_app_init() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def mac_music_app_play_playlist(playlist: str) -> bool:
-    """mac_music_app_play_playlist(playlist: str) -> bool
-
-    (internal)
-    """
+    """(internal)"""
     return bool()
 
 
 def mac_music_app_set_volume(volume: int) -> None:
-    """mac_music_app_set_volume(volume: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def mac_music_app_stop() -> None:
-    """mac_music_app_stop() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def mark_config_dirty() -> None:
-    """mark_config_dirty() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3012,17 +2389,12 @@ def mark_config_dirty() -> None:
 
 
 def mark_log_sent() -> None:
-    """mark_log_sent() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def music_player_play(files: Any) -> None:
-    """music_player_play(files: Any) -> None
-
-    (internal)
+    """(internal)
 
     Starts internal music file playback (for internal use)
     """
@@ -3030,9 +2402,7 @@ def music_player_play(files: Any) -> None:
 
 
 def music_player_set_volume(volume: float) -> None:
-    """music_player_set_volume(volume: float) -> None
-
-    (internal)
+    """(internal)
 
     Sets internal music player volume (for internal use)
     """
@@ -3040,9 +2410,7 @@ def music_player_set_volume(volume: float) -> None:
 
 
 def music_player_shutdown() -> None:
-    """music_player_shutdown() -> None
-
-    (internal)
+    """(internal)
 
     Finalizes internal music file playback (for internal use)
     """
@@ -3050,9 +2418,7 @@ def music_player_shutdown() -> None:
 
 
 def music_player_stop() -> None:
-    """music_player_stop() -> None
-
-    (internal)
+    """(internal)
 
     Stops internal music file playback (for internal use)
     """
@@ -3061,28 +2427,18 @@ def music_player_stop() -> None:
 
 def new_host_session(sessiontype: type[ba.Session],
                      benchmark_type: str = None) -> None:
-    """new_host_session(sessiontype: type[ba.Session],
-      benchmark_type: str = None) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def new_replay_session(file_name: str) -> None:
-    """new_replay_session(file_name: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def newactivity(activity_type: type[ba.Activity],
                 settings: dict = None) -> ba.Activity:
-    """newactivity(activity_type: type[ba.Activity],
-      settings: dict = None) -> ba.Activity
-
-    Instantiates a ba.Activity given a type object.
+    """Instantiates a ba.Activity given a type object.
 
     Category: General Utility Functions
 
@@ -3098,11 +2454,7 @@ def newnode(type: str,
             attrs: dict = None,
             name: str = None,
             delegate: Any = None) -> Node:
-    """newnode(type: str, owner: ba.Node = None,
-    attrs: dict = None, name: str = None, delegate: Any = None)
-     -> Node
-
-    Add a node of the given type to the game.
+    """Add a node of the given type to the game.
 
     Category: Gameplay Functions
 
@@ -3124,9 +2476,7 @@ def newnode(type: str,
 
 
 def open_dir_externally(path: str) -> None:
-    """open_dir_externally(path: str) -> None
-
-    (internal)
+    """(internal)
 
     Open the provided dir in the default external app.
     """
@@ -3134,9 +2484,7 @@ def open_dir_externally(path: str) -> None:
 
 
 def open_file_externally(path: str) -> None:
-    """open_file_externally(path: str) -> None
-
-    (internal)
+    """(internal)
 
     Open the provided file in the default external app.
     """
@@ -3144,9 +2492,7 @@ def open_file_externally(path: str) -> None:
 
 
 def open_url(address: str) -> None:
-    """open_url(address: str) -> None
-
-    Open a provided URL.
+    """Open a provided URL.
 
     Category: General Utility Functions
 
@@ -3160,10 +2506,7 @@ def playsound(sound: Sound,
               volume: float = 1.0,
               position: Sequence[float] = None,
               host_only: bool = False) -> None:
-    """playsound(sound: Sound, volume: float = 1.0,
-      position: Sequence[float] = None, host_only: bool = False) -> None
-
-    Play a ba.Sound a single time.
+    """Play a ba.Sound a single time.
 
     Category: Gameplay Functions
 
@@ -3174,17 +2517,12 @@ def playsound(sound: Sound,
 
 
 def power_ranking_query(callback: Callable, season: Any = None) -> None:
-    """power_ranking_query(callback: Callable, season: Any = None) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def print_context() -> None:
-    """print_context() -> None
-
-    (internal)
+    """(internal)
 
     Prints info about the current context state; for debugging.
     """
@@ -3192,9 +2530,7 @@ def print_context() -> None:
 
 
 def print_load_info() -> None:
-    """print_load_info() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3202,25 +2538,17 @@ def print_load_info() -> None:
 
 
 def print_stderr(message: str) -> None:
-    """print_stderr(message: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def print_stdout(message: str) -> None:
-    """print_stdout(message: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def printnodes() -> None:
-    """printnodes() -> None
-
-    Print various info about existing nodes; useful for debugging.
+    """Print various info about existing nodes; useful for debugging.
 
     Category: Gameplay Functions
     """
@@ -3228,9 +2556,7 @@ def printnodes() -> None:
 
 
 def printobjects() -> None:
-    """printobjects() -> None
-
-    Print debugging info about game objects.
+    """Print debugging info about game objects.
 
     Category: General Utility Functions
 
@@ -3241,20 +2567,14 @@ def printobjects() -> None:
 
 
 def purchase(item: str) -> None:
-    """purchase(item: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def pushcall(call: Callable,
              from_other_thread: bool = False,
              suppress_other_thread_warning: bool = False) -> None:
-    """pushcall(call: Callable, from_other_thread: bool = False,
-         suppress_other_thread_warning: bool = False ) -> None
-
-    Pushes a call onto the event loop to be run during the next cycle.
+    """Pushes a call onto the event loop to be run during the next cycle.
 
     Category: General Utility Functions
 
@@ -3272,9 +2592,7 @@ def pushcall(call: Callable,
 
 
 def quit(soft: bool = False, back: bool = False) -> None:
-    """quit(soft: bool = False, back: bool = False) -> None
-
-    Quit the game.
+    """Quit the game.
 
     Category: General Utility Functions
 
@@ -3285,25 +2603,17 @@ def quit(soft: bool = False, back: bool = False) -> None:
 
 
 def register_activity(activity: ba.Activity) -> ActivityData:
-    """register_activity(activity: ba.Activity) -> ActivityData
-
-    (internal)
-    """
+    """(internal)"""
     return ActivityData()
 
 
 def register_session(session: ba.Session) -> SessionData:
-    """register_session(session: ba.Session) -> SessionData
-
-    (internal)
-    """
+    """(internal)"""
     return SessionData()
 
 
 def release_gamepad_input() -> None:
-    """release_gamepad_input() -> None
-
-    (internal)
+    """(internal)
 
     Resumes normal gamepad event processing.
     """
@@ -3311,9 +2621,7 @@ def release_gamepad_input() -> None:
 
 
 def release_keyboard_input() -> None:
-    """release_keyboard_input() -> None
-
-    (internal)
+    """(internal)
 
     Resumes normal keyboard event processing.
     """
@@ -3321,9 +2629,7 @@ def release_keyboard_input() -> None:
 
 
 def reload_media() -> None:
-    """reload_media() -> None
-
-    (internal)
+    """(internal)
 
     Reload all currently loaded game media; useful for
     development/debugging.
@@ -3332,59 +2638,37 @@ def reload_media() -> None:
 
 
 def report_achievement(achievement: str, pass_to_account: bool = True) -> None:
-    """report_achievement(achievement: str, pass_to_account: bool = True)
-      -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def request_permission(permission: ba.Permission) -> None:
-    """request_permission(permission: ba.Permission) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def reset_achievements() -> None:
-    """reset_achievements() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def reset_game_activity_tracking() -> None:
-    """reset_game_activity_tracking() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def reset_random_player_names() -> None:
-    """reset_random_player_names() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def resolve_appconfig_value(key: str) -> Any:
-    """resolve_appconfig_value(key: str) -> Any
-
-    (internal)
-    """
+    """(internal)"""
     return _uninferrable()
 
 
 def restore_purchases() -> None:
-    """restore_purchases() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
@@ -3398,16 +2682,7 @@ def rowwidget(edit: ba.Widget = None,
               claims_left_right: bool = None,
               claims_tab: bool = None,
               selection_loops_to_parent: bool = None) -> ba.Widget:
-    """rowwidget(edit: ba.Widget = None, parent: ba.Widget = None,
-      size: Sequence[float] = None,
-      position: Sequence[float] = None,
-      background: bool = None, selected_child: ba.Widget = None,
-      visible_child: ba.Widget = None,
-      claims_left_right: bool = None,
-      claims_tab: bool = None,
-      selection_loops_to_parent: bool = None) -> ba.Widget
-
-    Create or edit a row widget.
+    """Create or edit a row widget.
 
     Category: User Interface Functions
 
@@ -3420,19 +2695,13 @@ def rowwidget(edit: ba.Widget = None,
 
 
 def run_transactions() -> None:
-    """run_transactions() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def safecolor(color: Sequence[float],
               target_intensity: float = 0.6) -> tuple[float, ...]:
-    """safecolor(color: Sequence[float], target_intensity: float = 0.6)
-      -> tuple[float, ...]
-
-    Given a color tuple, return a color safe to display as text.
+    """Given a color tuple, return a color safe to display as text.
 
     Category: General Utility Functions
 
@@ -3449,12 +2718,7 @@ def screenmessage(message: Union[str, ba.Lstr],
                   log: bool = False,
                   clients: Sequence[int] = None,
                   transient: bool = False) -> None:
-    """screenmessage(message: Union[str, ba.Lstr],
-      color: Sequence[float] = None, top: bool = False,
-      image: dict[str, Any] = None, log: bool = False,
-      clients: Sequence[int] = None, transient: bool = False) -> None
-
-    Print a message to the local client's screen, in a given color.
+    """Print a message to the local client's screen, in a given color.
 
     Category: General Utility Functions
 
@@ -3489,20 +2753,7 @@ def scrollwidget(edit: ba.Widget = None,
                  claims_up_down: bool = None,
                  claims_tab: bool = None,
                  autoselect: bool = None) -> ba.Widget:
-    """scrollwidget(edit: ba.Widget = None, parent: ba.Widget = None,
-      size: Sequence[float] = None, position: Sequence[float] = None,
-      background: bool = None, selected_child: ba.Widget = None,
-      capture_arrows: bool = False, on_select_call: Callable = None,
-      center_small_content: bool = None, color: Sequence[float] = None,
-      highlight: bool = None, border_opacity: float = None,
-      simple_culling_v: float = None,
-      selection_loops_to_parent: bool = None,
-      claims_left_right: bool = None,
-      claims_up_down: bool = None,
-      claims_tab: bool = None,
-      autoselect: bool = None) -> ba.Widget
-
-    Create or edit a scroll widget.
+    """Create or edit a scroll widget.
 
     Category: User Interface Functions
 
@@ -3515,17 +2766,12 @@ def scrollwidget(edit: ba.Widget = None,
 
 
 def set_admins(admins: list[str]) -> None:
-    """set_admins(admins: list[str]) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_analytics_screen(screen: str) -> None:
-    """set_analytics_screen(screen: str) -> None
-
-    Used for analytics to see where in the app players spend their time.
+    """Used for analytics to see where in the app players spend their time.
 
     Category: General Utility Functions
 
@@ -3537,17 +2783,12 @@ def set_analytics_screen(screen: str) -> None:
 
 
 def set_authenticate_clients(enable: bool) -> None:
-    """set_authenticate_clients(enable: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_camera_manual(value: bool) -> None:
-    """set_camera_manual(value: bool) -> None
-
-    (internal)
+    """(internal)
 
     WARNING: these camera controls will not apply to network clients
     and may behave unpredictably in other ways. Use them only for
@@ -3557,9 +2798,7 @@ def set_camera_manual(value: bool) -> None:
 
 
 def set_camera_position(x: float, y: float, z: float) -> None:
-    """set_camera_position(x: float, y: float, z: float) -> None
-
-    (internal)
+    """(internal)
 
     WARNING: these camera controls will not apply to network clients
     and may behave unpredictably in other ways. Use them only for
@@ -3569,9 +2808,7 @@ def set_camera_position(x: float, y: float, z: float) -> None:
 
 
 def set_camera_target(x: float, y: float, z: float) -> None:
-    """set_camera_target(x: float, y: float, z: float) -> None
-
-    (internal)
+    """(internal)
 
     WARNING: these camera controls will not apply to network clients
     and may behave unpredictably in other ways. Use them only for
@@ -3581,9 +2818,7 @@ def set_camera_target(x: float, y: float, z: float) -> None:
 
 
 def set_debug_speed_exponent(speed: int) -> None:
-    """set_debug_speed_exponent(speed: int) -> None
-
-    (internal)
+    """(internal)
 
     Sets the debug speed scale for the game. Actual speed is pow(2,speed).
     """
@@ -3591,46 +2826,30 @@ def set_debug_speed_exponent(speed: int) -> None:
 
 
 def set_enable_default_kick_voting(enable: bool) -> None:
-    """set_enable_default_kick_voting(enable: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_have_mods(have_mods: bool) -> None:
-    """set_have_mods(have_mods: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_internal_language_keys(
         listobj: list[tuple[str, str]],
         random_names_list: list[tuple[str, str]]) -> None:
-    """set_internal_language_keys(listobj: list[tuple[str, str]],
-      random_names_list: list[tuple[str, str]]) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_low_level_config_value(key: str, value: int) -> None:
-    """set_low_level_config_value(key: str, value: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_map_bounds(
         bounds: tuple[float, float, float, float, float, float]) -> None:
-    """set_map_bounds(bounds: tuple[float, float, float, float, float, float])
-      -> None
-
-    (internal)
+    """(internal)
 
     Set map bounds. Generally nodes that go outside of this box are killed.
     """
@@ -3638,73 +2857,47 @@ def set_map_bounds(
 
 
 def set_master_server_source(source: int) -> None:
-    """set_master_server_source(source: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_party_icon_always_visible(value: bool) -> None:
-    """set_party_icon_always_visible(value: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_party_window_open(value: bool) -> None:
-    """set_party_window_open(value: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_platform_misc_read_vals(mode: str) -> None:
-    """set_platform_misc_read_vals(mode: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_public_party_enabled(enabled: bool) -> None:
-    """set_public_party_enabled(enabled: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_public_party_max_size(max_size: int) -> None:
-    """set_public_party_max_size(max_size: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_public_party_name(name: str) -> None:
-    """set_public_party_name(name: str) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_public_party_stats_url(url: Optional[str]) -> None:
-    """set_public_party_stats_url(url: Optional[str]) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_replay_speed_exponent(speed: int) -> None:
-    """set_replay_speed_exponent(speed: int) -> None
-
-    (internal)
+    """(internal)
 
     Set replay speed. Actual displayed speed is pow(2, speed).
     """
@@ -3712,26 +2905,17 @@ def set_replay_speed_exponent(speed: int) -> None:
 
 
 def set_stress_testing(testing: bool, player_count: int) -> None:
-    """set_stress_testing(testing: bool, player_count: int) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_telnet_access_enabled(enable: bool) -> None:
-    """set_telnet_access_enabled(enable: bool)
-     -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_thread_name(name: str) -> None:
-    """set_thread_name(name: str) -> None
-
-    (internal)
+    """(internal)
 
     Sets the name of the current thread (on platforms where this is
     available). Thread names are only for debugging and should not be
@@ -3741,17 +2925,12 @@ def set_thread_name(name: str) -> None:
 
 
 def set_touchscreen_editing(editing: bool) -> None:
-    """set_touchscreen_editing(editing: bool) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def set_ui_input_device(input_device: Optional[ba.InputDevice]) -> None:
-    """set_ui_input_device(input_device: Optional[ba.InputDevice]) -> None
-
-    (internal)
+    """(internal)
 
     Sets the input-device that currently owns the user interface.
     """
@@ -3759,41 +2938,25 @@ def set_ui_input_device(input_device: Optional[ba.InputDevice]) -> None:
 
 
 def setup_sigint() -> None:
-    """setup_sigint() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def show_ad(purpose: str,
             on_completion_call: Callable[[], None] = None) -> None:
-    """show_ad(purpose: str, on_completion_call: Callable[[], None] = None)
-     -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def show_ad_2(purpose: str,
               on_completion_call: Callable[[bool], None] = None) -> None:
-    """show_ad_2(purpose: str,
-     on_completion_call: Callable[[bool], None] = None)
-     -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def show_app_invite(title: Union[str, ba.Lstr], message: Union[str, ba.Lstr],
                     code: str) -> None:
-    """show_app_invite(title: Union[str, ba.Lstr],
-      message: Union[str, ba.Lstr],
-      code: str) -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3801,9 +2964,7 @@ def show_app_invite(title: Union[str, ba.Lstr], message: Union[str, ba.Lstr],
 
 
 def show_invites_ui() -> None:
-    """show_invites_ui() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3813,18 +2974,12 @@ def show_invites_ui() -> None:
 def show_online_score_ui(show: str = 'general',
                          game: str = None,
                          game_version: str = None) -> None:
-    """show_online_score_ui(show: str = 'general', game: str = None,
-      game_version: str = None) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def show_progress_bar() -> None:
-    """show_progress_bar() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3832,9 +2987,7 @@ def show_progress_bar() -> None:
 
 
 def sign_in(account_type: str) -> None:
-    """sign_in(account_type: str) -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3842,9 +2995,7 @@ def sign_in(account_type: str) -> None:
 
 
 def sign_out() -> None:
-    """sign_out() -> None
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
     """
@@ -3852,9 +3003,7 @@ def sign_out() -> None:
 
 
 def start_listening_for_wii_remotes() -> None:
-    """start_listening_for_wii_remotes() -> None
-
-    (internal)
+    """(internal)
 
     Start listening for connections from wii remotes.
     """
@@ -3862,9 +3011,7 @@ def start_listening_for_wii_remotes() -> None:
 
 
 def stop_listening_for_wii_remotes() -> None:
-    """stop_listening_for_wii_remotes() -> None
-
-    (internal)
+    """(internal)
 
     Stop listening for connections from wii remotes.
     """
@@ -3872,10 +3019,7 @@ def stop_listening_for_wii_remotes() -> None:
 
 
 def submit_analytics_counts() -> None:
-    """submit_analytics_counts() -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
@@ -3890,14 +3034,7 @@ def submit_score(game: str,
                  score_type: str = 'points',
                  campaign: Optional[str] = None,
                  level: Optional[str] = None) -> None:
-    """submit_score(game: str, config: str, name: Any, score: Optional[int],
-      callback: Callable, friend_callback: Optional[Callable],
-      order: str = 'increasing', tournament_id: Optional[str] = None,
-      score_type: str = 'points',
-      campaign: Optional[str] = None,
-      level: Optional[str] = None)  -> None
-
-    (internal)
+    """(internal)
 
     Submit a score to the server; callback will be called with the results.
     As a courtesy, please don't send fake scores to the server. I'd prefer
@@ -3942,27 +3079,7 @@ def textwidget(edit: ba.Widget = None,
                big: bool = None,
                extra_touch_border_scale: float = None,
                res_scale: float = None) -> Widget:
-    """textwidget(edit: ba.Widget = None, parent: ba.Widget = None,
-      size: Sequence[float] = None, position: Sequence[float] = None,
-      text: Union[str, ba.Lstr] = None, v_align: str = None,
-      h_align: str = None, editable: bool = None, padding: float = None,
-      on_return_press_call: Callable[[], None] = None,
-      on_activate_call: Callable[[], None] = None,
-      selectable: bool = None, query: ba.Widget = None, max_chars: int = None,
-      color: Sequence[float] = None, click_activate: bool = None,
-      on_select_call: Callable[[], None] = None,
-      always_highlight: bool = None, draw_controller: ba.Widget = None,
-      scale: float = None, corner_scale: float = None,
-      description: Union[str, ba.Lstr] = None,
-      transition_delay: float = None, maxwidth: float = None,
-      max_height: float = None, flatness: float = None,
-      shadow: float = None, autoselect: bool = None, rotate: float = None,
-      enabled: bool = None, force_internal_editing: bool = None,
-      always_show_carat: bool = None, big: bool = None,
-      extra_touch_border_scale: float = None, res_scale: float = None)
-      -> Widget
-
-    Create or edit a text widget.
+    """Create or edit a text widget.
 
     Category: User Interface Functions
 
@@ -3999,11 +3116,7 @@ def time(timetype: ba.TimeType,
 
 def time(timetype: ba.TimeType = TimeType.SIM,
          timeformat: ba.TimeFormat = TimeFormat.SECONDS) -> Any:
-    """time(timetype: ba.TimeType = TimeType.SIM,
-      timeformat: ba.TimeFormat = TimeFormat.SECONDS)
-      -> <varies>
-
-    Return the current time.
+    """Return the current time.
 
     Category: General Utility Functions
 
@@ -4039,10 +3152,7 @@ def time(timetype: ba.TimeType = TimeType.SIM,
 
 def time_format_check(time_format: ba.TimeFormat, length: Union[float,
                                                                 int]) -> None:
-    """time_format_check(time_format: ba.TimeFormat, length: Union[float, int])
-      -> None
-
-    (internal)
+    """(internal)
 
     Logs suspicious time values for timers or animate calls.
 
@@ -4058,13 +3168,7 @@ def timer(time: float,
           timetype: ba.TimeType = TimeType.SIM,
           timeformat: ba.TimeFormat = TimeFormat.SECONDS,
           suppress_format_warning: bool = False) -> None:
-    """timer(time: float, call: Callable[[], Any], repeat: bool = False,
-      timetype: ba.TimeType = TimeType.SIM,
-      timeformat: ba.TimeFormat = TimeFormat.SECONDS,
-      suppress_format_warning: bool = False)
-     -> None
-
-    Schedule a call to run at a later point in time.
+    """Schedule a call to run at a later point in time.
 
     Category: General Utility Functions
 
@@ -4125,18 +3229,12 @@ def timer(time: float,
 
 def tournament_query(callback: Callable[[Optional[dict]], None],
                      args: dict) -> None:
-    """tournament_query(callback: Callable[[Optional[dict]], None],
-      args: dict) -> None
-
-    (internal)
-    """
+    """(internal)"""
     return None
 
 
 def uibounds() -> tuple[float, float, float, float]:
-    """uibounds() -> tuple[float, float, float, float]
-
-    (internal)
+    """(internal)
 
     Returns a tuple of 4 values: (x-min, x-max, y-min, y-max) representing
     the range of values that can be plugged into a root level
@@ -4147,9 +3245,7 @@ def uibounds() -> tuple[float, float, float, float]:
 
 
 def unlock_all_input() -> None:
-    """unlock_all_input() -> None
-
-    (internal)
+    """(internal)
 
     Resumes normal keyboard, mouse, and gamepad event processing.
     """
@@ -4159,11 +3255,7 @@ def unlock_all_input() -> None:
 def value_test(arg: str,
                change: float = None,
                absolute: float = None) -> float:
-    """value_test(arg: str, change: float = None, absolute: float = None)
-      -> float
-
-    (internal)
-    """
+    """(internal)"""
     return float()
 
 
@@ -4177,13 +3269,7 @@ def widget(edit: ba.Widget = None,
            show_buffer_left: float = None,
            show_buffer_right: float = None,
            autoselect: bool = None) -> None:
-    """widget(edit: ba.Widget = None, up_widget: ba.Widget = None,
-      down_widget: ba.Widget = None, left_widget: ba.Widget = None,
-      right_widget: ba.Widget = None, show_buffer_top: float = None,
-      show_buffer_bottom: float = None, show_buffer_left: float = None,
-      show_buffer_right: float = None, autoselect: bool = None) -> None
-
-    Edit common attributes of any widget.
+    """Edit common attributes of any widget.
 
     Category: User Interface Functions
 
diff --git a/src/ballistica/python/class/python_class_input_device.cc b/src/ballistica/python/class/python_class_input_device.cc
index c6840e7c..d4c46d91 100644
--- a/src/ballistica/python/class/python_class_input_device.cc
+++ b/src/ballistica/python/class/python_class_input_device.cc
@@ -417,7 +417,8 @@ PyMethodDef PythonClassInputDevice::tp_methods[] = {
     {"exists", (PyCFunction)Exists, METH_NOARGS,
      "exists() -> bool\n"
      "\n"
-     "Return whether the underlying device for this object is still present."},
+     "Return whether the underlying device for this object is\n"
+     "still present.\n"},
     {"get_button_name", (PyCFunction)GetButtonName,
      METH_VARARGS | METH_KEYWORDS,  // NOLINT (signed bitwise ops)
      "get_button_name(button_id: int) -> ba.Lstr\n"
diff --git a/src/ballistica/python/class/python_class_node.cc b/src/ballistica/python/class/python_class_node.cc
index a1f69cbf..0479ad15 100644
--- a/src/ballistica/python/class/python_class_node.cc
+++ b/src/ballistica/python/class/python_class_node.cc
@@ -404,7 +404,8 @@ PyMethodDef PythonClassNode::tp_methods[] = {
     {"getdelegate", (PyCFunction)GetDelegate, METH_VARARGS | METH_KEYWORDS,
      "getdelegate(type: type, doraise: bool = False) -> <varies>\n"
      "\n"
-     "Return the node's current delegate object if it matches a certain type.\n"
+     "Return the node's current delegate object if it matches\n"
+     "a certain type.\n"
      "\n"
      "If the node has no delegate or it is not an instance of the passed\n"
      "type, then None will be returned. If 'doraise' is True, then an\n"
@@ -437,12 +438,12 @@ PyMethodDef PythonClassNode::tp_methods[] = {
     {"connectattr", (PyCFunction)ConnectAttr, METH_VARARGS,
      "connectattr(srcattr: str, dstnode: Node, dstattr: str) -> None\n"
      "\n"
-     "Connect one of this node's attributes to an attribute on another node.\n"
-     "This will immediately set the target attribute's value to that of the\n"
-     "source attribute, and will continue to do so once per step as long as\n"
-     "the two nodes exist. The connection can be severed by setting the\n"
-     "target attribute to any value or connecting another node attribute\n"
-     "to it.\n"
+     "Connect one of this node's attributes to an attribute on another\n"
+     "node. This will immediately set the target attribute's value to that\n"
+     "of the source attribute, and will continue to do so once per step\n"
+     "as long as the two nodes exist. The connection can be severed by\n"
+     "setting the target attribute to any value or connecting another\n"
+     "node attribute to it.\n"
      "\n"
      "Example:\n"
      "    Create a locator and attach a light to it:\n"
diff --git a/src/ballistica/python/class/python_class_session_player.cc b/src/ballistica/python/class/python_class_session_player.cc
index 25d549e1..dec924be 100644
--- a/src/ballistica/python/class/python_class_session_player.cc
+++ b/src/ballistica/python/class/python_class_session_player.cc
@@ -733,7 +733,8 @@ PyMethodDef PythonClassSessionPlayer::tp_methods[] = {
     {"get_icon", (PyCFunction)GetIcon, METH_NOARGS,
      "get_icon() -> dict[str, Any]\n"
      "\n"
-     "Returns the character's icon (images, colors, etc contained in a dict)"},
+     "Returns the character's icon (images, colors, etc contained\n"
+     "in a dict."},
     {"get_icon_info", (PyCFunction)GetIconInfo, METH_NOARGS,
      "get_icon_info() -> dict[str, Any]\n"
      "\n"
diff --git a/src/ballistica/python/class/python_class_widget.cc b/src/ballistica/python/class/python_class_widget.cc
index 5f834091..c9c3a1e8 100644
--- a/src/ballistica/python/class/python_class_widget.cc
+++ b/src/ballistica/python/class/python_class_widget.cc
@@ -260,9 +260,9 @@ PyMethodDef PythonClassWidget::tp_methods[] = {
     {"get_widget_type", (PyCFunction)GetWidgetType, METH_NOARGS,
      "get_widget_type() -> str\n"
      "\n"
-     "Return the internal type of the Widget as a string.  Note that this is\n"
-     "different from the Python ba.Widget type, which is the same for all\n"
-     "widgets."},
+     "Return the internal type of the Widget as a string. Note that this\n"
+     "is different from the Python ba.Widget type, which is the same for\n"
+     "all widgets."},
     {"activate", (PyCFunction)Activate, METH_NOARGS,
      "activate() -> None\n"
      "\n"
@@ -274,9 +274,9 @@ PyMethodDef PythonClassWidget::tp_methods[] = {
     {"get_screen_space_center", (PyCFunction)GetScreenSpaceCenter, METH_NOARGS,
      "get_screen_space_center() -> tuple[float, float]\n"
      "\n"
-     "Returns the coords of the Widget center relative to the center of the\n"
-     "screen. This can be useful for placing pop-up windows and other special\n"
-     "cases."},
+     "Returns the coords of the ba.Widget center relative to the center\n"
+     "of the screen. This can be useful for placing pop-up windows and other\n"
+     "special cases."},
     {"get_selected_child", (PyCFunction)GetSelectedChild, METH_NOARGS,
      "get_selected_child() -> Optional[ba.Widget]\n"
      "\n"
@@ -285,8 +285,8 @@ PyMethodDef PythonClassWidget::tp_methods[] = {
     {"delete", (PyCFunction)Delete, METH_VARARGS | METH_KEYWORDS,
      "delete(ignore_missing: bool = True) -> None\n"
      "\n"
-     "Delete the Widget.  Ignores already-deleted Widgets if ignore_missing\n"
-     "  is True; otherwise an Exception is thrown."},
+     "Delete the Widget. Ignores already-deleted Widgets if ignore_missing\n"
+     "is True; otherwise an Exception is thrown."},
     {"add_delete_callback", (PyCFunction)AddDeleteCallback,
      METH_VARARGS | METH_KEYWORDS,  // NOLINT (signed bitwise stuff)
      "add_delete_callback(call: Callable) -> None\n"
diff --git a/tools/batools/dummymodule.py b/tools/batools/dummymodule.py
index 786e2fe1..1ac9cba3 100755
--- a/tools/batools/dummymodule.py
+++ b/tools/batools/dummymodule.py
@@ -21,7 +21,7 @@ from efrotools import get_files_hash
 
 if TYPE_CHECKING:
     from types import ModuleType
-    from typing import Sequence, Any
+    from typing import Sequence, Any, Optional
     from batools.docs import AttributeInfo
 
 
@@ -252,7 +252,7 @@ def _writefuncs(parent: Any, funcnames: Sequence[str], indent: int,
                     f'unknown returns value: {returns} for {funcname}')
         returnspc = indstr + '    '
         returnstr = ('\n' + returnspc).join(returnstr.strip().splitlines())
-        docstr_out = _formatdoc(docstr, indent + 4)
+        docstr_out = _formatdoc(docstr, indent + 4, funcname=funcname)
         out += spcstr + defsline + docstr_out + f'{returnspc}{returnstr}\n'
     return out
 
@@ -470,10 +470,20 @@ def _special_class_cases(classname: str) -> str:
     return out
 
 
-def _formatdoc(docstr: str, indent: int) -> str:
+def _formatdoc(docstr: str,
+               indent: int,
+               funcname: Optional[str] = None) -> str:
     out = ''
     indentstr = indent * ' '
     docslines = docstr.splitlines()
+
+    if (funcname and docslines and docslines[0]
+            and docslines[0].startswith(funcname)):
+        # Remove this signature from python docstring
+        # as not to repeat ourselves.
+        _, docstr = docstr.split('\n\n', maxsplit=1)
+        docslines = docstr.splitlines()
+
     if len(docslines) == 1:
         out += '\n' + indentstr + '"""' + docslines[0] + '"""\n'
     else:
@@ -503,7 +513,8 @@ def _writeclasses(module: ModuleType, classnames: Sequence[str]) -> str:
             out += f'class {classname}:\n'
 
         docstr = cls.__doc__
-        out += _formatdoc(docstr, 4)
+        # classname is constructor name
+        out += _formatdoc(docstr, 4, funcname=classname)
 
         # Create a public constructor if it has one.
         # If the first docs line appears to be a function signature

From ad8a6bc25e002a73bd216fc760261ca5a71c45a8 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Sat, 12 Feb 2022 22:55:59 +0300
Subject: [PATCH 11/21] add pdoc to requirements

---
 tools/batools/build.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/batools/build.py b/tools/batools/build.py
index 8158c662..ddb8f3c7 100644
--- a/tools/batools/build.py
+++ b/tools/batools/build.py
@@ -40,6 +40,7 @@ PIP_REQUIREMENTS = [
     PipRequirement(modulename='ansiwrap'),
     PipRequirement(modulename='yaml', pipname='PyYAML'),
     PipRequirement(modulename='requests'),
+    PipRequirement(modulename='pdoc'),
     PipRequirement(pipname='typing_extensions', minversion=[4, 0, 1]),
     PipRequirement(pipname='types-filelock', minversion=[3, 2, 5]),
     PipRequirement(pipname='types-requests', minversion=[2, 27, 7]),

From e9eda4a6b39705b8871ad459a6c38727950b1520 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Sat, 12 Feb 2022 23:27:37 +0300
Subject: [PATCH 12/21] more prereqs stuff

---
 config/toolconfigsrc/mypy.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/toolconfigsrc/mypy.ini b/config/toolconfigsrc/mypy.ini
index 1e385f3d..066aed9e 100644
--- a/config/toolconfigsrc/mypy.ini
+++ b/config/toolconfigsrc/mypy.ini
@@ -37,4 +37,5 @@ ignore_missing_imports = True
 [mypy-efrotools.pylintplugins]
 disallow_any_unimported = False
 
-
+[mypy-pdoc]
+ignore_missing_imports = True

From 93c5edc2a5ab1a45cb9950baa83c92e78eebd3e1 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Sat, 12 Feb 2022 23:35:12 +0300
Subject: [PATCH 13/21] more prereqs stuff

---
 config/config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/config.json b/config/config.json
index 0a17a714..21f2ca23 100644
--- a/config/config.json
+++ b/config/config.json
@@ -33,7 +33,8 @@
     "cpplint",
     "ansiwrap",
     "filelock",
-    "Cocoa"
+    "Cocoa",
+    "pdoc"
   ],
   "python_paths": [
     "assets/src/ba_data/python",

From b8648c5f3365497f1ccf4647489879749e1a5bf8 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Mon, 14 Feb 2022 22:11:40 +0300
Subject: [PATCH 14/21] more docs generation work

---
 .idea/dictionaries/roman.xml                  |   1 +
 assets/src/ba_data/python/._ba_sources_hash   |   2 +-
 assets/src/ba_data/python/_ba.py              | 741 +++++++++---------
 assets/src/ba_data/python/ba/__init__.py      |   7 +-
 assets/src/ba_data/python/ba/_activity.py     | 115 ++-
 assets/src/ba_data/python/ba/_actor.py        |  18 +-
 assets/src/ba_data/python/ba/_general.py      |   8 +
 assets/src/ba_data/python/ba/_keyboard.py     |  16 +-
 assets/src/ba_data/python/ba/_language.py     |   6 +
 assets/src/ba_data/python/ba/_player.py       |   9 +-
 assets/src/ba_data/python/ba/_score.py        |  32 +-
 assets/src/ba_data/python/ba/_session.py      |  80 +-
 assets/src/ba_data/python/ba/_stats.py        |   9 +-
 assets/src/pdoc/templates/module.html.jinja2  |  20 +
 .../class/python_class_collide_model.cc       |   4 +-
 .../python/class/python_class_context.cc      |  57 +-
 .../python/class/python_class_context_call.cc |  31 +-
 .../python/class/python_class_data.cc         |   4 +-
 .../python/class/python_class_input_device.cc |   2 +-
 .../python/class/python_class_material.cc     | 240 +++---
 .../python/class/python_class_model.cc        |   2 +-
 .../python/class/python_class_node.cc         |  20 +-
 .../class/python_class_session_player.cc      |   6 +-
 .../python/class/python_class_sound.cc        |   4 +-
 .../python/class/python_class_texture.cc      |   2 +-
 .../python/class/python_class_timer.cc        |  43 +-
 .../python/class/python_class_vec3.cc         |   2 +-
 .../python/class/python_class_widget.cc       |   6 +-
 .../python/methods/python_methods_app.cc      |  91 +--
 .../python/methods/python_methods_gameplay.cc |  16 +-
 .../python/methods/python_methods_graphics.cc |   4 +-
 .../python/methods/python_methods_media.cc    |  10 +-
 .../python/methods/python_methods_system.cc   |  32 +-
 .../python/methods/python_methods_ui.cc       |  28 +-
 tools/batools/docs.py                         |  16 +-
 tools/batools/dummymodule.py                  |  57 +-
 36 files changed, 869 insertions(+), 872 deletions(-)
 create mode 100644 assets/src/pdoc/templates/module.html.jinja2

diff --git a/.idea/dictionaries/roman.xml b/.idea/dictionaries/roman.xml
index 941fd83d..416dd53f 100644
--- a/.idea/dictionaries/roman.xml
+++ b/.idea/dictionaries/roman.xml
@@ -6,6 +6,7 @@
       <w>outdirname</w>
       <w>pagename</w>
       <w>pythondir</w>
+      <w>templatesdir</w>
       <w>unhashable</w>
     </words>
   </dictionary>
diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 1b6ebb63..63f57868 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-191473689765959071642564573343309028448
\ No newline at end of file
+93799056966445196696254000169758935495
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index 811ac366..a5eed344 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -77,9 +77,9 @@ class ActivityData:
 class CollideModel:
     """A reference to a collide-model.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
 
-    Use ba.getcollidemodel() to instantiate one.
+    Use ba.getcollidemodel to instantiate one.
     """
     pass
 
@@ -87,7 +87,7 @@ class CollideModel:
 class Context:
     """A game context state.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     Many operations such as ba.newnode or ba.gettexture operate
     implicitly on the current context. Each ba.Activity has its own
@@ -98,45 +98,43 @@ class Context:
     since timers and other callbacks will take care of saving and
     restoring the context automatically, but there may be rare cases where
     you need to deal with them, such as when loading media in for use in
-    the UI (there is a special 'ui' context for all user-interface-related
-    functionality)
+    the UI (there is a special `'ui'` context for all
+    user-interface-related functionality).
 
-    When instantiating a ba.Context instance, a single ``'source'`` argument
+    When instantiating a ba.Context instance, a single `'source'` argument
     is passed, which can be one of the following strings/objects:
 
-    ``'empty'``:
-      Gives an empty context; it can be handy to run code here to ensure
-      it does no loading of media, creation of nodes, etc.
+    `'empty'`:
+    > Gives an empty context; it can be handy to run code here to ensure
+    it does no loading of media, creation of nodes, etc.
 
-    ``'current'``:
-      Sets the context object to the current context.
+    ###### `'current'`
+    > Sets the context object to the current context.
 
-    ``'ui'``:
-      Sets to the UI context. UI functions as well as loading of media to
-      be used in said functions must happen in the UI context.
+    ###### `'ui'`
+    > Sets to the UI context. UI functions as well as loading of media to
+    be used in said functions must happen in the UI context.
 
-    A ba.Activity instance:
-      Gives the context for the provided ba.Activity.
+    ###### A ba.Activity instance
+    > Gives the context for the provided ba.Activity.
       Most all code run during a game happens in an Activity's Context.
 
-    A ba.Session instance:
-      Gives the context for the provided ba.Session.
-      Generally a user should not need to run anything here.
+    ###### A ba.Session instance
+    > Gives the context for the provided ba.Session.
+    Generally a user should not need to run anything here.
 
 
-    Usage:
-        Contexts are generally used with the python 'with' statement, which
-        sets the context as current on entry and resets it to the previous
-        value on exit.
+    ##### Usage
+    Contexts are generally used with the python 'with' statement, which
+    sets the context as current on entry and resets it to the previous
+    value on exit.
 
-    Example:
-        Load a few textures into the UI context
-        (for use in widgets, etc):
-        ```python
-        >>> with ba.Context('ui'):
-        ...     tex1 = ba.gettexture('foo_tex_1')
-        ...     tex2 = ba.gettexture('foo_tex_2')
-        ```
+    ##### Example
+    Load a few textures into the UI context
+    (for use in widgets, etc):
+    >>> with ba.Context('ui'):
+    ...     tex1 = ba.gettexture('foo_tex_1')
+    ...     tex2 = ba.gettexture('foo_tex_2')
     """
 
     def __init__(self, source: Any):
@@ -154,7 +152,7 @@ class Context:
 class ContextCall:
     """A context-preserving callable.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     A ContextCall wraps a callable object along with a reference
     to the current context (see ba.Context); it handles restoring the
@@ -176,21 +174,20 @@ class ContextCall:
     shutdown, whereas ba.WeakCall simply looks at whether the target
     object still exists.
 
-    Examples:
-        Example A: code like this can inadvertently prevent our activity
-        (self) from ending until the operation completes, since the bound
-        method we're passing (self.dosomething) contains a strong-reference
-        to self).
-        >>> start_some_long_action(callback_when_done=self.dosomething)
+    ##### Examples
+    **Example A:** code like this can inadvertently prevent our activity
+    (self) from ending until the operation completes, since the bound
+    method we're passing (self.dosomething) contains a strong-reference
+    to self).
+    >>> start_some_long_action(callback_when_done=self.dosomething)
 
-        Example B: in this case our activity (self) can still die
-        properly; the callback will clear itself when the activity starts
-        shutting down, becoming a harmless no-op and releasing the reference
-        to our activity.
-        ```python
-        >>> start_long_action(
-        ...     callback_when_done=ba.ContextCall(self.mycallback))
-        ```
+    **Example B:** in this case our activity (self) can still die
+    properly; the callback will clear itself when the activity starts
+    shutting down, becoming a harmless no-op and releasing the reference
+    to our activity.
+
+    >>> start_long_action(
+    ...     callback_when_done=ba.ContextCall(self.mycallback))
     """
 
     def __init__(self, call: Callable):
@@ -200,9 +197,9 @@ class ContextCall:
 class Data:
     """A reference to a data object.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
 
-    Use ba.getdata() to instantiate one.
+    Use ba.getdata to instantiate one.
     """
 
     def getvalue(self) -> Any:
@@ -220,59 +217,45 @@ class Data:
 class InputDevice:
     """An input-device such as a gamepad, touchscreen, or keyboard.
 
-    Category: Gameplay Classes
-
-    Attributes:
-
-       allows_configuring (bool):
-          Whether the input-device can be configured.
-
-       has_meaningful_button_names (bool):
-          Whether button names returned by this instance match labels
-          on the actual device. (Can be used to determine whether to show
-          them in controls-overlays, etc.).
-
-       player (Optional[ba.SessionPlayer]):
-          The player associated with this input device.
-
-       client_id (int):
-          The numeric client-id this device is associated with.
-          This is only meaningful for remote client inputs; for
-          all local devices this will be -1.
-
-       name (str):
-          The name of the device.
-
-       unique_identifier (str):
-          A string that can be used to persistently identify the device,
-          even among other devices of the same type. Used for saving
-          prefs, etc.
-
-       id (int):
-          The unique numeric id of this device.
-
-       instance_number (int):
-          The number of this device among devices of the same type.
-
-       is_controller_app (bool):
-          Whether this input-device represents a locally-connected
-          controller-app.
-
-       is_remote_client (bool):
-          Whether this input-device represents a remotely-connected
-          client.
-
+    Category: **Gameplay Classes**
     """
     allows_configuring: bool
+    """Whether the input-device can be configured."""
+
     has_meaningful_button_names: bool
+    """Whether button names returned by this instance match labels
+       on the actual device. (Can be used to determine whether to show
+       them in controls-overlays, etc.)."""
+
     player: Optional[ba.SessionPlayer]
+    """The player associated with this input device."""
+
     client_id: int
+    """The numeric client-id this device is associated with.
+       This is only meaningful for remote client inputs; for
+       all local devices this will be -1."""
+
     name: str
+    """The name of the device."""
+
     unique_identifier: str
+    """A string that can be used to persistently identify the device,
+       even among other devices of the same type. Used for saving
+       prefs, etc."""
+
     id: int
+    """The unique numeric id of this device."""
+
     instance_number: int
+    """The number of this device among devices of the same type."""
+
     is_controller_app: bool
+    """Whether this input-device represents a locally-connected
+       controller-app."""
+
     is_remote_client: bool
+    """Whether this input-device represents a remotely-connected
+       client."""
 
     def exists(self) -> bool:
         """Return whether the underlying device for this object is
@@ -341,163 +324,163 @@ class Material:
 
     Use ba.Material to instantiate a blank material, and then use its
     ba.Material.add_actions method to define what the material does.
-
-    Attributes:
-
-        label (str):
-            A label for the material; only used for debugging.
     """
 
     def __init__(self, label: str = None):
         pass
 
     label: str
+    """A label for the material; only used for debugging."""
 
     def add_actions(self,
                     actions: tuple,
                     conditions: Optional[tuple] = None) -> None:
         """Add one or more actions to the material, optionally with conditions.
 
-        Conditions:
-            Conditions are provided as tuples which can be combined
-            to form boolean logic. A single condition might look like
-            ``('condition_name', cond_arg)``, or a more complex nested one
-            might look like ``(('some_condition', cond_arg), 'or',
-            ('another_condition', cond2_arg))``.
+        ##### Conditions
+        Conditions are provided as tuples which can be combined
+        to form boolean logic. A single condition might look like
+        `('condition_name', cond_arg)`, or a more complex nested one
+        might look like `(('some_condition', cond_arg), 'or',
+        ('another_condition', cond2_arg))`.
 
-            ``'and'``, ``'or'``, and ``'xor'`` are available to chain
-           together 2 conditions, as seen above.
+        `'and'`, `'or'`, and `'xor'` are available to chain
+        together 2 conditions, as seen above.
 
-        Available Conditions:
-            ``('they_have_material', material)`` - does the part we're
-            hitting have a given ba.Material?
+        ##### Available Conditions
+        ###### `('they_have_material', material)`
+        > Does the part we're hitting have a given ba.Material?
 
-            ``('they_dont_have_material', material)`` - does the part we're
-            hitting not have a given ba.Material?
+        ###### `('they_dont_have_material', material)`
+        > Does the part we're hitting not have a given ba.Material?
 
-            ``('eval_colliding')`` - is ``'collide'`` true at this point
-            in material evaluation? (see the modify_part_collision action)
+        ###### `('eval_colliding')`
+        > Is `'collide'` true at this point
+        in material evaluation? (see the `modify_part_collision` action)
 
-            ``('eval_not_colliding')`` - is 'collide' false at this point
-         in material evaluation? (see the modify_part_collision action)
+        ###### `('eval_not_colliding')`
+        > Is 'collide' false at this point
+        in material evaluation? (see the `modify_part_collision` action)
 
-            ``('we_are_younger_than', age)`` - is our part younger than
-            ``'age'`` (in milliseconds)?
+        ###### `('we_are_younger_than', age)`
+        > Is our part younger than `age` (in milliseconds)?
 
-            ``('we_are_older_than', age)`` - is our part older than ``'age'``
-            (in milliseconds)?
+        ###### `('we_are_older_than', age)`
+        > Is our part older than `age` (in milliseconds)?
 
-            ``('they_are_younger_than', age)`` - is the part we're hitting
-            younger than ``'age'`` (in milliseconds)?
+        ###### `('they_are_younger_than', age)`
+        > Is the part we're hitting younger than `age` (in milliseconds)?
 
-            ``('they_are_older_than', age)`` - is the part we're hitting
-            older than ``'age'`` (in milliseconds)?
+        ###### `('they_are_older_than', age)`
+        > Is the part we're hitting older than `age` (in milliseconds)?
 
-            ``('they_are_same_node_as_us')`` - does the part we're hitting
-            belong to the same ba.Node as us?
+        ###### `('they_are_same_node_as_us')`
+        > Does the part we're hitting belong to the same ba.Node as us?
 
-            ``('they_are_different_node_than_us')`` - does the part we're
-            hitting belong to a different ba.Node than us?
+        ###### `('they_are_different_node_than_us')`
+        > Does the part we're hitting belong to a different ba.Node than us?
 
-        Actions:
-            In a similar manner, actions are specified as tuples.
-            Multiple actions can be specified by providing a tuple
-            of tuples.
+        ##### Actions
+        In a similar manner, actions are specified as tuples.
+        Multiple actions can be specified by providing a tuple
+        of tuples.
 
-        Available Actions:
-            ``('call', when, callable)`` - calls the provided callable;
-            ``'when'`` can be either ``'at_connect'`` or ``'at_disconnect'``.
-            ``'at_connect'`` means to fire
-            when the two parts first come in contact; ``'at_disconnect'``
-            means to fire once they cease being in contact.
+        ##### Available Actions
+        ###### `('call', when, callable)`
+        > Calls the provided callable;
+        `when` can be either `'at_connect'` or `'at_disconnect'`.
+        `'at_connect'` means to fire
+        when the two parts first come in contact; `'at_disconnect'`
+        means to fire once they cease being in contact.
 
-            ``('message', who, when, message_obj)`` - sends a message object;
-            ``'who'`` can
-            be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be
-            ``'at_connect'`` or
-            ``'at_disconnect'``, and message_obj is the message object to send.
-            This has the same effect as calling the node's
-            ba.Node.handlemessage method.
+        ###### `('message', who, when, message_obj)`
+        > Sends a message object;
+        `who` can be either `'our_node'` or `'their_node'`, `when` can be
+        `'at_connect'` or `'at_disconnect'`, and `message_obj` is the message
+        object to send.
+        This has the same effect as calling the node's
+        ba.Node.handlemessage method.
 
-            ``('modify_part_collision', attr, value)`` - changes some
-            characteristic of the physical collision that will occur between
-            our part and their part. This change will remain in effect as
-            long as the two parts remain overlapping. This means if you have a
-            part with a material that turns ``'collide'`` off against parts
-            younger than 100ms, and it touches another part that is 50ms old,
-            it will continue to not collide with that part until they separate,
-            even if the 100ms threshold is passed. Options for attr/value are:
-            ``'physical'`` (boolean value; whether a *physical* response will
-            occur at all), ``'friction'`` (float value; how friction-y the
-            physical response will be), ``'collide'`` (boolean value;
-            whether *any* collision will occur at all, including non-physical
-            stuff like callbacks), ``'use_node_collide'``
-            (boolean value; whether to honor modify_node_collision
-            overrides for this collision), ``'stiffness'`` (float value,
-            how springy the physical response is), ``'damping'`` (float
-            value, how damped the physical response is), ``'bounce'`` (float
-            value; how bouncy the physical response is).
-            ``('modify_node_collision', attr, value)`` - similar to
-            ``modify_part_collision``, but operates at a node-level.
-            collision attributes set here will remain in effect as long as
-            *anything* from our part's node and their part's node overlap.
-            A key use of this functionality is to prevent new nodes from
-            colliding with each other if they appear overlapped;
-            if ``modify_part_collision`` is used, only the individual
-            parts that were overlapping would avoid contact, but other parts
-            could still contact leaving the two nodes 'tangled up'. Using
-            ``modify_node_collision ensures`` that the nodes must completely
-            separate before they can start colliding.  Currently the only attr
-            available here is ``'collide'`` (a boolean value).
+        ###### `('modify_part_collision', attr, value)`
+        > Changes some
+        characteristic of the physical collision that will occur between
+        our part and their part. This change will remain in effect as
+        long as the two parts remain overlapping. This means if you have a
+        part with a material that turns `'collide'` off against parts
+        younger than 100ms, and it touches another part that is 50ms old,
+        it will continue to not collide with that part until they separate,
+        even if the 100ms threshold is passed. Options for attr/value are:
+        `'physical'` (boolean value; whether a *physical* response will
+        occur at all), `'friction'` (float value; how friction-y the
+        physical response will be), `'collide'` (boolean value;
+        whether *any* collision will occur at all, including non-physical
+        stuff like callbacks), `'use_node_collide'`
+        (boolean value; whether to honor modify_node_collision
+        overrides for this collision), `'stiffness'` (float value,
+        how springy the physical response is), `'damping'` (float
+        value, how damped the physical response is), `'bounce'` (float
+        value; how bouncy the physical response is).
+        ###### `('modify_node_collision', attr, value)`
+        > Similar to
+        `modify_part_collision`, but operates at a node-level.
+        collision attributes set here will remain in effect as long as
+        *anything* from our part's node and their part's node overlap.
+        A key use of this functionality is to prevent new nodes from
+        colliding with each other if they appear overlapped;
+        if `modify_part_collision` is used, only the individual
+        parts that were overlapping would avoid contact, but other parts
+        could still contact leaving the two nodes 'tangled up'. Using
+        `modify_node_collision` ensures that the nodes must completely
+        separate before they can start colliding. Currently the only attr
+        available here is `'collide'` (a boolean value).
 
-            ``('sound', sound, volume)`` - plays a ba.Sound when a collision
-            occurs, at a given volume, regardless of the collision speed/etc.
+        ###### `('sound', sound, volume)`
+        > Plays a ba.Sound when a collision
+        occurs, at a given volume, regardless of the collision speed/etc.
 
-            ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound
-            when a collision occurs, based on the speed of impact.
-            Provide a ba.Sound, a target-impulse, and a volume.
+        ###### `('impact_sound', sound, targetImpulse, volume)`
+        > Plays a sound
+        when a collision occurs, based on the speed of impact.
+        Provide a ba.Sound, a target-impulse, and a volume.
 
-            ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound
-            during a collision when parts are 'scraping' against each other.
-            Provide a ba.Sound, a target-impulse, and a volume.
+        ###### `('skid_sound', sound, targetImpulse, volume)`
+        > Plays a sound
+        during a collision when parts are 'scraping' against each other.
+        Provide a ba.Sound, a target-impulse, and a volume.
 
-          ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound
-            during a collision when parts are 'rolling' against each other.
-            Provide a ba.Sound, a target-impulse, and a volume.
+        ###### `('roll_sound', sound, targetImpulse, volume)`
+        > Plays a sound
+        during a collision when parts are 'rolling' against each other.
+        Provide a ba.Sound, a target-impulse, and a volume.
 
-        Examples:
-            example 1: create a material that lets us ignore
-            collisions against any nodes we touch in the first
-            100 ms of our existence; handy for preventing us from
-            exploding outward if we spawn on top of another object:
-            ```python
-            >>> m = ba.Material()
-            ... m.add_actions(
-            ...     conditions=(('we_are_younger_than', 100),
-            ...                 'or', ('they_are_younger_than', 100)),
-            ...     actions=('modify_node_collision', 'collide', False))
-            ```
+        ##### Examples
+        **Example 1:** create a material that lets us ignore
+        collisions against any nodes we touch in the first
+        100 ms of our existence; handy for preventing us from
+        exploding outward if we spawn on top of another object:
+        >>> m = ba.Material()
+        ... m.add_actions(
+        ...     conditions=(('we_are_younger_than', 100),
+        ...                 'or', ('they_are_younger_than', 100)),
+        ...     actions=('modify_node_collision', 'collide', False))
 
-            example 2: send a ba.DieMessage to anything we touch, but cause
-            no physical response. This should cause any ba.Actor to drop dead:
-            ```python
-            >>> m = ba.Material()
-            ... m.add_actions(
-            ...     actions=(('modify_part_collision', 'physical', False),
-            ...              ('message', 'their_node', 'at_connect',
-            ...                  ba.DieMessage())))
-            ```
-
-            example 3: play some sounds when we're contacting the ground:
-            ```python
-            >>> m = ba.Material()
-            ... m.add_actions(
-            ...     conditions=('they_have_material',
-                                shared.footing_material),
-            ...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),
-            ...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))
-            ```
+        **Example 2:** send a ba.DieMessage to anything we touch, but cause
+        no physical response. This should cause any ba.Actor to drop dead:
+        ```python
+        >>> m = ba.Material()
+        ... m.add_actions(
+        ...     actions=(('modify_part_collision', 'physical', False),
+        ...              ('message', 'their_node', 'at_connect',
+        ...                  ba.DieMessage())))
 
+        **Example 3:** play some sounds when we're contacting the ground:
+        ```python
+        >>> m = ba.Material()
+        ... m.add_actions(
+        ...     conditions=('they_have_material',
+        ...                 shared.footing_material),
+        ...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),
+        ...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))
         """
         return None
 
@@ -505,7 +488,7 @@ class Material:
 class Model:
     """A reference to a model.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
 
     Models are used for drawing.
     Use ba.getmodel() to instantiate one.
@@ -525,8 +508,8 @@ class Node:
     to a game node; *not* the node itself. This means a Node's
     lifecycle is completely independent of how many Python references
     to it exist. To explicitly add a new node to the game, use
-    ba.newnode(), and to explicitly delete one, use ba.Node.delete().
-    ba.Node.exists() can be used to determine if a Node still points to
+    ba.newnode, and to explicitly delete one, use ba.Node.delete.
+    ba.Node.exists can be used to determine if a Node still points to
     a live node in the game.
 
     You can use ba.Node(None) to instantiate an invalid
@@ -665,18 +648,16 @@ class Node:
         setting the target attribute to any value or connecting another
         node attribute to it.
 
-        Example:
-            Create a locator and attach a light to it:
-            ```python
-            >>> light = ba.newnode('light')
-            ... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})
-            ... loc.connectattr('position', light, 'position')
-            ```
+        ##### Example
+        Create a locator and attach a light to it:
+        >>> light = ba.newnode('light')
+        ... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})
+        ... loc.connectattr('position', light, 'position')
         """
         return None
 
     def delete(self, ignore_missing: bool = True) -> None:
-        """Delete the node.  Ignores already-deleted nodes if ignore_missing
+        """Delete the node. Ignores already-deleted nodes if `ignore_missing`
         is True; otherwise a ba.NodeNotFoundError is thrown.
         """
         return None
@@ -729,7 +710,7 @@ class Node:
         All standard message objects are forwarded along to the ba.Node's
         delegate for handling (generally the ba.Actor that made the node).
 
-        ba.Nodes are unique, however, in that they can be passed a second
+        ba.Node-s are unique, however, in that they can be passed a second
         form of message; 'node-messages'.  These consist of a string type-name
         as a first argument along with the args specific to that type name
         as additional arguments.
@@ -753,61 +734,51 @@ class SessionData:
 class SessionPlayer:
     """A reference to a player in the ba.Session.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     These are created and managed internally and
-    provided to your Session/Activity instances.
+    provided to your ba.Session/ba.Activity instances.
     Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'
     references under-the-hood; a player can leave the game at
      any point. For this reason, you should make judicious use of the
-    ba.SessionPlayer.exists() method (or boolean operator) to ensure
+    ba.SessionPlayer.exists method (or boolean operator) to ensure
     that a SessionPlayer is still present if retaining references to one
     for any length of time.
-
-    Attributes:
-        id (int):
-            The unique numeric ID of the Player.
-
-            Note that you can also use the boolean operator for this same
-            functionality, so a statement such as "if player" will do
-            the right thing both for Player objects and values of None.
-
-        in_game (bool):
-            This bool value will be True once the Player has completed
-            any lobby character/team selection.
-
-        sessionteam (ba.SessionTeam):
-            The ba.SessionTeam this Player is on. If the SessionPlayer
-            is still in its lobby selecting a team/etc. then a
-            ba.SessionTeamNotFoundError will be raised.
-
-        inputdevice (ba.InputDevice):
-            The input device associated with the player.
-
-        color (Sequence[float]):
-            The base color for this Player.
-            In team games this will match the ba.SessionTeam's color.
-
-        highlight (Sequence[float]):
-            A secondary color for this player.
-            This is used for minor highlights and accents
-            to allow a player to stand apart from his teammates
-            who may all share the same team (primary) color.
-
-        character (str):
-            The character this player has selected in their profile.
-
-        activityplayer (Optional[ba.Player]):
-            The current game-specific instance for this player.
     """
     id: int
+    """The unique numeric ID of the Player.
+
+       Note that you can also use the boolean operator for this same
+       functionality, so a statement such as "if player" will do
+       the right thing both for Player objects and values of None."""
+
     in_game: bool
+    """This bool value will be True once the Player has completed
+       any lobby character/team selection."""
+
     sessionteam: ba.SessionTeam
+    """The ba.SessionTeam this Player is on. If the SessionPlayer
+       is still in its lobby selecting a team/etc. then a
+       ba.SessionTeamNotFoundError will be raised."""
+
     inputdevice: ba.InputDevice
+    """The input device associated with the player."""
+
     color: Sequence[float]
+    """The base color for this Player.
+       In team games this will match the ba.SessionTeam's color."""
+
     highlight: Sequence[float]
+    """A secondary color for this player.
+       This is used for minor highlights and accents
+       to allow a player to stand apart from his teammates
+       who may all share the same team (primary) color."""
+
     character: str
+    """The character this player has selected in their profile."""
+
     activityplayer: Optional[ba.Player]
+    """The current game-specific instance for this player."""
 
     def assigninput(self, type: Union[ba.InputType, tuple[ba.InputType, ...]],
                     call: Callable) -> None:
@@ -885,9 +856,9 @@ class SessionPlayer:
 class Sound:
     """A reference to a sound.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
 
-    Use ba.getsound() to instantiate one.
+    Use ba.getsound to instantiate one.
     """
     pass
 
@@ -895,7 +866,7 @@ class Sound:
 class Texture:
     """A reference to a texture.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
 
     Use ba.gettexture() to instantiate one.
     """
@@ -905,7 +876,7 @@ class Texture:
 class Timer:
     """Timers are used to run code at later points in time.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     This class encapsulates a timer in the current ba.Context.
     The underlying timer will be destroyed when either this object is
@@ -913,37 +884,41 @@ class Timer:
     do not want to worry about keeping a reference to your timer around,
     you should use the ba.timer() function instead.
 
-    time: length of time (in seconds by default) that the timer will wait
+    ###### time
+    > Length of time (in seconds by default) that the timer will wait
     before firing. Note that the actual delay experienced may vary
     depending on the timetype. (see below)
 
-    call: A callable Python object. Note that the timer will retain a
+    ###### call
+    > A callable Python object. Note that the timer will retain a
     strong reference to the callable for as long as it exists, so you
     may want to look into concepts such as ba.WeakCall if that is not
     desired.
 
-    repeat: if True, the timer will fire repeatedly, with each successive
+    ###### repeat
+    > If True, the timer will fire repeatedly, with each successive
     firing having the same delay as the first.
 
-    timetype: A ba.TimeType value determining which timeline the timer is
+    ###### timetype
+    > A ba.TimeType value determining which timeline the timer is
     placed onto.
 
-    timeformat: A ba.TimeFormat value determining how the passed time is
+    ###### timeformat
+    > A ba.TimeFormat value determining how the passed time is
     interpreted.
 
-    Example:
-        Use a Timer object to print repeatedly for a few seconds:
-        ```python
-        >>> def say_it():
-        ...     ba.screenmessage('BADGER!')
-        ... def stop_saying_it():
-        ...     self.t = None
-        ... ba.screenmessage('MUSHROOM MUSHROOM!')
-        ... # Create our timer; it will run as long as we have the self.t ref.
-        ... self.t = ba.Timer(0.3, say_it, repeat=True)
-        ... # Now fire off a one-shot timer to kill it.
-        ... ba.timer(3.89, stop_saying_it)
-        ```
+    ##### Example
+
+    Use a Timer object to print repeatedly for a few seconds:
+    >>> def say_it():
+    ...     ba.screenmessage('BADGER!')
+    ... def stop_saying_it():
+    ...     self.t = None
+    ... ba.screenmessage('MUSHROOM MUSHROOM!')
+    ... # Create our timer; it will run as long as we have the self.t ref.
+    ... self.t = ba.Timer(0.3, say_it, repeat=True)
+    ... # Now fire off a one-shot timer to kill it.
+    ... ba.timer(3.89, stop_saying_it)
     """
 
     def __init__(self,
@@ -959,26 +934,22 @@ class Timer:
 class Vec3(Sequence[float]):
     """A vector of 3 floats.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     These can be created the following ways (checked in this order):
     - with no args, all values are set to 0
     - with a single numeric arg, all values are set to that value
     - with a single three-member sequence arg, sequence values are copied
     - otherwise assumes individual x/y/z args (positional or keywords)
-    Attributes:
-       x (float):
-          The vector's X component.
-
-       y (float):
-          The vector's Y component.
-
-       z (float):
-          The vector's Z component.
     """
     x: float
+    """The vector's X component."""
+
     y: float
+    """The vector's Y component."""
+
     z: float
+    """The vector's Z component."""
 
     # pylint: disable=function-redefined
 
@@ -1069,11 +1040,11 @@ class Vec3(Sequence[float]):
 class Widget:
     """Internal type for low level UI elements; buttons, windows, etc.
 
-    Category: User Interface Classes
+    Category: **User Interface Classes**
 
     This class represents a weak reference to a widget object
-    in the internal c++ layer. Currently, functions such as
-    ba.buttonwidget() must be used to instantiate or edit these.
+    in the internal C++ layer. Currently, functions such as
+    ba.buttonwidget must be used to instantiate or edit these.
     """
 
     def activate(self) -> None:
@@ -1240,7 +1211,7 @@ def buttonwidget(edit: ba.Widget = None,
                  enabled: bool = None) -> ba.Widget:
     """Create or edit a button widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -1253,7 +1224,7 @@ def buttonwidget(edit: ba.Widget = None,
 def camerashake(intensity: float = 1.0) -> None:
     """Shake the camera.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     Note that some cameras and/or platforms (such as VR) may not display
     camera-shake, so do not rely on this always being visible to the
@@ -1293,7 +1264,7 @@ def capture_keyboard_input(call: Callable[[dict], None]) -> None:
 def charstr(char_id: ba.SpecialChar) -> str:
     """Get a unicode string representing a special character.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Note that these utilize the private-use block of unicode characters
     (U+E000-U+F8FF) and are specific to the game; exporting or rendering
@@ -1328,7 +1299,7 @@ def checkboxwidget(edit: ba.Widget = None,
                    color: Sequence[float] = None) -> ba.Widget:
     """Create or edit a check-box widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -1346,9 +1317,9 @@ def client_info_query_response(token: str, response: Any) -> None:
 def clipboard_get_text() -> str:
     """Return text currently on the system clipboard.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
-    Ensure that ba.clipboard_has_text() returns True before calling
+    Ensure that ba.clipboard_has_text returns True before calling
      this function.
     """
     return str()
@@ -1357,7 +1328,7 @@ def clipboard_get_text() -> str:
 def clipboard_has_text() -> bool:
     """Return whether there is currently text on the clipboard.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This will return False if no system clipboard is available; no need
      to call ba.clipboard_available() separately.
@@ -1368,7 +1339,7 @@ def clipboard_has_text() -> bool:
 def clipboard_is_supported() -> bool:
     """Return whether this platform supports clipboard operations at all.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     If this returns False, UIs should not show 'copy to clipboard'
     buttons, etc.
@@ -1379,9 +1350,9 @@ def clipboard_is_supported() -> bool:
 def clipboard_set_text(value: str) -> None:
     """Copy a string to the system clipboard.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
-    Ensure that ba.clipboard_available() returns True before adding
+    Ensure that ba.clipboard_available returns True before adding
      buttons/etc. that make use of this functionality.
     """
     return None
@@ -1406,7 +1377,7 @@ def columnwidget(edit: ba.Widget = None,
                  claims_tab: bool = None) -> ba.Widget:
     """Create or edit a column widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -1471,7 +1442,7 @@ def containerwidget(edit: ba.Widget = None,
                     claims_up_down: bool = None) -> ba.Widget:
     """Create or edit a container widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -1505,20 +1476,18 @@ def disconnect_from_host() -> None:
 def do_once() -> bool:
     """Return whether this is the first time running a line of code.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This is used by 'print_once()' type calls to keep from overflowing
     logs. The call functions by registering the filename and line where
     The call is made from.  Returns True if this location has not been
     registered already, and False if it has.
 
-    Example:
-        This print will only fire for the first loop iteration:
-        ```python
-        >>> for i in range(10):
-        ... if ba.do_once():
-        ...     print('Hello once from loop!')
-        ```
+    ##### Example
+    This print will only fire for the first loop iteration:
+    >>> for i in range(10):
+    ... if ba.do_once():
+    ...     print('Hello once from loop!')
     """
     return bool()
 
@@ -1538,7 +1507,7 @@ def emitfx(position: Sequence[float],
            tendril_type: str = 'smoke') -> None:
     """Emit particles, smoke, etc. into the fx sim layer.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     The fx sim layer is a secondary dynamics simulation that runs in
     the background and just looks pretty; it does not affect gameplay.
@@ -1688,7 +1657,7 @@ def get_chat_messages() -> list[str]:
 def get_collision_info(*args: Any) -> Any:
     """Return collision related values
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     Returns a single collision value or tuple of values such as location,
     depth, nodes involved, etc. Only call this in the handler of a
@@ -1962,7 +1931,7 @@ def getactivity(doraise: Literal[False]) -> Optional[ba.Activity]:
 def getactivity(doraise: bool = True) -> Optional[ba.Activity]:
     """Return the current ba.Activity instance.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     Note that this is based on context; thus code run in a timer generated
     in Activity 'foo' will properly return 'foo' here, even if another
@@ -1976,7 +1945,7 @@ def getactivity(doraise: bool = True) -> Optional[ba.Activity]:
 def getcollidemodel(name: str) -> ba.CollideModel:
     """Return a collide-model, loading it if necessary.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Collide-models are used in physics calculations for such things as
     terrain.
@@ -1993,7 +1962,7 @@ def getcollidemodel(name: str) -> ba.CollideModel:
 def getdata(name: str) -> ba.Data:
     """Return a data, loading it if necessary.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Note that this function returns immediately even if the media has yet
     to be loaded. To avoid hitches, instantiate your media objects in
@@ -2036,7 +2005,7 @@ def getlog() -> str:
 def getmodel(name: str) -> ba.Model:
     """Return a model, loading it if necessary.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Note that this function returns immediately even if the media has yet
     to be loaded. To avoid hitches, instantiate your media objects in
@@ -2049,7 +2018,7 @@ def getmodel(name: str) -> ba.Model:
 
 def getnodes() -> list:
     """Return all nodes in the current ba.Context.
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
     """
     return list()
 
@@ -2066,7 +2035,7 @@ def getsession(doraise: Literal[False]) -> Optional[ba.Session]:
 
 
 def getsession(doraise: bool = True) -> Optional[ba.Session]:
-    """Category: Gameplay Functions
+    """Category: **Gameplay Functions**
 
     Returns the current ba.Session instance.
     Note that this is based on context; thus code being run in the UI
@@ -2080,7 +2049,7 @@ def getsession(doraise: bool = True) -> Optional[ba.Session]:
 def getsound(name: str) -> ba.Sound:
     """Return a sound, loading it if necessary.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Note that this function returns immediately even if the media has yet
     to be loaded. To avoid hitches, instantiate your media objects in
@@ -2094,7 +2063,7 @@ def getsound(name: str) -> ba.Sound:
 def gettexture(name: str) -> ba.Texture:
     """Return a texture, loading it if necessary.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Note that this function returns immediately even if the media has yet
     to be loaded. To avoid hitches, instantiate your media objects in
@@ -2191,7 +2160,7 @@ def hscrollwidget(edit: ba.Widget = None,
                   claims_tab: bool = None) -> ba.Widget:
     """Create or edit a horizontal scroll widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -2221,7 +2190,7 @@ def imagewidget(edit: ba.Widget = None,
                 radial_amount: float = None) -> ba.Widget:
     """Create or edit an image widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -2330,7 +2299,7 @@ def lock_all_input() -> None:
 
 
 def log(message: str, to_stdout: bool = True, to_server: bool = True) -> None:
-    """Category: General Utility Functions
+    """Category: **General Utility Functions**
 
     Log a message. This goes to the default logging mechanism depending
     on the platform (stdout on mac, android log on android, etc).
@@ -2440,7 +2409,7 @@ def newactivity(activity_type: type[ba.Activity],
                 settings: dict = None) -> ba.Activity:
     """Instantiates a ba.Activity given a type object.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Activities require special setup and thus cannot be directly
     instantiated; you must go through this function.
@@ -2456,7 +2425,7 @@ def newnode(type: str,
             delegate: Any = None) -> Node:
     """Add a node of the given type to the game.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     If a dict is provided for 'attributes', the node's initial attributes
     will be set based on them.
@@ -2494,7 +2463,7 @@ def open_file_externally(path: str) -> None:
 def open_url(address: str) -> None:
     """Open a provided URL.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Open the provided url in a web-browser, or display the URL
     string in a window if that isn't possible.
@@ -2508,10 +2477,10 @@ def playsound(sound: Sound,
               host_only: bool = False) -> None:
     """Play a ba.Sound a single time.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     If position is not provided, the sound will be at a constant volume
-    everywhere.  Position should be a float tuple of size 3.
+    everywhere. Position should be a float tuple of size 3.
     """
     return None
 
@@ -2532,7 +2501,7 @@ def print_context() -> None:
 def print_load_info() -> None:
     """(internal)
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
     """
     return None
 
@@ -2550,7 +2519,7 @@ def print_stdout(message: str) -> None:
 def printnodes() -> None:
     """Print various info about existing nodes; useful for debugging.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
     """
     return None
 
@@ -2558,7 +2527,7 @@ def printnodes() -> None:
 def printobjects() -> None:
     """Print debugging info about game objects.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This call only functions in debug builds of the game.
     It prints various info about the current object count, etc.
@@ -2576,7 +2545,7 @@ def pushcall(call: Callable,
              suppress_other_thread_warning: bool = False) -> None:
     """Pushes a call onto the event loop to be run during the next cycle.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This can be handy for calls that are disallowed from within other
     callbacks, etc.
@@ -2594,7 +2563,7 @@ def pushcall(call: Callable,
 def quit(soft: bool = False, back: bool = False) -> None:
     """Quit the game.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     On systems like android, 'soft' will end the activity but keep the
     app running.
@@ -2684,7 +2653,7 @@ def rowwidget(edit: ba.Widget = None,
               selection_loops_to_parent: bool = None) -> ba.Widget:
     """Create or edit a row widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -2703,7 +2672,7 @@ def safecolor(color: Sequence[float],
               target_intensity: float = 0.6) -> tuple[float, ...]:
     """Given a color tuple, return a color safe to display as text.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Accepts tuples of length 3 or 4. This will slightly brighten very
     dark colors, etc.
@@ -2720,7 +2689,7 @@ def screenmessage(message: Union[str, ba.Lstr],
                   transient: bool = False) -> None:
     """Print a message to the local client's screen, in a given color.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     If 'top' is True, the message will go to the top message area.
     For 'top' messages, 'image' can be a texture to display alongside the
@@ -2755,7 +2724,7 @@ def scrollwidget(edit: ba.Widget = None,
                  autoselect: bool = None) -> ba.Widget:
     """Create or edit a scroll widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -2773,7 +2742,7 @@ def set_admins(admins: list[str]) -> None:
 def set_analytics_screen(screen: str) -> None:
     """Used for analytics to see where in the app players spend their time.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Generally called when opening a new window or entering some UI.
     'screen' should be a string description of an app location
@@ -2958,7 +2927,7 @@ def show_app_invite(title: Union[str, ba.Lstr], message: Union[str, ba.Lstr],
                     code: str) -> None:
     """(internal)
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
     """
     return None
 
@@ -2966,7 +2935,7 @@ def show_app_invite(title: Union[str, ba.Lstr], message: Union[str, ba.Lstr],
 def show_invites_ui() -> None:
     """(internal)
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
     """
     return None
 
@@ -2981,7 +2950,7 @@ def show_online_score_ui(show: str = 'general',
 def show_progress_bar() -> None:
     """(internal)
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
     """
     return None
 
@@ -3081,7 +3050,7 @@ def textwidget(edit: ba.Widget = None,
                res_scale: float = None) -> Widget:
     """Create or edit a text widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Pass a valid existing ba.Widget as 'edit' to modify it; otherwise
     a new one is created and returned. Arguments that are not set to None
@@ -3118,30 +3087,29 @@ def time(timetype: ba.TimeType = TimeType.SIM,
          timeformat: ba.TimeFormat = TimeFormat.SECONDS) -> Any:
     """Return the current time.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     The time returned depends on the current ba.Context and timetype.
 
     timetype can be either SIM, BASE, or REAL. It defaults to
     SIM. Types are explained below:
 
-    SIM time maps to local simulation time in ba.Activity or ba.Session
+    - SIM time maps to local simulation time in ba.Activity or ba.Session
     Contexts. This means that it may progress slower in slow-motion play
     modes, stop when the game is paused, etc.  This time type is not
     available in UI contexts.
-
-    BASE time is also linked to gameplay in ba.Activity or ba.Session
+    - BASE time is also linked to gameplay in ba.Activity or ba.Session
     Contexts, but it progresses at a constant rate regardless of
      slow-motion states or pausing.  It can, however, slow down or stop
     in certain cases such as network outages or game slowdowns due to
     cpu load. Like 'sim' time, this is unavailable in UI contexts.
-
-    REAL time always maps to actual clock time with a bit of filtering
-    added, regardless of Context.  (the filtering prevents it from going
+    - REAL time always maps to actual clock time with a bit of filtering
+    added, regardless of Context. (The filtering prevents it from going
     backwards or jumping forward by large amounts due to the app being
     backgrounded, system time changing, etc.)
+    Real time timers are currently only available in the UI context.
 
-    the 'timeformat' arg defaults to SECONDS which returns float seconds,
+    The 'timeformat' arg defaults to SECONDS which returns float seconds,
     but it can also be MILLISECONDS to return integer milliseconds.
 
     Note: If you need pure unfiltered clock time, just use the standard
@@ -3170,35 +3138,34 @@ def timer(time: float,
           suppress_format_warning: bool = False) -> None:
     """Schedule a call to run at a later point in time.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This function adds a timer to the current ba.Context.
     This timer cannot be canceled or modified once created. If you
      require the ability to do so, use the ba.Timer class instead.
 
-    Arguments:
-        time (float):
-            Length of time (in seconds by default) that the timer will wait
-            before firing. Note that the actual delay experienced may vary
-             depending on the timetype. (see below)
+    ##### Arguments
+    ###### time (float):
+    > Length of time (in seconds by default) that the timer will wait
+    before firing. Note that the actual delay experienced may vary
+     depending on the timetype. (see below)
 
-        call (Callable[[], Any]):
-            A callable Python object. Note that the timer will retain a
-            strong reference to the callable for as long as it exists, so you
-            may want to look into concepts such as ba.WeakCall if that is not
-            desired.
+    ###### call (Callable[[], Any])
+    > A callable Python object. Note that the timer will retain a
+    strong reference to the callable for as long as it exists, so you
+    may want to look into concepts such as ba.WeakCall if that is not
+    desired.
 
-        repeat (bool):
-            If True, the timer will fire repeatedly, with each successive
-            firing having the same delay as the first.
+    ###### repeat (bool)
+    > If True, the timer will fire repeatedly, with each successive
+    firing having the same delay as the first.
 
+    ###### timetype (ba.TimeType)
+    > Can be either `SIM`, `BASE`, or `REAL`. It defaults to
+    `SIM`.
 
-        timetype (ba.TimeType):
-            Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults to
-            ``SIM``.
-
-        timeformat (ba.TimeFormat):
-            Defaults to seconds but can also be milliseconds.
+    ###### timeformat (ba.TimeFormat)
+    > Defaults to seconds but can also be milliseconds.
 
     - SIM time maps to local simulation time in ba.Activity or ba.Session
     Contexts. This means that it may progress slower in slow-motion play
@@ -3215,14 +3182,12 @@ def timer(time: float,
     backgrounded, system time changing, etc.)
     Real time timers are currently only available in the UI context.
 
-    Examples:
-        Print some stuff through time:
-        ```python
-        >>> ba.screenmessage('hello from now!')
-        >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))
-        >>> ba.timer(2.0, ba.Call(ba.screenmessage,
-        ...                       'hello from the future 2!'))
-        ```
+    ##### Examples
+    Print some stuff through time:
+    >>> ba.screenmessage('hello from now!')
+    >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the future!'))
+    >>> ba.timer(2.0, ba.Call(ba.screenmessage,
+    ...                       'hello from the future 2!'))
     """
     return None
 
@@ -3271,7 +3236,7 @@ def widget(edit: ba.Widget = None,
            autoselect: bool = None) -> None:
     """Edit common attributes of any widget.
 
-    Category: User Interface Functions
+    Category: **User Interface Functions**
 
     Unlike other UI calls, this can only be used to edit, not to create.
     """
diff --git a/assets/src/ba_data/python/ba/__init__.py b/assets/src/ba_data/python/ba/__init__.py
index 24c1cee1..a773a787 100644
--- a/assets/src/ba_data/python/ba/__init__.py
+++ b/assets/src/ba_data/python/ba/__init__.py
@@ -81,13 +81,14 @@ from ba._collision import Collision, getcollision
 
 app: App
 
+__all__: list[str] = []
+
 
 # Change everything's listed module to simply 'ba' (instead of 'ba.foo.bar').
 def _simplify_module_names() -> None:
-    for attr, obj in globals().items():
+    for attr, _obj in globals().items():
         if not attr.startswith('_'):
-            if getattr(obj, '__module__', None) not in [None, 'ba']:
-                obj.__module__ = 'ba'
+            __all__.append(attr)
 
 
 _simplify_module_names()
diff --git a/assets/src/ba_data/python/ba/_activity.py b/assets/src/ba_data/python/ba/_activity.py
index bfaf16c6..7df6e376 100644
--- a/assets/src/ba_data/python/ba/_activity.py
+++ b/assets/src/ba_data/python/ba/_activity.py
@@ -32,99 +32,92 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
     Examples of Activities include games, score-screens, cutscenes, etc.
     A ba.Session has one 'current' Activity at any time, though their existence
     can overlap during transitions.
-
-    Attributes:
-
-       settings_raw
-          The settings dict passed in when the activity was made.
-          This attribute is deprecated and should be avoided when possible;
-          activities should pull all values they need from the 'settings' arg
-          passed to the Activity __init__ call.
-
-       teams
-          The list of ba.Team-s in the Activity. This gets populated just
-          before on_begin() is called and is updated automatically as players
-          join or leave the game. (at least in free-for-all mode where every
-          player gets their own team; in teams mode there are always 2 teams
-          regardless of the player count).
-
-       players
-          The list of ba.Player-s in the Activity. This gets populated just
-          before on_begin() is called and is updated automatically as players
-          join or leave the game.
     """
 
     # pylint: disable=too-many-public-methods
 
-    # Annotating attr types at the class level lets us introspect at runtime.
     settings_raw: dict[str, Any]
+    """The settings dict passed in when the activity was made.
+       This attribute is deprecated and should be avoided when possible;
+       activities should pull all values they need from the 'settings' arg
+       passed to the Activity __init__ call."""
+
     teams: list[TeamType]
+    """The list of ba.Team-s in the Activity. This gets populated just
+       before on_begin() is called and is updated automatically as players
+       join or leave the game. (at least in free-for-all mode where every
+       player gets their own team; in teams mode there are always 2 teams
+       regardless of the player count)."""
+
     players: list[PlayerType]
+    """The list of ba.Player-s in the Activity. This gets populated just
+       before on_begin() is called and is updated automatically as players
+       join or leave the game."""
 
-    # Whether to print every time a player dies. This can be pertinent
-    # in games such as Death-Match but can be annoying in games where it
-    # doesn't matter.
     announce_player_deaths = False
+    """Whether to print every time a player dies. This can be pertinent
+       in games such as Death-Match but can be annoying in games where it
+       doesn't matter."""
 
-    # Joining activities are for waiting for initial player joins.
-    # They are treated slightly differently than regular activities,
-    # mainly in that all players are passed to the activity at once
-    # instead of as each joins.
     is_joining_activity = False
+    """Joining activities are for waiting for initial player joins.
+       They are treated slightly differently than regular activities,
+       mainly in that all players are passed to the activity at once
+       instead of as each joins."""
 
-    # Whether game-time should still progress when in menus/etc.
     allow_pausing = False
+    """Whether game-time should still progress when in menus/etc."""
 
-    # Whether idle players can potentially be kicked (should not happen in
-    # menus/etc).
     allow_kick_idle_players = True
+    """Whether idle players can potentially be kicked (should not happen in
+       menus/etc)."""
 
-    # In vr mode, this determines whether overlay nodes (text, images, etc)
-    # are created at a fixed position in space or one that moves based on
-    # the current map. Generally this should be on for games and off for
-    # transitions/score-screens/etc. that persist between maps.
     use_fixed_vr_overlay = False
+    """In vr mode, this determines whether overlay nodes (text, images, etc)
+       are created at a fixed position in space or one that moves based on
+       the current map. Generally this should be on for games and off for
+       transitions/score-screens/etc. that persist between maps."""
 
-    # If True, runs in slow motion and turns down sound pitch.
     slow_motion = False
+    """If True, runs in slow motion and turns down sound pitch."""
 
-    # Set this to True to inherit slow motion setting from previous
-    # activity (useful for transitions to avoid hitches).
     inherits_slow_motion = False
+    """Set this to True to inherit slow motion setting from previous
+       activity (useful for transitions to avoid hitches)."""
 
-    # Set this to True to keep playing the music from the previous activity
-    # (without even restarting it).
     inherits_music = False
+    """Set this to True to keep playing the music from the previous activity
+       (without even restarting it)."""
 
-    # Set this to true to inherit VR camera offsets from the previous
-    # activity (useful for preventing sporadic camera movement
-    # during transitions).
     inherits_vr_camera_offset = False
+    """Set this to true to inherit VR camera offsets from the previous
+       activity (useful for preventing sporadic camera movement
+       during transitions)."""
 
-    # Set this to true to inherit (non-fixed) VR overlay positioning from
-    # the previous activity (useful for prevent sporadic overlay jostling
-    # during transitions).
     inherits_vr_overlay_center = False
+    """Set this to true to inherit (non-fixed) VR overlay positioning from
+       the previous activity (useful for prevent sporadic overlay jostling
+       during transitions)."""
 
-    # Set this to true to inherit screen tint/vignette colors from the
-    # previous activity (useful to prevent sudden color changes during
-    # transitions).
     inherits_tint = False
+    """Set this to true to inherit screen tint/vignette colors from the
+       previous activity (useful to prevent sudden color changes during
+       transitions)."""
 
-    # Whether players should be allowed to join in the middle of this
-    # activity. Note that Sessions may not allow mid-activity-joins even
-    # if the activity says its ok.
     allow_mid_activity_joins: bool = True
+    """Whether players should be allowed to join in the middle of this
+       activity. Note that Sessions may not allow mid-activity-joins even
+       if the activity says its ok."""
 
-    # If the activity fades or transitions in, it should set the length of
-    # time here so that previous activities will be kept alive for that
-    # long (avoiding 'holes' in the screen)
-    # This value is given in real-time seconds.
     transition_time = 0.0
+    """If the activity fades or transitions in, it should set the length of
+       time here so that previous activities will be kept alive for that
+       long (avoiding 'holes' in the screen)
+       This value is given in real-time seconds."""
 
-    # Is it ok to show an ad after this activity ends before showing
-    # the next activity?
     can_show_ad_on_death = False
+    """Is it ok to show an ad after this activity ends before showing
+       the next activity?"""
 
     def __init__(self, settings: dict):
         """Creates an Activity in the current ba.Session.
@@ -386,11 +379,11 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return UNHANDLED
 
     def has_transitioned_in(self) -> bool:
-        """Return whether ba.Activity.on_transition_in() has been called."""
+        """Return whether ba.Activity.on_transition_in has been called."""
         return self._has_transitioned_in
 
     def has_begun(self) -> bool:
-        """Return whether ba.Activity.on_begin() has been called."""
+        """Return whether ba.Activity.on_begin has been called."""
         return self._has_begun
 
     def has_ended(self) -> bool:
@@ -398,7 +391,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return self._has_ended
 
     def is_transitioning_out(self) -> bool:
-        """Return whether ba.Activity.on_transition_out() has been called."""
+        """Return whether ba.Activity.on_transition_out has been called."""
         return self._transitioning_out
 
     def transition_in(self, prev_globals: Optional[ba.Node]) -> None:
diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py
index cbc6f114..105bfa01 100644
--- a/assets/src/ba_data/python/ba/_actor.py
+++ b/assets/src/ba_data/python/ba/_actor.py
@@ -36,14 +36,14 @@ class Actor:
     Example:
         ```python
         >>> # Create a flag Actor in our game activity:
-        >>> from bastd.actor.flag import Flag
-        >>> self.flag = Flag(position=(0, 10, 0))
-        >>>
-        >>> # Later, destroy the flag.
-        >>> # (provided nothing else is holding a reference to it)
-        >>> # We could also just assign a new flag to this value.
-        >>> # Either way, the old flag disappears.
-        >>> self.flag = None
+        ... from bastd.actor.flag import Flag
+        ... self.flag = Flag(position=(0, 10, 0))
+        ...
+        ... # Later, destroy the flag.
+        ... # (provided nothing else is holding a reference to it)
+        ... # We could also just assign a new flag to this value.
+        ... # Either way, the old flag disappears.
+        ... self.flag = None
         ```
 
     This is in contrast to the behavior of the more low level ba.Nodes,
@@ -65,7 +65,9 @@ class Actor:
     (though its not guaranteed to always have a meaningful effect).
     In this case the Actor instance will still be around, but its exists()
     and is_alive() methods will both return False.
+    ```python
     >>> self.flag.handlemessage(ba.DieMessage())
+    ```
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py
index 43d02ef4..bee3fac5 100644
--- a/assets/src/ba_data/python/ba/_general.py
+++ b/assets/src/ba_data/python/ba/_general.py
@@ -155,18 +155,23 @@ class _WeakCall:
         bar() method 5 seconds later; it will be kept alive even though
         we overwrite its variable with None because the bound method
         we pass as a timer callback (foo.bar) strong-references it
+        ```python
         >>> foo = FooClass()
         ... ba.timer(5.0, foo.bar)
         ... foo = None
+        ```
 
         EXAMPLE B: this code will *not* keep our object alive; it will die
         when we overwrite it with None and the timer will be a no-op when it
         fires
+        ```python
         >>> foo = FooClass()
         ... ba.timer(5.0, ba.WeakCall(foo.bar))
         ... foo = None
+        ```
 
         EXAMPLE C: Wrap a method call with some positional and keyword args:
+        ```python
         >>> myweakcall = ba.WeakCall(self.dostuff, argval1,
         ...                          namedarg=argval2)
         ... # Now we have a single callable to run that whole mess.
@@ -174,6 +179,7 @@ class _WeakCall:
         ... # (provided my_obj still exists; this will do nothing
         ... # otherwise).
         ... myweakcall()
+        ```
 
         Note: additional args and keywords you provide to the WeakCall()
         constructor are stored as regular strong-references; you'll need
@@ -232,10 +238,12 @@ class _Call:
 
         Example:
             Wrap a method call with 1 positional and 1 keyword arg:
+            ```python
             >>> mycall = ba.Call(myobj.dostuff, argval, namedarg=argval2)
             ... # Now we have a single callable to run that whole mess.
             ... # ..the same as calling myobj.dostuff(argval, namedarg=argval2)
             ... mycall()
+            ```
         """
         self._call = args[0]
         self._args = args[1:]
diff --git a/assets/src/ba_data/python/ba/_keyboard.py b/assets/src/ba_data/python/ba/_keyboard.py
index 245cbea3..8502caaa 100644
--- a/assets/src/ba_data/python/ba/_keyboard.py
+++ b/assets/src/ba_data/python/ba/_keyboard.py
@@ -18,18 +18,16 @@ class Keyboard:
     Keyboards are discoverable by the meta-tag system
     and the user can select which one they want to use.
     On-screen keyboard uses chars from active ba.Keyboard.
-    Attributes:
-      name
-        Displays when user selecting this keyboard.
-      chars
-        Used for row/column lengths.
-      pages
-        Extra chars like emojis.
-      nums
-        The 'num' page.
     """
 
     name: str
+    """Displays when user selecting this keyboard."""
+
     chars: list[tuple[str, ...]]
+    """Used for row/column lengths."""
+
     pages: dict[str, tuple[str, ...]]
+    """Extra chars like emojis."""
+
     nums: tuple[str, ...]
+    """The 'num' page."""
diff --git a/assets/src/ba_data/python/ba/_language.py b/assets/src/ba_data/python/ba/_language.py
index 60b88a4d..5d9894b7 100644
--- a/assets/src/ba_data/python/ba/_language.py
+++ b/assets/src/ba_data/python/ba/_language.py
@@ -378,19 +378,25 @@ class Lstr:
 
     Examples:
         EXAMPLE 1: specify a string from a resource path
+        ```python
         >>> mynode.text = ba.Lstr(resource='audioSettingsWindow.titleText')
+        ```
 
         EXAMPLE 2: specify a translated string via a category and english
         value; if a translated value is available, it will be used; otherwise
         the english value will be. To see available translation categories,
         look under the 'translations' resource section.
+        ```python
         >>> mynode.text = ba.Lstr(translate=('gameDescriptions',
         ...                                  'Defeat all enemies'))
+        ```
 
         EXAMPLE 3: specify a raw value and some substitutions. Substitutions
         can be used with resource and translate modes as well.
+        ```python
         >>> mynode.text = ba.Lstr(value='${A} / ${B}',
         ...               subs=[('${A}', str(score)), ('${B}', str(total))])
+        ```
 
         EXAMPLE 4: ba.Lstr's can be nested. This example would display the
         resource at res_a but replace ${NAME} with the value of the
diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py
index a4728537..996bfb66 100644
--- a/assets/src/ba_data/python/ba/_player.py
+++ b/assets/src/ba_data/python/ba/_player.py
@@ -48,18 +48,15 @@ class Player(Generic[TeamType]):
     These correspond to ba.SessionPlayer objects, but are associated with a
     single ba.Activity instance. This allows activities to specify their
     own custom ba.Player types.
-
-    Attributes:
-
-      actor
-        The ba.Actor associated with the player.
-
     """
 
     # These are instance attrs but we define them at the type level so
     # their type annotations are introspectable (for docs generation).
     character: str
+
     actor: Optional[ba.Actor]
+    """The ba.Actor associated with the player."""
+
     color: Sequence[float]
     highlight: Sequence[float]
 
diff --git a/assets/src/ba_data/python/ba/_score.py b/assets/src/ba_data/python/ba/_score.py
index d1cbe52c..b5272118 100644
--- a/assets/src/ba_data/python/ba/_score.py
+++ b/assets/src/ba_data/python/ba/_score.py
@@ -28,29 +28,21 @@ class ScoreConfig:
     """Settings for how a game handles scores.
 
     Category: Gameplay Classes
-
-    Attributes:
-
-       label
-          A label show to the user for scores; 'Score', 'Time Survived', etc.
-
-       scoretype
-          How the score value should be displayed.
-
-       lower_is_better
-          Whether lower scores are preferable. Higher scores are by default.
-
-       none_is_winner
-          Whether a value of None is considered better than other scores.
-          By default it is not.
-
-       version
-          To change high-score lists used by a game without renaming the game,
-          change this. Defaults to an empty string.
-
     """
+
     label: str = 'Score'
+    """A label show to the user for scores; 'Score', 'Time Survived', etc."""
+
     scoretype: ba.ScoreType = ScoreType.POINTS
+    """How the score value should be displayed."""
+
     lower_is_better: bool = False
+    """Whether lower scores are preferable. Higher scores are by default."""
+
     none_is_winner: bool = False
+    """Whether a value of None is considered better than other scores.
+       By default it is not."""
+
     version: str = ''
+    """To change high-score lists used by a game without renaming the game,
+       change this. Defaults to an empty string."""
diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py
index 9bf62082..32041f9b 100644
--- a/assets/src/ba_data/python/ba/_session.py
+++ b/assets/src/ba_data/python/ba/_session.py
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 class Session:
     """Defines a high level series of ba.Activity-es with a common purpose.
 
-    category: Gameplay Classes
+    Category: Gameplay Classes
 
     Examples of sessions are ba.FreeForAllSession, ba.DualTeamSession, and
     ba.CoopSession.
@@ -27,58 +27,48 @@ class Session:
     A Session is responsible for wrangling and transitioning between various
     ba.Activity instances such as mini-games and score-screens, and for
     maintaining state between them (players, teams, score tallies, etc).
-
-    Attributes:
-
-        sessionteams
-            All the ba.SessionTeams in the Session. Most things should use the
-            list of ba.Team-s in ba.Activity; not this.
-
-        sessionplayers
-            All ba.SessionPlayers in the Session. Most things should use the
-            list of ba.Player-s in ba.Activity; not this. Some players, such as
-            those who have not yet selected a character, will only be
-            found on this list.
-
-        min_players
-            The minimum number of players who must be present for the Session
-            to proceed past the initial joining screen.
-
-        max_players
-            The maximum number of players allowed in the Session.
-
-        lobby
-            The ba.Lobby instance where new ba.Player-s go to select a
-            Profile/Team/etc. before being added to games.
-            Be aware this value may be None if a Session does not allow
-            any such selection.
-
-        use_teams
-            Whether this session groups players into an explicit set of
-            teams. If this is off, a unique team is generated for each
-            player that joins.
-
-        use_team_colors
-            Whether players on a team should all adopt the colors of that
-            team instead of their own profile colors. This only applies if
-            use_teams is enabled.
-
-        customdata
-            A shared dictionary for objects to use as storage on this session.
-            Ensure that keys here are unique to avoid collisions.
-
     """
-    use_teams: bool = False
-    use_team_colors: bool = True
 
-    # Note: even though these are instance vars, we annotate them at the
-    # class level so that docs generation can access their types.
+    use_teams: bool = False
+    """Whether this session groups players into an explicit set of
+       teams. If this is off, a unique team is generated for each
+       player that joins."""
+
+    use_team_colors: bool = True
+    """Whether players on a team should all adopt the colors of that
+       team instead of their own profile colors. This only applies if
+       use_teams is enabled."""
+
+    # Note: even though these are instance vars, we annotate and document them
+    # at the class level so that looks better and nobody get lost while
+    # reading large __init__
+
     lobby: ba.Lobby
+    """The ba.Lobby instance where new ba.Player-s go to select a
+       Profile/Team/etc. before being added to games.
+       Be aware this value may be None if a Session does not allow
+       any such selection."""
+
     max_players: int
+    """The maximum number of players allowed in the Session."""
+
     min_players: int
+    """The minimum number of players who must be present for the Session
+       to proceed past the initial joining screen"""
+
     sessionplayers: list[ba.SessionPlayer]
+    """All ba.SessionPlayers in the Session. Most things should use the
+       list of ba.Player-s in ba.Activity; not this. Some players, such as
+       those who have not yet selected a character, will only be
+       found on this list."""
+
     customdata: dict
+    """A shared dictionary for objects to use as storage on this session.
+       Ensure that keys here are unique to avoid collisions."""
+
     sessionteams: list[ba.SessionTeam]
+    """All the ba.SessionTeams in the Session. Most things should use the
+       list of ba.Team-s in ba.Activity; not this."""
 
     def __init__(self,
                  depsets: Sequence[ba.DependencySet],
diff --git a/assets/src/ba_data/python/ba/_stats.py b/assets/src/ba_data/python/ba/_stats.py
index 486a39e2..675bfeb5 100644
--- a/assets/src/ba_data/python/ba/_stats.py
+++ b/assets/src/ba_data/python/ba/_stats.py
@@ -22,13 +22,10 @@ class PlayerScoredMessage:
     """Informs something that a ba.Player scored.
 
     Category: Message Classes
-
-    Attributes:
-
-        score
-            The score value.
     """
+
     score: int
+    """The score value."""
 
 
 class PlayerRecord:
@@ -232,7 +229,7 @@ class PlayerRecord:
 class Stats:
     """Manages scores and statistics for a ba.Session.
 
-    category: Gameplay Classes
+    Category: Gameplay Classes
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/pdoc/templates/module.html.jinja2 b/assets/src/pdoc/templates/module.html.jinja2
new file mode 100644
index 00000000..426cfd51
--- /dev/null
+++ b/assets/src/pdoc/templates/module.html.jinja2
@@ -0,0 +1,20 @@
+{% extends "default/module.html.jinja2" %}
+
+{% block style_content %}
+    {{ super() }}
+    /* Docstrings */
+    <style>
+        .pdoc .docstring {
+            margin-bottom: 1.5rem;
+            margin-left: 2rem;
+        }
+    </style>
+{% endblock %}
+
+{% macro is_public(doc) %}
+    {% if "(internal)" in doc.docstring %}
+        {# Returning no text is interpreted as false #}
+    {% else %}
+        {{ default_is_public(doc) }}
+    {% endif %}
+{% endmacro %}
diff --git a/src/ballistica/python/class/python_class_collide_model.cc b/src/ballistica/python/class/python_class_collide_model.cc
index ca73aa7a..71b3237c 100644
--- a/src/ballistica/python/class/python_class_collide_model.cc
+++ b/src/ballistica/python/class/python_class_collide_model.cc
@@ -25,9 +25,9 @@ void PythonClassCollideModel::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a collide-model.\n"
       "\n"
-      "Category: Asset Classes\n"
+      "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getcollidemodel() to instantiate one.";
+      "Use ba.getcollidemodel to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_context.cc b/src/ballistica/python/class/python_class_context.cc
index c3ec6879..2948c930 100644
--- a/src/ballistica/python/class/python_class_context.cc
+++ b/src/ballistica/python/class/python_class_context.cc
@@ -19,7 +19,7 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "\n"
       "A game context state.\n"
       "\n"
-      "Category: General Utility Classes\n"
+      "Category: **General Utility Classes**\n"
       "\n"
       "Many operations such as ba.newnode or ba.gettexture operate\n"
       "implicitly on the current context. Each ba.Activity has its own\n"
@@ -30,46 +30,43 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "since timers and other callbacks will take care of saving and\n"
       "restoring the context automatically, but there may be rare cases where\n"
       "you need to deal with them, such as when loading media in for use in\n"
-      "the UI (there is a special 'ui' context for all user-interface-related\n"
-      "functionality)\n"
+      "the UI (there is a special `'ui'` context for all\n"
+      "user-interface-related functionality).\n"
       "\n"
-      "When instantiating a ba.Context instance, a single ``'source'`` "
+      "When instantiating a ba.Context instance, a single `'source'` "
       "argument\n"
       "is passed, which can be one of the following strings/objects:\n\n"
-      "``'empty'``:\n"
-      "  Gives an empty context; it can be handy to run code here to ensure\n"
-      "  it does no loading of media, creation of nodes, etc.\n"
+      "`'empty'`:\n"
+      "> Gives an empty context; it can be handy to run code here to ensure\n"
+      "it does no loading of media, creation of nodes, etc.\n"
       "\n"
-      "``'current'``:\n"
-      "  Sets the context object to the current context.\n"
+      "###### `'current'`\n"
+      "> Sets the context object to the current context.\n"
       "\n"
-      "``'ui'``:\n"
-      "  Sets to the UI context. UI functions as well as loading of media to\n"
-      "  be used in said functions must happen in the UI context.\n"
+      "###### `'ui'`\n"
+      "> Sets to the UI context. UI functions as well as loading of media to\n"
+      "be used in said functions must happen in the UI context.\n"
       "\n"
-      "A ba.Activity instance:\n"
-      "  Gives the context for the provided ba.Activity.\n"
+      "###### A ba.Activity instance\n"
+      "> Gives the context for the provided ba.Activity.\n"
       "  Most all code run during a game happens in an Activity's Context.\n"
       "\n"
-      "A ba.Session instance:\n"
-      "  Gives the context for the provided ba.Session.\n"
-      "  Generally a user should not need to run anything here.\n"
+      "###### A ba.Session instance\n"
+      "> Gives the context for the provided ba.Session.\n"
+      "Generally a user should not need to run anything here.\n"
       "\n"
       "\n"
-      "Usage:\n"
-      "    Contexts are generally used with the python 'with' statement, "
-      "which\n"
-      "    sets the context as current on entry and resets it to the previous\n"
-      "    value on exit.\n"
+      "##### Usage\n"
+      "Contexts are generally used with the python 'with' statement, which\n"
+      "sets the context as current on entry and resets it to the previous\n"
+      "value on exit.\n"
       "\n"
-      "Example:\n"
-      "    Load a few textures into the UI context\n"
-      "    (for use in widgets, etc):\n"
-      "    ```python\n"
-      "    >>> with ba.Context('ui'):\n"
-      "    ...     tex1 = ba.gettexture('foo_tex_1')\n"
-      "    ...     tex2 = ba.gettexture('foo_tex_2')\n"
-      "    ```\n";
+      "##### Example\n"
+      "Load a few textures into the UI context\n"
+      "(for use in widgets, etc):\n"
+      ">>> with ba.Context('ui'):\n"
+      "...     tex1 = ba.gettexture('foo_tex_1')\n"
+      "...     tex2 = ba.gettexture('foo_tex_2')\n";
 
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_context_call.cc b/src/ballistica/python/class/python_class_context_call.cc
index c0f304c3..3121198a 100644
--- a/src/ballistica/python/class/python_class_context_call.cc
+++ b/src/ballistica/python/class/python_class_context_call.cc
@@ -16,7 +16,7 @@ void PythonClassContextCall::SetupType(PyTypeObject* obj) {
       "\n"
       "A context-preserving callable.\n"
       "\n"
-      "Category: General Utility Classes\n"
+      "Category: **General Utility Classes**\n"
       "\n"
       "A ContextCall wraps a callable object along with a reference\n"
       "to the current context (see ba.Context); it handles restoring the\n"
@@ -38,23 +38,20 @@ void PythonClassContextCall::SetupType(PyTypeObject* obj) {
       "shutdown, whereas ba.WeakCall simply looks at whether the target\n"
       "object still exists.\n"
       "\n"
-      "Examples:\n"
-      "    Example A: code like this can inadvertently prevent our activity\n"
-      "    (self) from ending until the operation completes, since the bound\n"
-      "    method we're passing (self.dosomething) contains a "
-      "strong-reference\n"
-      "    to self).\n"
-      "    >>> start_some_long_action(callback_when_done=self.dosomething)\n"
+      "##### Examples\n"
+      "**Example A:** code like this can inadvertently prevent our activity\n"
+      "(self) from ending until the operation completes, since the bound\n"
+      "method we're passing (self.dosomething) contains a strong-reference\n"
+      "to self).\n"
+      ">>> start_some_long_action(callback_when_done=self.dosomething)\n"
       "\n"
-      "    Example B: in this case our activity (self) can still die\n"
-      "    properly; the callback will clear itself when the activity starts\n"
-      "    shutting down, becoming a harmless no-op and releasing the "
-      "reference\n"
-      "    to our activity.\n"
-      "    ```python\n"
-      "    >>> start_long_action(\n"
-      "    ...     callback_when_done=ba.ContextCall(self.mycallback))\n"
-      "    ```\n";
+      "**Example B:** in this case our activity (self) can still die\n"
+      "properly; the callback will clear itself when the activity starts\n"
+      "shutting down, becoming a harmless no-op and releasing the reference\n"
+      "to our activity.\n"
+      "\n"
+      ">>> start_long_action(\n"
+      "...     callback_when_done=ba.ContextCall(self.mycallback))\n";
 
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_data.cc b/src/ballistica/python/class/python_class_data.cc
index 5dbee6b9..eb27df33 100644
--- a/src/ballistica/python/class/python_class_data.cc
+++ b/src/ballistica/python/class/python_class_data.cc
@@ -24,9 +24,9 @@ void PythonClassData::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a data object.\n"
       "\n"
-      "Category: Asset Classes\n"
+      "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getdata() to instantiate one.";
+      "Use ba.getdata to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_input_device.cc b/src/ballistica/python/class/python_class_input_device.cc
index d4c46d91..61635f8e 100644
--- a/src/ballistica/python/class/python_class_input_device.cc
+++ b/src/ballistica/python/class/python_class_input_device.cc
@@ -19,7 +19,7 @@ void PythonClassInputDevice::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "An input-device such as a gamepad, touchscreen, or keyboard.\n"
       "\n"
-      "Category: Gameplay Classes\n"
+      "Category: **Gameplay Classes**\n"
       "\n"
       "Attributes:\n"
       "\n"
diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index d2d0c49c..f5d651e5 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -280,147 +280,151 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "\n"
      "Add one or more actions to the material, optionally with conditions.\n"
      "\n"
-     "Conditions:\n"
-     "    Conditions are provided as tuples which can be combined\n"
-     "    to form boolean logic. A single condition might look like\n"
-     "    ``('condition_name', cond_arg)``, or a more complex nested one\n"
-     "    might look like ``(('some_condition', cond_arg), 'or',\n"
-     "    ('another_condition', cond2_arg))``.\n"
+     "##### Conditions\n"
+     "Conditions are provided as tuples which can be combined\n"
+     "to form boolean logic. A single condition might look like\n"
+     "`('condition_name', cond_arg)`, or a more complex nested one\n"
+     "might look like `(('some_condition', cond_arg), 'or',\n"
+     "('another_condition', cond2_arg))`.\n"
      "\n"
-     "    ``'and'``, ``'or'``, and ``'xor'`` are available to chain\n"
-     "   together 2 conditions, as seen above.\n"
+     "`'and'`, `'or'`, and `'xor'` are available to chain\n"
+     "together 2 conditions, as seen above.\n"
      "\n"
-     "Available Conditions:\n"
-     "    ``('they_have_material', material)`` - does the part we\'re\n"
-     "    hitting have a given ba.Material?\n"
+     "##### Available Conditions\n"
+     "###### `('they_have_material', material)`\n"
+     "> Does the part we\'re hitting have a given ba.Material?\n"
      "\n"
-     "    ``('they_dont_have_material', material)`` - does the part we\'re\n"
-     "    hitting not have a given ba.Material?\n"
+     "###### `('they_dont_have_material', material)`\n"
+     "> Does the part we\'re hitting not have a given ba.Material?\n"
      "\n"
-     "    ``('eval_colliding')`` - is ``'collide'`` true at this point\n"
-     "    in material evaluation? (see the modify_part_collision action)\n"
+     "###### `('eval_colliding')`\n"
+     "> Is `'collide'` true at this point\n"
+     "in material evaluation? (see the `modify_part_collision` action)\n"
      "\n"
-     "    ``('eval_not_colliding')`` - is 'collide' false at this point\n"
-     " in material evaluation? (see the modify_part_collision action)\n"
+     "###### `('eval_not_colliding')`\n"
+     "> Is 'collide' false at this point\n"
+     "in material evaluation? (see the `modify_part_collision` action)\n"
      "\n"
-     "    ``('we_are_younger_than', age)`` - is our part younger than\n"
-     "    ``'age'`` (in milliseconds)?\n"
+     "###### `('we_are_younger_than', age)`\n"
+     "> Is our part younger than `age` (in milliseconds)?\n"
      "\n"
-     "    ``('we_are_older_than', age)`` - is our part older than ``'age'``\n"
-     "    (in milliseconds)?\n"
+     "###### `('we_are_older_than', age)`\n"
+     "> Is our part older than `age` (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_younger_than', age)`` - is the part we're hitting\n"
-     "    younger than ``'age'`` (in milliseconds)?\n"
+     "###### `('they_are_younger_than', age)`\n"
+     "> Is the part we're hitting younger than `age` (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_older_than', age)`` - is the part we're hitting\n"
-     "    older than ``'age'`` (in milliseconds)?\n"
+     "###### `('they_are_older_than', age)`\n"
+     "> Is the part we're hitting older than `age` (in milliseconds)?\n"
      "\n"
-     "    ``('they_are_same_node_as_us')`` - does the part we're hitting\n"
-     "    belong to the same ba.Node as us?\n"
+     "###### `('they_are_same_node_as_us')`\n"
+     "> Does the part we're hitting belong to the same ba.Node as us?\n"
      "\n"
-     "    ``('they_are_different_node_than_us')`` - does the part we're\n"
-     "    hitting belong to a different ba.Node than us?\n"
+     "###### `('they_are_different_node_than_us')`\n"
+     "> Does the part we're hitting belong to a different ba.Node than us?\n"
      "\n"
-     "Actions:\n"
-     "    In a similar manner, actions are specified as tuples.\n"
-     "    Multiple actions can be specified by providing a tuple\n"
-     "    of tuples.\n"
+     "##### Actions\n"
+     "In a similar manner, actions are specified as tuples.\n"
+     "Multiple actions can be specified by providing a tuple\n"
+     "of tuples.\n"
      "\n"
-     "Available Actions:\n"
-     "    ``('call', when, callable)`` - calls the provided callable;\n"
-     "    ``'when'`` can be either ``'at_connect'`` or ``'at_disconnect'``.\n"
-     "    ``'at_connect'`` means to fire\n"
-     "    when the two parts first come in contact; ``'at_disconnect'``\n"
-     "    means to fire once they cease being in contact.\n"
+     "##### Available Actions\n"
+     "###### `('call', when, callable)`\n"
+     "> Calls the provided callable;\n"
+     "`when` can be either `'at_connect'` or `'at_disconnect'`.\n"
+     "`'at_connect'` means to fire\n"
+     "when the two parts first come in contact; `'at_disconnect'`\n"
+     "means to fire once they cease being in contact.\n"
      "\n"
-     "    ``('message', who, when, message_obj)`` - sends a message object;\n"
-     "    ``'who'`` can\n"
-     "    be either ``'our_node'`` or ``'their_node'``, ``'when'`` can be\n"
-     "    ``'at_connect'`` or\n"
-     "    ``'at_disconnect'``, and message_obj is the message object to send.\n"
-     "    This has the same effect as calling the node's\n"
-     "    ba.Node.handlemessage method.\n"
+     "###### `('message', who, when, message_obj)`\n"
+     "> Sends a message object;\n"
+     "`who` can be either `'our_node'` or `'their_node'`, `when` can be\n"
+     "`'at_connect'` or `'at_disconnect'`, and `message_obj` is the message\n"
+     "object to send.\n"
+     "This has the same effect as calling the node's\n"
+     "ba.Node.handlemessage method.\n"
      "\n"
-     "    ``('modify_part_collision', attr, value)`` - changes some\n"
-     "    characteristic of the physical collision that will occur between\n"
-     "    our part and their part. This change will remain in effect as\n"
-     "    long as the two parts remain overlapping. This means if you have a\n"
-     "    part with a material that turns ``'collide'`` off against parts\n"
-     "    younger than 100ms, and it touches another part that is 50ms old,\n"
-     "    it will continue to not collide with that part until they separate,\n"
-     "    even if the 100ms threshold is passed. Options for attr/value are:\n"
-     "    ``'physical'`` (boolean value; whether a *physical* response will\n"
-     "    occur at all), ``'friction'`` (float value; how friction-y the\n"
-     "    physical response will be), ``'collide'`` (boolean value;\n"
-     "    whether *any* collision will occur at all, including non-physical\n"
-     "    stuff like callbacks), ``'use_node_collide'``\n"
-     "    (boolean value; whether to honor modify_node_collision\n"
-     "    overrides for this collision), ``'stiffness'`` (float value,\n"
-     "    how springy the physical response is), ``'damping'`` (float\n"
-     "    value, how damped the physical response is), ``'bounce'`` (float\n"
-     "    value; how bouncy the physical response is)."
+     "###### `('modify_part_collision', attr, value)`\n"
+     "> Changes some\n"
+     "characteristic of the physical collision that will occur between\n"
+     "our part and their part. This change will remain in effect as\n"
+     "long as the two parts remain overlapping. This means if you have a\n"
+     "part with a material that turns `'collide'` off against parts\n"
+     "younger than 100ms, and it touches another part that is 50ms old,\n"
+     "it will continue to not collide with that part until they separate,\n"
+     "even if the 100ms threshold is passed. Options for attr/value are:\n"
+     "`'physical'` (boolean value; whether a *physical* response will\n"
+     "occur at all), `'friction'` (float value; how friction-y the\n"
+     "physical response will be), `'collide'` (boolean value;\n"
+     "whether *any* collision will occur at all, including non-physical\n"
+     "stuff like callbacks), `'use_node_collide'`\n"
+     "(boolean value; whether to honor modify_node_collision\n"
+     "overrides for this collision), `'stiffness'` (float value,\n"
+     "how springy the physical response is), `'damping'` (float\n"
+     "value, how damped the physical response is), `'bounce'` (float\n"
+     "value; how bouncy the physical response is)."
      "\n"
-     "    ``('modify_node_collision', attr, value)`` - similar to\n"
-     "    ``modify_part_collision``, but operates at a node-level.\n"
-     "    collision attributes set here will remain in effect as long as\n"
-     "    *anything* from our part's node and their part's node overlap.\n"
-     "    A key use of this functionality is to prevent new nodes from\n"
-     "    colliding with each other if they appear overlapped;\n"
-     "    if ``modify_part_collision`` is used, only the individual\n"
-     "    parts that were overlapping would avoid contact, but other parts\n"
-     "    could still contact leaving the two nodes 'tangled up'. Using\n"
-     "    ``modify_node_collision ensures`` that the nodes must completely\n"
-     "    separate before they can start colliding.  Currently the only attr\n"
-     "    available here is ``'collide'`` (a boolean value).\n"
+     "###### `('modify_node_collision', attr, value)`\n"
+     "> Similar to\n"
+     "`modify_part_collision`, but operates at a node-level.\n"
+     "collision attributes set here will remain in effect as long as\n"
+     "*anything* from our part's node and their part's node overlap.\n"
+     "A key use of this functionality is to prevent new nodes from\n"
+     "colliding with each other if they appear overlapped;\n"
+     "if `modify_part_collision` is used, only the individual\n"
+     "parts that were overlapping would avoid contact, but other parts\n"
+     "could still contact leaving the two nodes 'tangled up'. Using\n"
+     "`modify_node_collision` ensures that the nodes must completely\n"
+     "separate before they can start colliding. Currently the only attr\n"
+     "available here is `'collide'` (a boolean value).\n"
      "\n"
-     "    ``('sound', sound, volume)`` - plays a ba.Sound when a collision\n"
-     "    occurs, at a given volume, regardless of the collision speed/etc.\n"
+     "###### `('sound', sound, volume)`\n"
+     "> Plays a ba.Sound when a collision\n"
+     "occurs, at a given volume, regardless of the collision speed/etc.\n"
      "\n"
-     "    ``('impact_sound', sound, targetImpulse, volume)`` - plays a sound\n"
-     "    when a collision occurs, based on the speed of impact.\n"
-     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
+     "###### `('impact_sound', sound, targetImpulse, volume)`\n"
+     "> Plays a sound\n"
+     "when a collision occurs, based on the speed of impact.\n"
+     "Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "    ``('skid_sound', sound, targetImpulse, volume)`` - plays a sound\n"
-     "    during a collision when parts are 'scraping' against each other.\n"
-     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
+     "###### `('skid_sound', sound, targetImpulse, volume)`\n"
+     "> Plays a sound\n"
+     "during a collision when parts are 'scraping' against each other.\n"
+     "Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "  ``('roll_sound', sound, targetImpulse, volume)`` - plays a sound\n"
-     "    during a collision when parts are 'rolling' against each other.\n"
-     "    Provide a ba.Sound, a target-impulse, and a volume.\n"
+     "###### `('roll_sound', sound, targetImpulse, volume)`\n"
+     "> Plays a sound\n"
+     "during a collision when parts are 'rolling' against each other.\n"
+     "Provide a ba.Sound, a target-impulse, and a volume.\n"
      "\n"
-     "Examples:\n"
-     "    example 1: create a material that lets us ignore\n"
-     "    collisions against any nodes we touch in the first\n"
-     "    100 ms of our existence; handy for preventing us from\n"
-     "    exploding outward if we spawn on top of another object:\n"
-     "    ```python\n"
-     "    >>> m = ba.Material()\n"
-     "    ... m.add_actions(\n"
-     "    ...     conditions=(('we_are_younger_than', 100),\n"
-     "    ...                 'or', ('they_are_younger_than', 100)),\n"
-     "    ...     actions=('modify_node_collision', 'collide', False))\n"
-     "    ```\n"
+     "##### Examples\n"
+     "**Example 1:** create a material that lets us ignore\n"
+     "collisions against any nodes we touch in the first\n"
+     "100 ms of our existence; handy for preventing us from\n"
+     "exploding outward if we spawn on top of another object:\n"
+     ">>> m = ba.Material()\n"
+     "... m.add_actions(\n"
+     "...     conditions=(('we_are_younger_than', 100),\n"
+     "...                 'or', ('they_are_younger_than', 100)),\n"
+     "...     actions=('modify_node_collision', 'collide', False))\n"
      "\n"
-     "    example 2: send a ba.DieMessage to anything we touch, but cause\n"
-     "    no physical response. This should cause any ba.Actor to drop dead:\n"
-     "    ```python\n"
-     "    >>> m = ba.Material()\n"
-     "    ... m.add_actions(\n"
-     "    ...     actions=(('modify_part_collision', 'physical', False),\n"
-     "    ...              ('message', 'their_node', 'at_connect',\n"
-     "    ...                  ba.DieMessage())))\n"
-     "    ```\n"
+     "**Example 2:** send a ba.DieMessage to anything we touch, but cause\n"
+     "no physical response. This should cause any ba.Actor to drop dead:\n"
+     "```python\n"
+     ">>> m = ba.Material()\n"
+     "... m.add_actions(\n"
+     "...     actions=(('modify_part_collision', 'physical', False),\n"
+     "...              ('message', 'their_node', 'at_connect',\n"
+     "...                  ba.DieMessage())))\n"
      "\n"
-     "    example 3: play some sounds when we're contacting the ground:\n"
-     "    ```python\n"
-     "    >>> m = ba.Material()\n"
-     "    ... m.add_actions(\n"
-     "    ...     conditions=('they_have_material',\n"
-     "                        shared.footing_material),\n"
-     "    ...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),\n"
-     "    ...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))\n"
-     "    ```\n"
-     "\n"},
+     "**Example 3:** play some sounds when we're contacting the ground:\n"
+     "```python\n"
+     ">>> m = ba.Material()\n"
+     "... m.add_actions(\n"
+     "...     conditions=('they_have_material',\n"
+     "...                 shared.footing_material),\n"
+     "...     actions=(('impact_sound', ba.getsound('metalHit'), 2, 5),\n"
+     "...              ('skid_sound', ba.getsound('metalSkid'), 2, 5)))\n"},
     {"__dir__", (PyCFunction)Dir, METH_NOARGS,
      "allows inclusion of our custom attrs in standard python dir()"},
 
diff --git a/src/ballistica/python/class/python_class_model.cc b/src/ballistica/python/class/python_class_model.cc
index 5680716c..dc540a78 100644
--- a/src/ballistica/python/class/python_class_model.cc
+++ b/src/ballistica/python/class/python_class_model.cc
@@ -24,7 +24,7 @@ void PythonClassModel::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a model.\n"
       "\n"
-      "Category: Asset Classes\n"
+      "Category: **Asset Classes**\n"
       "\n"
       "Models are used for drawing.\n"
       "Use ba.getmodel() to instantiate one.";
diff --git a/src/ballistica/python/class/python_class_node.cc b/src/ballistica/python/class/python_class_node.cc
index 0479ad15..684b7891 100644
--- a/src/ballistica/python/class/python_class_node.cc
+++ b/src/ballistica/python/class/python_class_node.cc
@@ -34,8 +34,8 @@ void PythonClassNode::SetupType(PyTypeObject* obj) {
       "to a game node; *not* the node itself. This means a Node's\n"
       "lifecycle is completely independent of how many Python references\n"
       "to it exist. To explicitly add a new node to the game, use\n"
-      "ba.newnode(), and to explicitly delete one, use ba.Node.delete().\n"
-      "ba.Node.exists() can be used to determine if a Node still points to\n"
+      "ba.newnode, and to explicitly delete one, use ba.Node.delete.\n"
+      "ba.Node.exists can be used to determine if a Node still points to\n"
       "a live node in the game.\n"
       "\n"
       "You can use ba.Node(None) to instantiate an invalid\n"
@@ -413,7 +413,7 @@ PyMethodDef PythonClassNode::tp_methods[] = {
     {"delete", (PyCFunction)Delete, METH_VARARGS | METH_KEYWORDS,
      "delete(ignore_missing: bool = True) -> None\n"
      "\n"
-     "Delete the node.  Ignores already-deleted nodes if ignore_missing\n"
+     "Delete the node. Ignores already-deleted nodes if `ignore_missing`\n"
      "is True; otherwise a ba.NodeNotFoundError is thrown."},
     {"handlemessage", (PyCFunction)HandleMessage, METH_VARARGS,
      "handlemessage(*args: Any) -> None\n"
@@ -423,7 +423,7 @@ PyMethodDef PythonClassNode::tp_methods[] = {
      "All standard message objects are forwarded along to the ba.Node's\n"
      "delegate for handling (generally the ba.Actor that made the node).\n"
      "\n"
-     "ba.Nodes are unique, however, in that they can be passed a second\n"
+     "ba.Node-s are unique, however, in that they can be passed a second\n"
      "form of message; 'node-messages'.  These consist of a string type-name\n"
      "as a first argument along with the args specific to that type name\n"
      "as additional arguments.\n"
@@ -445,13 +445,11 @@ PyMethodDef PythonClassNode::tp_methods[] = {
      "setting the target attribute to any value or connecting another\n"
      "node attribute to it.\n"
      "\n"
-     "Example:\n"
-     "    Create a locator and attach a light to it:\n"
-     "    ```python\n"
-     "    >>> light = ba.newnode('light')\n"
-     "    ... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})\n"
-     "    ... loc.connectattr('position', light, 'position')\n"
-     "    ```\n"},
+     "##### Example\n"
+     "Create a locator and attach a light to it:\n"
+     ">>> light = ba.newnode('light')\n"
+     "... loc = ba.newnode('locator', attrs={'position': (0, 10, 0)})\n"
+     "... loc.connectattr('position', light, 'position')\n"},
     {"__dir__", (PyCFunction)Dir, METH_NOARGS,
      "allows inclusion of our custom attrs in standard python dir()"},
     {nullptr}};
diff --git a/src/ballistica/python/class/python_class_session_player.cc b/src/ballistica/python/class/python_class_session_player.cc
index dec924be..8f914a77 100644
--- a/src/ballistica/python/class/python_class_session_player.cc
+++ b/src/ballistica/python/class/python_class_session_player.cc
@@ -46,14 +46,14 @@ void PythonClassSessionPlayer::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a player in the ba.Session.\n"
       "\n"
-      "Category: Gameplay Classes\n"
+      "Category: **Gameplay Classes**\n"
       "\n"
       "These are created and managed internally and\n"
-      "provided to your Session/Activity instances.\n"
+      "provided to your ba.Session/ba.Activity instances.\n"
       "Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'\n"
       "references under-the-hood; a player can leave the game at\n"
       " any point. For this reason, you should make judicious use of the\n"
-      "ba.SessionPlayer.exists() method (or boolean operator) to ensure\n"
+      "ba.SessionPlayer.exists method (or boolean operator) to ensure\n"
       "that a SessionPlayer is still present if retaining references to one\n"
       "for any length of time.\n"
       "\n"
diff --git a/src/ballistica/python/class/python_class_sound.cc b/src/ballistica/python/class/python_class_sound.cc
index 171dce90..52a58545 100644
--- a/src/ballistica/python/class/python_class_sound.cc
+++ b/src/ballistica/python/class/python_class_sound.cc
@@ -24,9 +24,9 @@ void PythonClassSound::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a sound.\n"
       "\n"
-      "Category: Asset Classes\n"
+      "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getsound() to instantiate one.";
+      "Use ba.getsound to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_texture.cc b/src/ballistica/python/class/python_class_texture.cc
index 1a21273a..3222cc88 100644
--- a/src/ballistica/python/class/python_class_texture.cc
+++ b/src/ballistica/python/class/python_class_texture.cc
@@ -24,7 +24,7 @@ void PythonClassTexture::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A reference to a texture.\n"
       "\n"
-      "Category: Asset Classes\n"
+      "Category: **Asset Classes**\n"
       "\n"
       "Use ba.gettexture() to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
diff --git a/src/ballistica/python/class/python_class_timer.cc b/src/ballistica/python/class/python_class_timer.cc
index 37809f38..0db4695f 100644
--- a/src/ballistica/python/class/python_class_timer.cc
+++ b/src/ballistica/python/class/python_class_timer.cc
@@ -19,7 +19,7 @@ void PythonClassTimer::SetupType(PyTypeObject* obj) {
       "\n"
       "Timers are used to run code at later points in time.\n"
       "\n"
-      "Category: General Utility Classes\n"
+      "Category: **General Utility Classes**\n"
       "\n"
       "This class encapsulates a timer in the current ba.Context.\n"
       "The underlying timer will be destroyed when either this object is\n"
@@ -27,38 +27,41 @@ void PythonClassTimer::SetupType(PyTypeObject* obj) {
       "do not want to worry about keeping a reference to your timer around,\n"
       "you should use the ba.timer() function instead.\n"
       "\n"
-      "time: length of time (in seconds by default) that the timer will wait\n"
+      "###### time\n"
+      "> Length of time (in seconds by default) that the timer will wait\n"
       "before firing. Note that the actual delay experienced may vary\n"
       "depending on the timetype. (see below)\n"
       "\n"
-      "call: A callable Python object. Note that the timer will retain a\n"
+      "###### call\n"
+      "> A callable Python object. Note that the timer will retain a\n"
       "strong reference to the callable for as long as it exists, so you\n"
       "may want to look into concepts such as ba.WeakCall if that is not\n"
       "desired.\n"
       "\n"
-      "repeat: if True, the timer will fire repeatedly, with each successive\n"
+      "###### repeat\n"
+      "> If True, the timer will fire repeatedly, with each successive\n"
       "firing having the same delay as the first.\n"
       "\n"
-      "timetype: A ba.TimeType value determining which timeline the timer is\n"
+      "###### timetype\n"
+      "> A ba.TimeType value determining which timeline the timer is\n"
       "placed onto.\n"
       "\n"
-      "timeformat: A ba.TimeFormat value determining how the passed time is\n"
+      "###### timeformat\n"
+      "> A ba.TimeFormat value determining how the passed time is\n"
       "interpreted.\n"
       "\n"
-      "Example:\n"
-      "    Use a Timer object to print repeatedly for a few seconds:\n"
-      "    ```python\n"
-      "    >>> def say_it():\n"
-      "    ...     ba.screenmessage('BADGER!')\n"
-      "    ... def stop_saying_it():\n"
-      "    ...     self.t = None\n"
-      "    ... ba.screenmessage('MUSHROOM MUSHROOM!')\n"
-      "    ... # Create our timer; it will run as long as we have the self.t "
-      "ref.\n"
-      "    ... self.t = ba.Timer(0.3, say_it, repeat=True)\n"
-      "    ... # Now fire off a one-shot timer to kill it.\n"
-      "    ... ba.timer(3.89, stop_saying_it)\n"
-      "    ```\n";
+      "##### Example\n"
+      "\n"
+      "Use a Timer object to print repeatedly for a few seconds:\n"
+      ">>> def say_it():\n"
+      "...     ba.screenmessage('BADGER!')\n"
+      "... def stop_saying_it():\n"
+      "...     self.t = None\n"
+      "... ba.screenmessage('MUSHROOM MUSHROOM!')\n"
+      "... # Create our timer; it will run as long as we have the self.t ref.\n"
+      "... self.t = ba.Timer(0.3, say_it, repeat=True)\n"
+      "... # Now fire off a one-shot timer to kill it.\n"
+      "... ba.timer(3.89, stop_saying_it)\n";
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
 }
diff --git a/src/ballistica/python/class/python_class_vec3.cc b/src/ballistica/python/class/python_class_vec3.cc
index 1955f398..b74ca9b4 100644
--- a/src/ballistica/python/class/python_class_vec3.cc
+++ b/src/ballistica/python/class/python_class_vec3.cc
@@ -29,7 +29,7 @@ void PythonClassVec3::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "A vector of 3 floats.\n"
       "\n"
-      "Category: General Utility Classes\n"
+      "Category: **General Utility Classes**\n"
       "\n"
       "These can be created the following ways (checked in this order):\n"
       "- with no args, all values are set to 0\n"
diff --git a/src/ballistica/python/class/python_class_widget.cc b/src/ballistica/python/class/python_class_widget.cc
index c9c3a1e8..2008afe2 100644
--- a/src/ballistica/python/class/python_class_widget.cc
+++ b/src/ballistica/python/class/python_class_widget.cc
@@ -22,11 +22,11 @@ void PythonClassWidget::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "Internal type for low level UI elements; buttons, windows, etc.\n"
       "\n"
-      "Category: User Interface Classes\n"
+      "Category: **User Interface Classes**\n"
       "\n"
       "This class represents a weak reference to a widget object\n"
-      "in the internal c++ layer. Currently, functions such as\n"
-      "ba.buttonwidget() must be used to instantiate or edit these.";
+      "in the internal C++ layer. Currently, functions such as\n"
+      "ba.buttonwidget must be used to instantiate or edit these.";
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
   obj->tp_repr = (reprfunc)tp_repr;
diff --git a/src/ballistica/python/methods/python_methods_app.cc b/src/ballistica/python/methods/python_methods_app.cc
index e40c7e88..b9830b18 100644
--- a/src/ballistica/python/methods/python_methods_app.cc
+++ b/src/ballistica/python/methods/python_methods_app.cc
@@ -926,7 +926,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "log(message: str, to_stdout: bool = True,\n"
          "    to_server: bool = True) -> None\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "Log a message. This goes to the default logging mechanism depending\n"
          "on the platform (stdout on mac, android log on android, etc).\n"
@@ -989,7 +989,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Quit the game.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "On systems like android, 'soft' will end the activity but keep the\n"
          "app running."},
@@ -1003,7 +1003,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Print a message to the local client's screen, in a given color.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "If 'top' is True, the message will go to the top message area.\n"
          "For 'top' messages, 'image' can be a texture to display alongside "
@@ -1027,41 +1027,34 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Schedule a call to run at a later point in time.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "This function adds a timer to the current ba.Context.\n"
          "This timer cannot be canceled or modified once created. If you\n"
          " require the ability to do so, use the ba.Timer class instead.\n"
          "\n"
-         "Arguments:\n"
-         "    time (float):\n"
-         "        Length of time (in seconds by default) that the timer will "
-         "wait\n"
-         "        before firing. Note that the actual delay experienced may "
-         "vary\n "
-         "        depending on the timetype. (see below)\n"
+         "##### Arguments\n"
+         "###### time (float):\n"
+         "> Length of time (in seconds by default) that the timer will wait\n"
+         "before firing. Note that the actual delay experienced may vary\n "
+         "depending on the timetype. (see below)\n"
          "\n"
-         "    call (Callable[[], Any]):\n"
-         "        A callable Python object. Note that the timer will retain a\n"
-         "        strong reference to the callable for as long as it exists, "
-         "so you\n"
-         "        may want to look into concepts such as ba.WeakCall if that "
-         "is not\n"
-         "        desired.\n"
+         "###### call (Callable[[], Any])\n"
+         "> A callable Python object. Note that the timer will retain a\n"
+         "strong reference to the callable for as long as it exists, so you\n"
+         "may want to look into concepts such as ba.WeakCall if that is not\n"
+         "desired.\n"
          "\n"
-         "    repeat (bool):\n"
-         "        If True, the timer will fire repeatedly, with each "
-         "successive\n"
-         "        firing having the same delay as the first.\n"
+         "###### repeat (bool)\n"
+         "> If True, the timer will fire repeatedly, with each successive\n"
+         "firing having the same delay as the first.\n"
          "\n"
+         "###### timetype (ba.TimeType)\n"
+         "> Can be either `SIM`, `BASE`, or `REAL`. It defaults to\n"
+         "`SIM`.\n"
          "\n"
-         "    timetype (ba.TimeType):\n"
-         "        Can be either ``SIM``, ``BASE``, or ``REAL``. It defaults "
-         "to\n"
-         "        ``SIM``.\n"
-         "\n"
-         "    timeformat (ba.TimeFormat):\n"
-         "        Defaults to seconds but can also be milliseconds.\n"
+         "###### timeformat (ba.TimeFormat)\n"
+         "> Defaults to seconds but can also be milliseconds.\n"
          "\n"
          "- SIM time maps to local simulation time in ba.Activity or "
          "ba.Session\n"
@@ -1081,15 +1074,13 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "backgrounded, system time changing, etc.)\n"
          "Real time timers are currently only available in the UI context.\n"
          "\n"
-         "Examples:\n"
-         "    Print some stuff through time:\n"
-         "    ```python\n"
-         "    >>> ba.screenmessage('hello from now!')\n"
-         "    >>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the "
+         "##### Examples\n"
+         "Print some stuff through time:\n"
+         ">>> ba.screenmessage('hello from now!')\n"
+         ">>> ba.timer(1.0, ba.Call(ba.screenmessage, 'hello from the "
          "future!'))\n"
-         "    >>> ba.timer(2.0, ba.Call(ba.screenmessage,\n"
-         "    ...                       'hello from the future 2!'))\n"
-         "    ```\n"},
+         ">>> ba.timer(2.0, ba.Call(ba.screenmessage,\n"
+         "...                       'hello from the future 2!'))\n"},
 
         {"time", (PyCFunction)PyTime, METH_VARARGS | METH_KEYWORDS,
          "time(timetype: ba.TimeType = TimeType.SIM,\n"
@@ -1098,32 +1089,32 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Return the current time.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "The time returned depends on the current ba.Context and timetype.\n"
          "\n"
          "timetype can be either SIM, BASE, or REAL. It defaults to\n"
          "SIM. Types are explained below:\n"
          "\n"
-         "SIM time maps to local simulation time in ba.Activity or ba.Session\n"
+         "- SIM time maps to local simulation time in ba.Activity or "
+         "ba.Session\n"
          "Contexts. This means that it may progress slower in slow-motion "
          "play\n"
          "modes, stop when the game is paused, etc.  This time type is not\n"
          "available in UI contexts.\n"
-         "\n"
-         "BASE time is also linked to gameplay in ba.Activity or ba.Session\n"
+         "- BASE time is also linked to gameplay in ba.Activity or ba.Session\n"
          "Contexts, but it progresses at a constant rate regardless of\n "
          "slow-motion states or pausing.  It can, however, slow down or stop\n"
          "in certain cases such as network outages or game slowdowns due to\n"
          "cpu load. Like 'sim' time, this is unavailable in UI contexts.\n"
-         "\n"
-         "REAL time always maps to actual clock time with a bit of filtering\n"
-         "added, regardless of Context.  (the filtering prevents it from "
-         "going\n"
+         "- REAL time always maps to actual clock time with a bit of "
+         "filtering\n"
+         "added, regardless of Context. (The filtering prevents it from going\n"
          "backwards or jumping forward by large amounts due to the app being\n"
          "backgrounded, system time changing, etc.)\n"
+         "Real time timers are currently only available in the UI context.\n"
          "\n"
-         "the 'timeformat' arg defaults to SECONDS which returns float "
+         "The 'timeformat' arg defaults to SECONDS which returns float "
          "seconds,\n"
          "but it can also be MILLISECONDS to return integer milliseconds.\n"
          "\n"
@@ -1136,7 +1127,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Pushes a call onto the event loop to be run during the next cycle.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "This can be handy for calls that are disallowed from within other\n"
          "callbacks, etc.\n"
@@ -1155,7 +1146,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Return the current ba.Activity instance.\n"
          "\n"
-         "Category: Gameplay Functions\n"
+         "Category: **Gameplay Functions**\n"
          "\n"
          "Note that this is based on context; thus code run in a timer "
          "generated\n"
@@ -1171,7 +1162,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          "\n"
          "Instantiates a ba.Activity given a type object.\n"
          "\n"
-         "Category: General Utility Functions\n"
+         "Category: **General Utility Functions**\n"
          "\n"
          "Activities require special setup and thus cannot be directly\n"
          "instantiated; you must go through this function."},
@@ -1220,7 +1211,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
         {"getsession", (PyCFunction)PyGetSession, METH_VARARGS | METH_KEYWORDS,
          "getsession(doraise: bool = True) -> <varies>\n"
          "\n"
-         "Category: Gameplay Functions\n"
+         "Category: **Gameplay Functions**\n"
          "\n"
          "Returns the current ba.Session instance.\n"
          "Note that this is based on context; thus code being run in the UI\n"
diff --git a/src/ballistica/python/methods/python_methods_gameplay.cc b/src/ballistica/python/methods/python_methods_gameplay.cc
index d5f63310..6ce50d1d 100644
--- a/src/ballistica/python/methods/python_methods_gameplay.cc
+++ b/src/ballistica/python/methods/python_methods_gameplay.cc
@@ -685,7 +685,7 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Emit particles, smoke, etc. into the fx sim layer.\n"
        "\n"
-       "Category: Gameplay Functions\n"
+       "Category: **Gameplay Functions**\n"
        "\n"
        "The fx sim layer is a secondary dynamics simulation that runs in\n"
        "the background and just looks pretty; it does not affect gameplay.\n"
@@ -698,17 +698,17 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Play a ba.Sound a single time.\n"
        "\n"
-       "Category: Gameplay Functions\n"
+       "Category: **Gameplay Functions**\n"
        "\n"
        "If position is not provided, the sound will be at a constant volume\n"
-       "everywhere.  Position should be a float tuple of size 3."},
+       "everywhere. Position should be a float tuple of size 3."},
 
       {"camerashake", (PyCFunction)PyCameraShake, METH_VARARGS | METH_KEYWORDS,
        "camerashake(intensity: float = 1.0) -> None\n"
        "\n"
        "Shake the camera.\n"
        "\n"
-       "Category: Gameplay Functions\n"
+       "Category: **Gameplay Functions**\n"
        "\n"
        "Note that some cameras and/or platforms (such as VR) may not display\n"
        "camera-shake, so do not rely on this always being visible to the\n"
@@ -719,7 +719,7 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return collision related values\n"
        "\n"
-       "Category: Gameplay Functions\n"
+       "Category: **Gameplay Functions**\n"
        "\n"
        "Returns a single collision value or tuple of values such as location,\n"
        "depth, nodes involved, etc. Only call this in the handler of a\n"
@@ -730,14 +730,14 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return all nodes in the current ba.Context."
        "\n"
-       "Category: Gameplay Functions"},
+       "Category: **Gameplay Functions**"},
 
       {"printnodes", PyPrintNodes, METH_VARARGS,
        "printnodes() -> None\n"
        "\n"
        "Print various info about existing nodes; useful for debugging.\n"
        "\n"
-       "Category: Gameplay Functions"},
+       "Category: **Gameplay Functions**"},
 
       {"newnode", (PyCFunction)PyNewNode, METH_VARARGS | METH_KEYWORDS,
        "newnode(type: str, owner: ba.Node = None,\n"
@@ -746,7 +746,7 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Add a node of the given type to the game.\n"
        "\n"
-       "Category: Gameplay Functions\n"
+       "Category: **Gameplay Functions**\n"
        "\n"
        "If a dict is provided for 'attributes', the node's initial attributes\n"
        "will be set based on them.\n"
diff --git a/src/ballistica/python/methods/python_methods_graphics.cc b/src/ballistica/python/methods/python_methods_graphics.cc
index 1f87b1ad..9756dd58 100644
--- a/src/ballistica/python/methods/python_methods_graphics.cc
+++ b/src/ballistica/python/methods/python_methods_graphics.cc
@@ -423,7 +423,7 @@ auto PythonMethodsGraphics::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Given a color tuple, return a color safe to display as text.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "Accepts tuples of length 3 or 4. This will slightly brighten very\n"
        "dark colors, etc."},
@@ -433,7 +433,7 @@ auto PythonMethodsGraphics::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Get a unicode string representing a special character.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "Note that these utilize the private-use block of unicode characters\n"
        "(U+E000-U+F8FF) and are specific to the game; exporting or rendering\n"
diff --git a/src/ballistica/python/methods/python_methods_media.cc b/src/ballistica/python/methods/python_methods_media.cc
index cac8d070..00f72e3b 100644
--- a/src/ballistica/python/methods/python_methods_media.cc
+++ b/src/ballistica/python/methods/python_methods_media.cc
@@ -468,7 +468,7 @@ auto PythonMethodsMedia::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return a collide-model, loading it if necessary.\n"
        "\n"
-       "Category: Asset Functions\n"
+       "Category: **Asset Functions**\n"
        "\n"
        "Collide-models are used in physics calculations for such things as\n"
        "terrain.\n"
@@ -491,7 +491,7 @@ auto PythonMethodsMedia::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return a model, loading it if necessary.\n"
        "\n"
-       "Category: Asset Functions\n"
+       "Category: **Asset Functions**\n"
        "\n"
        "Note that this function returns immediately even if the media has yet\n"
        "to be loaded. To avoid hitches, instantiate your media objects in\n"
@@ -510,7 +510,7 @@ auto PythonMethodsMedia::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return a sound, loading it if necessary.\n"
        "\n"
-       "Category: Asset Functions\n"
+       "Category: **Asset Functions**\n"
        "\n"
        "Note that this function returns immediately even if the media has yet\n"
        "to be loaded. To avoid hitches, instantiate your media objects in\n"
@@ -529,7 +529,7 @@ auto PythonMethodsMedia::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return a data, loading it if necessary.\n"
        "\n"
-       "Category: Asset Functions\n"
+       "Category: **Asset Functions**\n"
        "\n"
        "Note that this function returns immediately even if the media has yet\n"
        "to be loaded. To avoid hitches, instantiate your media objects in\n"
@@ -548,7 +548,7 @@ auto PythonMethodsMedia::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return a texture, loading it if necessary.\n"
        "\n"
-       "Category: Asset Functions\n"
+       "Category: **Asset Functions**\n"
        "\n"
        "Note that this function returns immediately even if the media has yet\n"
        "to be loaded. To avoid hitches, instantiate your media objects in\n"
diff --git a/src/ballistica/python/methods/python_methods_system.cc b/src/ballistica/python/methods/python_methods_system.cc
index 46d2e627..7c46c60f 100644
--- a/src/ballistica/python/methods/python_methods_system.cc
+++ b/src/ballistica/python/methods/python_methods_system.cc
@@ -791,7 +791,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return whether this platform supports clipboard operations at all.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "If this returns False, UIs should not show 'copy to clipboard'\n"
        "buttons, etc."},
@@ -800,7 +800,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return whether there is currently text on the clipboard.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "This will return False if no system clipboard is available; no need\n"
        " to call ba.clipboard_available() separately."},
@@ -810,18 +810,18 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Copy a string to the system clipboard.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
-       "Ensure that ba.clipboard_available() returns True before adding\n"
+       "Ensure that ba.clipboard_available returns True before adding\n"
        " buttons/etc. that make use of this functionality."},
       {"clipboard_get_text", (PyCFunction)PyClipboardGetText, METH_NOARGS,
        "clipboard_get_text() -> str\n"
        "\n"
        "Return text currently on the system clipboard.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
-       "Ensure that ba.clipboard_has_text() returns True before calling\n"
+       "Ensure that ba.clipboard_has_text returns True before calling\n"
        " this function."},
       {"printobjects", (PyCFunction)PyPrintObjects,
        METH_VARARGS | METH_KEYWORDS,
@@ -829,7 +829,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Print debugging info about game objects.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "This call only functions in debug builds of the game.\n"
        "It prints various info about the current object count, etc."},
@@ -839,20 +839,18 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Return whether this is the first time running a line of code.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "This is used by 'print_once()' type calls to keep from overflowing\n"
        "logs. The call functions by registering the filename and line where\n"
        "The call is made from.  Returns True if this location has not been\n"
        "registered already, and False if it has.\n"
        "\n"
-       "Example:\n"
-       "    This print will only fire for the first loop iteration:\n"
-       "    ```python\n"
-       "    >>> for i in range(10):\n"
-       "    ... if ba.do_once():\n"
-       "    ...     print('Hello once from loop!')\n"
-       "    ```\n"},
+       "##### Example\n"
+       "This print will only fire for the first loop iteration:\n"
+       ">>> for i in range(10):\n"
+       "... if ba.do_once():\n"
+       "...     print('Hello once from loop!')\n"},
 
       {"_app", (PyCFunction)PyApp, METH_VARARGS | METH_KEYWORDS,
        "_app() -> ba.App\n"
@@ -904,7 +902,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Used for analytics to see where in the app players spend their time.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "Generally called when opening a new window or entering some UI.\n"
        "'screen' should be a string description of an app location\n"
@@ -1006,7 +1004,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "(internal)\n"
        "\n"
-       "Category: General Utility Functions"},
+       "Category: **General Utility Functions**"},
 
       {"print_context", (PyCFunction)PyPrintContext,
        METH_VARARGS | METH_KEYWORDS,
diff --git a/src/ballistica/python/methods/python_methods_ui.cc b/src/ballistica/python/methods/python_methods_ui.cc
index ee0ac6f7..f2725dbd 100644
--- a/src/ballistica/python/methods/python_methods_ui.cc
+++ b/src/ballistica/python/methods/python_methods_ui.cc
@@ -2331,7 +2331,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Open a provided URL.\n"
        "\n"
-       "Category: General Utility Functions\n"
+       "Category: **General Utility Functions**\n"
        "\n"
        "Open the provided url in a web-browser, or display the URL\n"
        "string in a window if that isn't possible.\n"},
@@ -2395,7 +2395,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "(internal)\n"
        "\n"
-       "Category: General Utility Functions"},
+       "Category: **General Utility Functions**"},
 
       {"show_progress_bar", (PyCFunction)PyShowProgressBar,
        METH_VARARGS | METH_KEYWORDS,
@@ -2403,7 +2403,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "(internal)\n"
        "\n"
-       "Category: General Utility Functions"},
+       "Category: **General Utility Functions**"},
 
       {"show_app_invite", (PyCFunction)PyShowAppInvite,
        METH_VARARGS | METH_KEYWORDS,
@@ -2413,7 +2413,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "(internal)\n"
        "\n"
-       "Category: General Utility Functions"},
+       "Category: **General Utility Functions**"},
 
       {"show_ad", (PyCFunction)PyShowAd, METH_VARARGS | METH_KEYWORDS,
        "show_ad(purpose: str, on_completion_call: Callable[[], None] = None)\n"
@@ -2508,7 +2508,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a button widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2534,7 +2534,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a check-box widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2555,7 +2555,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit an image widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2583,7 +2583,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a column widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2625,7 +2625,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a container widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2643,7 +2643,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a row widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2666,7 +2666,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a scroll widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2688,7 +2688,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a horizontal scroll widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2719,7 +2719,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Create or edit a text widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Pass a valid existing ba.Widget as 'edit' to modify it; otherwise\n"
        "a new one is created and returned. Arguments that are not set to None\n"
@@ -2734,7 +2734,7 @@ auto PythonMethodsUI::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Edit common attributes of any widget.\n"
        "\n"
-       "Category: User Interface Functions\n"
+       "Category: **User Interface Functions**\n"
        "\n"
        "Unlike other UI calls, this can only be used to edit, not to "
        "create.\n"},
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index 08dcfa2d..e12c7177 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -80,15 +80,17 @@ def generate(projroot: str) -> None:
     # Make sure we're running from the dir above this script.
     os.chdir(projroot)
 
-    pythondir = str(
-        Path(projroot, 'assets', 'src', 'ba_data', 'python').absolute())
-    sys.path.append(pythondir)
-    outdirname = Path('build', 'docs_html').absolute()
+    templatesdir = (Path(projroot) / 'assets' / 'src' / 'pdoc' /
+                    'templates').absolute()
+    pythondir = (Path(projroot) / 'assets' / 'src' / 'ba_data' /
+                 'python').absolute()
+    outdirname = (Path(projroot) / 'build' / 'docs_html').absolute()
+    sys.path.append(str(pythondir))
 
     try:
-        pdoc.render.configure(docformat='google',
-                              search=True,
-                              show_source=True)
+        pdoc.render.configure(search=True,
+                              show_source=True,
+                              template_directory=templatesdir)
         pdoc.pdoc('ba', 'bastd', output_directory=outdirname)
     except Exception as exc:
         import traceback
diff --git a/tools/batools/dummymodule.py b/tools/batools/dummymodule.py
index 1ac9cba3..954a9bd6 100755
--- a/tools/batools/dummymodule.py
+++ b/tools/batools/dummymodule.py
@@ -252,7 +252,8 @@ def _writefuncs(parent: Any, funcnames: Sequence[str], indent: int,
                     f'unknown returns value: {returns} for {funcname}')
         returnspc = indstr + '    '
         returnstr = ('\n' + returnspc).join(returnstr.strip().splitlines())
-        docstr_out = _formatdoc(docstr, indent + 4, funcname=funcname)
+        docstr_out = _formatdoc(_filterdoc(docstr, funcname=funcname),
+                                indent + 4)
         out += spcstr + defsline + docstr_out + f'{returnspc}{returnstr}\n'
     return out
 
@@ -470,11 +471,7 @@ def _special_class_cases(classname: str) -> str:
     return out
 
 
-def _formatdoc(docstr: str,
-               indent: int,
-               funcname: Optional[str] = None) -> str:
-    out = ''
-    indentstr = indent * ' '
+def _filterdoc(docstr: str, funcname: Optional[str] = None) -> str:
     docslines = docstr.splitlines()
 
     if (funcname and docslines and docslines[0]
@@ -484,14 +481,48 @@ def _formatdoc(docstr: str,
         _, docstr = docstr.split('\n\n', maxsplit=1)
         docslines = docstr.splitlines()
 
+    # Assuming that each line between 'Attributes:' and '\n\n' belongs to
+    # attrs descriptions.
+    empty_lines_count = 0
+    attributes_line: Optional[int] = None
+    attrs_definitions_last_line: Optional[int] = None
+    for i, line in enumerate(docslines):
+        if line.strip() in ['Attrs:', 'Attributes:']:
+            if attributes_line is not None:
+                raise Exception("Multiple 'Attributes:' lines found")
+            attributes_line = i
+        if not line.strip():
+            empty_lines_count += 1
+        else:
+            empty_lines_count = 0
+        if empty_lines_count >= 2 and attributes_line is not None:
+            # It seems attribute definitions ended.
+            attrs_definitions_last_line = i
+            break
+    if attrs_definitions_last_line is None:
+        attrs_definitions_last_line = len(docslines) - 1
+
+    return '\n'.join(docslines[:attributes_line] +
+                     docslines[attrs_definitions_last_line + 1:])
+
+
+def _formatdoc(docstr: str,
+               indent: int,
+               no_end_newline: bool = False,
+               inner_indent: int = 0) -> str:
+    out = ''
+    indentstr = indent * ' '
+    inner_indent_str = inner_indent * ' '
+    docslines = docstr.splitlines()
+
     if len(docslines) == 1:
         out += '\n' + indentstr + '"""' + docslines[0] + '"""\n'
     else:
         for i, line in enumerate(docslines):
             if i != 0 and line != '':
-                docslines[i] = indentstr + line
-        out += ('\n' + indentstr + '"""' + '\n'.join(docslines) + '\n' +
-                indentstr + '"""\n')
+                docslines[i] = indentstr + inner_indent_str + line
+        out += ('\n' + indentstr + '"""' + '\n'.join(docslines) +
+                ('' if no_end_newline else '\n' + indentstr) + '"""\n')
     return out
 
 
@@ -514,7 +545,7 @@ def _writeclasses(module: ModuleType, classnames: Sequence[str]) -> str:
 
         docstr = cls.__doc__
         # classname is constructor name
-        out += _formatdoc(docstr, 4, funcname=classname)
+        out += _formatdoc(_filterdoc(docstr, funcname=classname), 4)
 
         # Create a public constructor if it has one.
         # If the first docs line appears to be a function signature
@@ -548,6 +579,12 @@ def _writeclasses(module: ModuleType, classnames: Sequence[str]) -> str:
             for attr in attrs:
                 if attr.attr_type is not None:
                     out += f'    {attr.name}: {attr.attr_type}\n'
+                    if attr.docs:
+                        out += _formatdoc(_filterdoc(attr.docs),
+                                          indent=4,
+                                          inner_indent=3,
+                                          no_end_newline=True)
+                        out += '\n'
                 else:
                     raise Exception(f'Found untyped attr in'
                                     f' {classname} docs: {attr.name}')

From 1672dec60d6940178c6d8a2659684ecd9a12b128 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Tue, 15 Feb 2022 15:02:36 +0300
Subject: [PATCH 15/21] move css rules to custom.css

---
 assets/src/pdoc/templates/custom.css         |  3 +++
 assets/src/pdoc/templates/module.html.jinja2 | 11 -----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 assets/src/pdoc/templates/custom.css

diff --git a/assets/src/pdoc/templates/custom.css b/assets/src/pdoc/templates/custom.css
new file mode 100644
index 00000000..bfa4c19c
--- /dev/null
+++ b/assets/src/pdoc/templates/custom.css
@@ -0,0 +1,3 @@
+.pdoc .docstring {
+    margin-left: 2rem;
+}
diff --git a/assets/src/pdoc/templates/module.html.jinja2 b/assets/src/pdoc/templates/module.html.jinja2
index 426cfd51..829419ad 100644
--- a/assets/src/pdoc/templates/module.html.jinja2
+++ b/assets/src/pdoc/templates/module.html.jinja2
@@ -1,16 +1,5 @@
 {% extends "default/module.html.jinja2" %}
 
-{% block style_content %}
-    {{ super() }}
-    /* Docstrings */
-    <style>
-        .pdoc .docstring {
-            margin-bottom: 1.5rem;
-            margin-left: 2rem;
-        }
-    </style>
-{% endblock %}
-
 {% macro is_public(doc) %}
     {% if "(internal)" in doc.docstring %}
         {# Returning no text is interpreted as false #}

From 80756a14446e1720d16bcd7114252113f5e47c63 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Tue, 22 Feb 2022 20:14:25 +0300
Subject: [PATCH 16/21] more stuff

---
 assets/src/ba_data/python/._ba_sources_hash   |   2 +-
 assets/src/ba_data/python/_ba.py              |  43 ++--
 assets/src/ba_data/python/ba/_account.py      |   2 +-
 assets/src/ba_data/python/ba/_achievement.py  |   4 +-
 assets/src/ba_data/python/ba/_activity.py     |   9 +-
 assets/src/ba_data/python/ba/_actor.py        |  34 ++-
 assets/src/ba_data/python/ba/_ads.py          |   2 +-
 assets/src/ba_data/python/ba/_app.py          |   2 +-
 assets/src/ba_data/python/ba/_appconfig.py    |   4 +-
 assets/src/ba_data/python/ba/_campaign.py     |   2 +-
 assets/src/ba_data/python/ba/_collision.py    |   4 +-
 assets/src/ba_data/python/ba/_coopgame.py     |   2 +-
 assets/src/ba_data/python/ba/_coopsession.py  |  12 +-
 assets/src/ba_data/python/ba/_dependency.py   |   8 +-
 .../src/ba_data/python/ba/_dualteamsession.py |   2 +-
 assets/src/ba_data/python/ba/_error.py        |  32 +--
 .../ba_data/python/ba/_freeforallsession.py   |   2 +-
 assets/src/ba_data/python/ba/_gameactivity.py |   2 +-
 assets/src/ba_data/python/ba/_gameresults.py  |   4 +-
 assets/src/ba_data/python/ba/_gameutils.py    |  14 +-
 assets/src/ba_data/python/ba/_general.py      | 110 +++++-----
 assets/src/ba_data/python/ba/_keyboard.py     |   2 +-
 assets/src/ba_data/python/ba/_language.py     |  50 ++---
 assets/src/ba_data/python/ba/_level.py        |   2 +-
 assets/src/ba_data/python/ba/_map.py          |  14 +-
 assets/src/ba_data/python/ba/_messages.py     | 106 ++++------
 assets/src/ba_data/python/ba/_meta.py         |   2 +-
 .../ba_data/python/ba/_multiteamsession.py    |   2 +-
 assets/src/ba_data/python/ba/_music.py        |  12 +-
 assets/src/ba_data/python/ba/_nodeactor.py    |   2 +-
 assets/src/ba_data/python/ba/_plugin.py       |   6 +-
 assets/src/ba_data/python/ba/_powerup.py      |  24 +--
 assets/src/ba_data/python/ba/_score.py        |   4 +-
 assets/src/ba_data/python/ba/_servermode.py   |   2 +-
 assets/src/ba_data/python/ba/_session.py      |   2 +-
 assets/src/ba_data/python/ba/_stats.py        |   6 +-
 assets/src/ba_data/python/ba/_team.py         |  39 ++--
 assets/src/ba_data/python/ba/_teamgame.py     |   2 +-
 assets/src/ba_data/python/ba/_ui.py           |   2 +-
 assets/src/ba_data/python/bastd/actor/bomb.py | 200 +++++++++---------
 assets/src/ba_data/python/bastd/actor/flag.py |  97 ++++-----
 .../ba_data/python/bastd/actor/playerspaz.py  |  18 +-
 .../ba_data/python/bastd/actor/powerupbox.py  | 122 ++++++-----
 .../src/ba_data/python/bastd/actor/spawner.py |  28 ++-
 assets/src/ba_data/python/bastd/actor/spaz.py |  10 +-
 .../src/ba_data/python/bastd/actor/spazbot.py |  40 ++--
 .../ba_data/python/bastd/actor/spazfactory.py | 110 +++++-----
 assets/src/ba_data/python/bastd/ui/config.py  |  34 ++-
 .../class/python_class_collide_model.cc       |   2 +-
 .../python/class/python_class_context.cc      |   4 +-
 .../python/class/python_class_data.cc         |   2 +-
 .../python/class/python_class_material.cc     |  18 +-
 .../python/class/python_class_node.cc         |   6 +-
 .../class/python_class_session_player.cc      |   2 +-
 .../python/class/python_class_sound.cc        |   2 +-
 .../python/class/python_class_widget.cc       |   2 +-
 .../python/methods/python_methods_app.cc      |   2 +-
 .../python/methods/python_methods_system.cc   |   4 +-
 58 files changed, 589 insertions(+), 689 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 63f57868..48a48da1 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-93799056966445196696254000169758935495
\ No newline at end of file
+251300217209184493283326875275347381659
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index a5eed344..2048b45d 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -79,7 +79,7 @@ class CollideModel:
 
     Category: **Asset Classes**
 
-    Use ba.getcollidemodel to instantiate one.
+    Use ba.getcollidemodel() to instantiate one.
     """
     pass
 
@@ -89,7 +89,7 @@ class Context:
 
     Category: **General Utility Classes**
 
-    Many operations such as ba.newnode or ba.gettexture operate
+    Many operations such as ba.newnode() or ba.gettexture() operate
     implicitly on the current context. Each ba.Activity has its own
     Context and objects within that activity (nodes, media, etc) can only
     interact with other objects from that context.
@@ -104,7 +104,7 @@ class Context:
     When instantiating a ba.Context instance, a single `'source'` argument
     is passed, which can be one of the following strings/objects:
 
-    `'empty'`:
+    ###### `'empty'`
     > Gives an empty context; it can be handy to run code here to ensure
     it does no loading of media, creation of nodes, etc.
 
@@ -199,7 +199,7 @@ class Data:
 
     Category: **Asset Classes**
 
-    Use ba.getdata to instantiate one.
+    Use ba.getdata() to instantiate one.
     """
 
     def getvalue(self) -> Any:
@@ -309,21 +309,21 @@ class InputDevice:
 class Material:
     """An entity applied to game objects to modify collision behavior.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     A material can affect physical characteristics, generate sounds,
     or trigger callback functions when collisions occur.
 
-    Materials are applied to ``'parts'``, which are groups of one or more
+    Materials are applied to 'parts', which are groups of one or more
     rigid bodies created as part of a ba.Node. Nodes can have any number
     of parts, each with its own set of materials. Generally materials are
-    specified as array attributes on the Node. The ``'spaz'`` node, for
-    example, has various attributes such as ``'materials'``,
-    ``'roller_materials'``, and ``'punch_materials'``, which correspond
+    specified as array attributes on the Node. The `spaz` node, for
+    example, has various attributes such as `materials`,
+    `roller_materials`, and `punch_materials`, which correspond
     to the various parts it creates.
 
     Use ba.Material to instantiate a blank material, and then use its
-    ba.Material.add_actions method to define what the material does.
+    ba.Material.add_actions() method to define what the material does.
     """
 
     def __init__(self, label: str = None):
@@ -399,7 +399,7 @@ class Material:
         `'at_connect'` or `'at_disconnect'`, and `message_obj` is the message
         object to send.
         This has the same effect as calling the node's
-        ba.Node.handlemessage method.
+        ba.Node.handlemessage() method.
 
         ###### `('modify_part_collision', attr, value)`
         > Changes some
@@ -420,6 +420,7 @@ class Material:
         how springy the physical response is), `'damping'` (float
         value, how damped the physical response is), `'bounce'` (float
         value; how bouncy the physical response is).
+
         ###### `('modify_node_collision', attr, value)`
         > Similar to
         `modify_part_collision`, but operates at a node-level.
@@ -466,7 +467,6 @@ class Material:
 
         **Example 2:** send a ba.DieMessage to anything we touch, but cause
         no physical response. This should cause any ba.Actor to drop dead:
-        ```python
         >>> m = ba.Material()
         ... m.add_actions(
         ...     actions=(('modify_part_collision', 'physical', False),
@@ -474,7 +474,6 @@ class Material:
         ...                  ba.DieMessage())))
 
         **Example 3:** play some sounds when we're contacting the ground:
-        ```python
         >>> m = ba.Material()
         ... m.add_actions(
         ...     conditions=('they_have_material',
@@ -499,7 +498,7 @@ class Model:
 class Node:
     """Reference to a Node; the low level building block of the game.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     At its core, a game is nothing more than a scene of Nodes
     with attributes getting interconnected or set over time.
@@ -508,8 +507,8 @@ class Node:
     to a game node; *not* the node itself. This means a Node's
     lifecycle is completely independent of how many Python references
     to it exist. To explicitly add a new node to the game, use
-    ba.newnode, and to explicitly delete one, use ba.Node.delete.
-    ba.Node.exists can be used to determine if a Node still points to
+    ba.newnode(), and to explicitly delete one, use ba.Node.delete().
+    ba.Node.exists() can be used to determine if a Node still points to
     a live node in the game.
 
     You can use ba.Node(None) to instantiate an invalid
@@ -741,7 +740,7 @@ class SessionPlayer:
     Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'
     references under-the-hood; a player can leave the game at
      any point. For this reason, you should make judicious use of the
-    ba.SessionPlayer.exists method (or boolean operator) to ensure
+    ba.SessionPlayer.exists() method (or boolean operator) to ensure
     that a SessionPlayer is still present if retaining references to one
     for any length of time.
     """
@@ -858,7 +857,7 @@ class Sound:
 
     Category: **Asset Classes**
 
-    Use ba.getsound to instantiate one.
+    Use ba.getsound() to instantiate one.
     """
     pass
 
@@ -1044,7 +1043,7 @@ class Widget:
 
     This class represents a weak reference to a widget object
     in the internal C++ layer. Currently, functions such as
-    ba.buttonwidget must be used to instantiate or edit these.
+    ba.buttonwidget() must be used to instantiate or edit these.
     """
 
     def activate(self) -> None:
@@ -1319,7 +1318,7 @@ def clipboard_get_text() -> str:
 
     Category: **General Utility Functions**
 
-    Ensure that ba.clipboard_has_text returns True before calling
+    Ensure that ba.clipboard_has_text() returns True before calling
      this function.
     """
     return str()
@@ -1352,7 +1351,7 @@ def clipboard_set_text(value: str) -> None:
 
     Category: **General Utility Functions**
 
-    Ensure that ba.clipboard_available returns True before adding
+    Ensure that ba.clipboard_available() returns True before adding
      buttons/etc. that make use of this functionality.
     """
     return None
@@ -3145,7 +3144,7 @@ def timer(time: float,
      require the ability to do so, use the ba.Timer class instead.
 
     ##### Arguments
-    ###### time (float):
+    ###### time (float)
     > Length of time (in seconds by default) that the timer will wait
     before firing. Note that the actual delay experienced may vary
      depending on the timetype. (see below)
diff --git a/assets/src/ba_data/python/ba/_account.py b/assets/src/ba_data/python/ba/_account.py
index a072ae63..32a5f9bc 100644
--- a/assets/src/ba_data/python/ba/_account.py
+++ b/assets/src/ba_data/python/ba/_account.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 class AccountSubsystem:
     """Subsystem for account handling in the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.plugins'.
     """
diff --git a/assets/src/ba_data/python/ba/_achievement.py b/assets/src/ba_data/python/ba/_achievement.py
index 13634cfc..83d78081 100644
--- a/assets/src/ba_data/python/ba/_achievement.py
+++ b/assets/src/ba_data/python/ba/_achievement.py
@@ -65,7 +65,7 @@ ACH_LEVEL_NAMES = {
 class AchievementSubsystem:
     """Subsystem for achievement handling.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.ach'.
     """
@@ -436,7 +436,7 @@ def _display_next_achievement() -> None:
 class Achievement:
     """Represents attributes and state for an individual achievement.
 
-    Category: App Classes
+    Category: **App Classes**
     """
 
     def __init__(self,
diff --git a/assets/src/ba_data/python/ba/_activity.py b/assets/src/ba_data/python/ba/_activity.py
index 7df6e376..78a79f02 100644
--- a/assets/src/ba_data/python/ba/_activity.py
+++ b/assets/src/ba_data/python/ba/_activity.py
@@ -362,7 +362,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
     def on_transition_out(self) -> None:
         """Called when your activity begins transitioning out.
 
-        Note that this may happen at any time even if ba.Activity.end has
+        Note that this may happen at any time even if ba.Activity.end() has
         not been called.
         """
 
@@ -379,11 +379,12 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return UNHANDLED
 
     def has_transitioned_in(self) -> bool:
-        """Return whether ba.Activity.on_transition_in has been called."""
+        """Return whether ba.Activity.on_transition_in()
+         has been called."""
         return self._has_transitioned_in
 
     def has_begun(self) -> bool:
-        """Return whether ba.Activity.on_begin has been called."""
+        """Return whether ba.Activity.on_begin() has been called."""
         return self._has_begun
 
     def has_ended(self) -> bool:
@@ -391,7 +392,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         return self._has_ended
 
     def is_transitioning_out(self) -> bool:
-        """Return whether ba.Activity.on_transition_out has been called."""
+        """Return whether ba.Activity.on_transition_out() has been called."""
         return self._transitioning_out
 
     def transition_in(self, prev_globals: Optional[ba.Node]) -> None:
diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py
index 105bfa01..009000f0 100644
--- a/assets/src/ba_data/python/ba/_actor.py
+++ b/assets/src/ba_data/python/ba/_actor.py
@@ -21,7 +21,7 @@ TA = TypeVar('TA', bound='Actor')
 class Actor:
     """High level logical entities in a ba.Activity.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Actors act as controllers, combining some number of ba.Nodes,
     ba.Textures, ba.Sounds, etc. into a high-level cohesive unit.
@@ -33,18 +33,16 @@ class Actor:
     (killing off or transitioning out their nodes) when the last Python
     reference to them disappears, so you can use logic such as:
 
-    Example:
-        ```python
-        >>> # Create a flag Actor in our game activity:
-        ... from bastd.actor.flag import Flag
-        ... self.flag = Flag(position=(0, 10, 0))
-        ...
-        ... # Later, destroy the flag.
-        ... # (provided nothing else is holding a reference to it)
-        ... # We could also just assign a new flag to this value.
-        ... # Either way, the old flag disappears.
-        ... self.flag = None
-        ```
+    ##### Example
+    >>> # Create a flag Actor in our game activity:
+    ... from bastd.actor.flag import Flag
+    ... self.flag = Flag(position=(0, 10, 0))
+    ...
+    ... # Later, destroy the flag.
+    ... # (provided nothing else is holding a reference to it)
+    ... # We could also just assign a new flag to this value.
+    ... # Either way, the old flag disappears.
+    ... self.flag = None
 
     This is in contrast to the behavior of the more low level ba.Nodes,
     which are always explicitly created and destroyed and don't care
@@ -54,20 +52,18 @@ class Actor:
     if you want an Actor to stick around until explicitly killed
     regardless of references.
 
-    Another key feature of ba.Actor is its ba.Actor.handlemessage method, which
+    Another key feature of ba.Actor is its ba.Actor.handlemessage() method, which
     takes a single arbitrary object as an argument. This provides a safe way
     to communicate between ba.Actor, ba.Activity, ba.Session, and any other
-    class providing a handlemessage() method.  The most universally handled
+    class providing a handlemessage() method. The most universally handled
     message type for Actors is the ba.DieMessage.
 
     Another way to kill the flag from the example above:
     We can safely call this on any type with a 'handlemessage' method
     (though its not guaranteed to always have a meaningful effect).
-    In this case the Actor instance will still be around, but its exists()
-    and is_alive() methods will both return False.
-    ```python
+    In this case the Actor instance will still be around, but its
+    ba.Actor.exists() and ba.Actor.is_alive() methods will both return False.
     >>> self.flag.handlemessage(ba.DieMessage())
-    ```
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_ads.py b/assets/src/ba_data/python/ba/_ads.py
index e591bbbe..b7765b74 100644
--- a/assets/src/ba_data/python/ba/_ads.py
+++ b/assets/src/ba_data/python/ba/_ads.py
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 class AdsSubsystem:
     """Subsystem for ads functionality in the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.ads'.
     """
diff --git a/assets/src/ba_data/python/ba/_app.py b/assets/src/ba_data/python/ba/_app.py
index d9bd3383..c7bd0e65 100644
--- a/assets/src/ba_data/python/ba/_app.py
+++ b/assets/src/ba_data/python/ba/_app.py
@@ -27,7 +27,7 @@ if TYPE_CHECKING:
 class App:
     """A class for high level app functionality and state.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Use ba.app to access the single shared instance of this class.
 
diff --git a/assets/src/ba_data/python/ba/_appconfig.py b/assets/src/ba_data/python/ba/_appconfig.py
index 611483e8..5e1e1726 100644
--- a/assets/src/ba_data/python/ba/_appconfig.py
+++ b/assets/src/ba_data/python/ba/_appconfig.py
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
 class AppConfig(dict):
     """A special dict that holds the game's persistent configuration values.
 
-    Category: App Classes
+    Category: **App Classes**
 
     It also provides methods for fetching values with app-defined fallback
     defaults, applying contained values to the game, and committing the
@@ -155,7 +155,7 @@ def read_config() -> tuple[AppConfig, bool]:
 def commit_app_config(force: bool = False) -> None:
     """Commit the config to persistent storage.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     (internal)
     """
diff --git a/assets/src/ba_data/python/ba/_campaign.py b/assets/src/ba_data/python/ba/_campaign.py
index 76942876..915fc4cd 100644
--- a/assets/src/ba_data/python/ba/_campaign.py
+++ b/assets/src/ba_data/python/ba/_campaign.py
@@ -25,7 +25,7 @@ def getcampaign(name: str) -> ba.Campaign:
 class Campaign:
     """Represents a unique set or series of ba.Level-s.
 
-    Category: App Classes
+    Category: **App Classes**
     """
 
     def __init__(self, name: str, sequential: bool = True):
diff --git a/assets/src/ba_data/python/ba/_collision.py b/assets/src/ba_data/python/ba/_collision.py
index e9db1e8e..d44c0f4d 100644
--- a/assets/src/ba_data/python/ba/_collision.py
+++ b/assets/src/ba_data/python/ba/_collision.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class Collision:
     """A class providing info about occurring collisions.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     @property
@@ -67,6 +67,6 @@ _collision = Collision()
 def getcollision() -> Collision:
     """Return the in-progress collision.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
     """
     return _collision
diff --git a/assets/src/ba_data/python/ba/_coopgame.py b/assets/src/ba_data/python/ba/_coopgame.py
index 1d771b5e..79ba755f 100644
--- a/assets/src/ba_data/python/ba/_coopgame.py
+++ b/assets/src/ba_data/python/ba/_coopgame.py
@@ -21,7 +21,7 @@ TeamType = TypeVar('TeamType', bound='ba.Team')
 class CoopGameActivity(GameActivity[PlayerType, TeamType]):
     """Base class for cooperative-mode games.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     # We can assume our session is a CoopSession.
diff --git a/assets/src/ba_data/python/ba/_coopsession.py b/assets/src/ba_data/python/ba/_coopsession.py
index 15259ea2..c2c08020 100644
--- a/assets/src/ba_data/python/ba/_coopsession.py
+++ b/assets/src/ba_data/python/ba/_coopsession.py
@@ -19,25 +19,23 @@ TEAM_NAMES = ['Good Guys']
 class CoopSession(Session):
     """A ba.Session which runs cooperative-mode games.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     These generally consist of 1-4 players against
     the computer and include functionality such as
     high score lists.
-
-    Attributes:
-
-        campaign
-            The ba.Campaign instance this Session represents, or None if
-            there is no associated Campaign.
     """
+
     use_teams = True
     use_team_colors = False
     allow_mid_activity_joins = False
 
     # Note: even though these are instance vars, we annotate them at the
     # class level so that docs generation can access their types.
+
     campaign: Optional[ba.Campaign]
+    """The ba.Campaign instance this Session represents, or None if
+       there is no associated Campaign."""
 
     def __init__(self) -> None:
         """Instantiate a co-op mode session."""
diff --git a/assets/src/ba_data/python/ba/_dependency.py b/assets/src/ba_data/python/ba/_dependency.py
index 87a3116e..f46cae6a 100644
--- a/assets/src/ba_data/python/ba/_dependency.py
+++ b/assets/src/ba_data/python/ba/_dependency.py
@@ -19,7 +19,7 @@ T = TypeVar('T', bound='DependencyComponent')
 class Dependency(Generic[T]):
     """A dependency on a DependencyComponent (with an optional config).
 
-    Category: Dependency Classes
+    Category: **Dependency Classes**
 
     This class is used to request and access functionality provided
     by other DependencyComponent classes from a DependencyComponent class.
@@ -87,7 +87,7 @@ class Dependency(Generic[T]):
 class DependencyComponent:
     """Base class for all classes that can act as or use dependencies.
 
-    category: Dependency Classes
+    Category: **Dependency Classes**
     """
 
     _dep_entry: weakref.ref[DependencyEntry]
@@ -165,7 +165,7 @@ class DependencyEntry:
 class DependencySet(Generic[T]):
     """Set of resolved dependencies and their associated data.
 
-    Category: Dependency Classes
+    Category: **Dependency Classes**
 
     To use DependencyComponents, a set must be created, resolved, and then
     loaded. The DependencyComponents are only valid while the set remains
@@ -291,7 +291,7 @@ class DependencySet(Generic[T]):
 class AssetPackage(DependencyComponent):
     """ba.DependencyComponent representing a bundled package of game assets.
 
-    Category: Asset Classes
+    Category: **Asset Classes**
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_dualteamsession.py b/assets/src/ba_data/python/ba/_dualteamsession.py
index 427e7063..0b7a327b 100644
--- a/assets/src/ba_data/python/ba/_dualteamsession.py
+++ b/assets/src/ba_data/python/ba/_dualteamsession.py
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 class DualTeamSession(MultiTeamSession):
     """ba.Session type for teams mode games.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     # Base class overrides:
diff --git a/assets/src/ba_data/python/ba/_error.py b/assets/src/ba_data/python/ba/_error.py
index c9e75fcb..bb82a78a 100644
--- a/assets/src/ba_data/python/ba/_error.py
+++ b/assets/src/ba_data/python/ba/_error.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class DependencyError(Exception):
     """Exception raised when one or more ba.Dependency items are missing.
 
-    category: Exception Classes
+    Category: **Exception Classes**
 
     (this will generally be missing assets).
     """
@@ -34,7 +34,7 @@ class DependencyError(Exception):
 class ContextError(Exception):
     """Exception raised when a call is made in an invalid context.
 
-    category: Exception Classes
+    Category: **Exception Classes**
 
     Examples of this include calling UI functions within an Activity context
     or calling scene manipulation functions outside of a game context.
@@ -44,91 +44,91 @@ class ContextError(Exception):
 class NotFoundError(Exception):
     """Exception raised when a referenced object does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class PlayerNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Player does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class SessionPlayerNotFoundError(NotFoundError):
     """Exception raised when an expected ba.SessionPlayer does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class TeamNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Team does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class DelegateNotFoundError(NotFoundError):
     """Exception raised when an expected delegate object does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class SessionTeamNotFoundError(NotFoundError):
     """Exception raised when an expected ba.SessionTeam does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class NodeNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Node does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class ActorNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Actor does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class ActivityNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Activity does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class SessionNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Session does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class InputDeviceNotFoundError(NotFoundError):
     """Exception raised when an expected ba.InputDevice does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 class WidgetNotFoundError(NotFoundError):
     """Exception raised when an expected ba.Widget does not exist.
 
-    category: Exception Classes
+    Category: **Exception Classes**
     """
 
 
 def print_exception(*args: Any, **keywds: Any) -> None:
     """Print info about an exception along with pertinent context state.
 
-    category: General Utility Functions
+    Category: **General Utility Functions**
 
     Prints all arguments provided along with various info about the
     current context and the outstanding exception.
@@ -168,7 +168,7 @@ def print_exception(*args: Any, **keywds: Any) -> None:
 def print_error(err_str: str, once: bool = False) -> None:
     """Print info about an error along with pertinent context state.
 
-    category: General Utility Functions
+    Category: **General Utility Functions**
 
     Prints all positional arguments provided along with various info about the
     current context.
diff --git a/assets/src/ba_data/python/ba/_freeforallsession.py b/assets/src/ba_data/python/ba/_freeforallsession.py
index c0ceee99..a33c8278 100644
--- a/assets/src/ba_data/python/ba/_freeforallsession.py
+++ b/assets/src/ba_data/python/ba/_freeforallsession.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class FreeForAllSession(MultiTeamSession):
     """ba.Session type for free-for-all mode games.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
     use_teams = False
     use_team_colors = False
diff --git a/assets/src/ba_data/python/ba/_gameactivity.py b/assets/src/ba_data/python/ba/_gameactivity.py
index c7d633e0..129fae2f 100644
--- a/assets/src/ba_data/python/ba/_gameactivity.py
+++ b/assets/src/ba_data/python/ba/_gameactivity.py
@@ -31,7 +31,7 @@ TeamType = TypeVar('TeamType', bound='ba.Team')
 class GameActivity(Activity[PlayerType, TeamType]):
     """Common base class for all game ba.Activities.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
     # pylint: disable=too-many-public-methods
 
diff --git a/assets/src/ba_data/python/ba/_gameresults.py b/assets/src/ba_data/python/ba/_gameresults.py
index f4b3ebd1..159a6d58 100644
--- a/assets/src/ba_data/python/ba/_gameresults.py
+++ b/assets/src/ba_data/python/ba/_gameresults.py
@@ -27,10 +27,10 @@ class GameResults:
     """
     Results for a completed game.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Upon completion, a game should fill one of these out and pass it to its
-    ba.Activity.end() call.
+    ba.Activity.end call.
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_gameutils.py b/assets/src/ba_data/python/ba/_gameutils.py
index d337f3df..110535a8 100644
--- a/assets/src/ba_data/python/ba/_gameutils.py
+++ b/assets/src/ba_data/python/ba/_gameutils.py
@@ -29,7 +29,7 @@ TROPHY_CHARS = {
 class GameTip:
     """Defines a tip presentable to the user at the start of a game.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
     text: str
     icon: Optional[ba.Texture] = None
@@ -53,7 +53,7 @@ def animate(node: ba.Node,
             suppress_format_warning: bool = False) -> ba.Node:
     """Animate values on a target ba.Node.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     Creates an 'animcurve' node with the provided values and time as an input,
     connect it to the provided attribute, and set it to die with the target.
@@ -127,9 +127,9 @@ def animate_array(node: ba.Node,
                   suppress_format_warning: bool = False) -> None:
     """Animate an array of values on a target ba.Node.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
-    Like ba.animate(), but operates on array attributes.
+    Like ba.animate, but operates on array attributes.
     """
     # pylint: disable=too-many-locals
     combine = _ba.newnode('combine', owner=node, attrs={'size': size})
@@ -198,7 +198,7 @@ def show_damage_count(damage: str, position: Sequence[float],
                       direction: Sequence[float]) -> None:
     """Pop up a damage count at a position in space.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
     """
     lifespan = 1.0
     app = _ba.app
@@ -253,7 +253,7 @@ def timestring(timeval: float,
                suppress_format_warning: bool = False) -> ba.Lstr:
     """Generate a ba.Lstr for displaying a time value.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Given a time value, returns a ba.Lstr with:
     (hours if > 0 ) : minutes : seconds : (centiseconds if centi=True).
@@ -321,7 +321,7 @@ def timestring(timeval: float,
 def cameraflash(duration: float = 999.0) -> None:
     """Create a strobing camera flash effect.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     (as seen when a team wins a game)
     Duration is in seconds.
diff --git a/assets/src/ba_data/python/ba/_general.py b/assets/src/ba_data/python/ba/_general.py
index bee3fac5..b28731c1 100644
--- a/assets/src/ba_data/python/ba/_general.py
+++ b/assets/src/ba_data/python/ba/_general.py
@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 class Existable(Protocol):
     """A Protocol for objects supporting an exists() method.
 
-    Category: Protocols
+    Category: **Protocols**
     """
 
     def exists(self) -> bool:
@@ -39,7 +39,7 @@ T = TypeVar('T')
 def existing(obj: Optional[ExistableType]) -> Optional[ExistableType]:
     """Convert invalid references to None for any ba.Existable object.
 
-    Category: Gameplay Functions
+    Category: **Gameplay Functions**
 
     To best support type checking, it is important that invalid references
     not be passed around and instead get converted to values of None.
@@ -59,7 +59,7 @@ def existing(obj: Optional[ExistableType]) -> Optional[ExistableType]:
 def getclass(name: str, subclassof: type[T]) -> type[T]:
     """Given a full class name such as foo.bar.MyClass, return the class.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     The class will be checked to make sure it is a subclass of the provided
     'subclassof' class, and a TypeError will be raised if not.
@@ -140,7 +140,7 @@ def get_type_name(cls: type) -> str:
 class _WeakCall:
     """Wrap a callable and arguments into a single callable object.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     When passed a bound method as the callable, the instance portion
     of it is weak-referenced, meaning the underlying instance is
@@ -150,40 +150,34 @@ class _WeakCall:
     Think of this as a handy way to tell an object to do something
     at some point in the future if it happens to still exist.
 
-    Examples:
-        EXAMPLE A: this code will create a FooClass instance and call its
-        bar() method 5 seconds later; it will be kept alive even though
-        we overwrite its variable with None because the bound method
-        we pass as a timer callback (foo.bar) strong-references it
-        ```python
-        >>> foo = FooClass()
-        ... ba.timer(5.0, foo.bar)
-        ... foo = None
-        ```
+    ##### Examples
+    **EXAMPLE A:** this code will create a FooClass instance and call its
+    bar() method 5 seconds later; it will be kept alive even though
+    we overwrite its variable with None because the bound method
+    we pass as a timer callback (foo.bar) strong-references it
+    >>> foo = FooClass()
+    ... ba.timer(5.0, foo.bar)
+    ... foo = None
 
-        EXAMPLE B: this code will *not* keep our object alive; it will die
-        when we overwrite it with None and the timer will be a no-op when it
-        fires
-        ```python
-        >>> foo = FooClass()
-        ... ba.timer(5.0, ba.WeakCall(foo.bar))
-        ... foo = None
-        ```
+    **EXAMPLE B:** This code will *not* keep our object alive; it will die
+    when we overwrite it with None and the timer will be a no-op when it
+    fires
+    >>> foo = FooClass()
+    ... ba.timer(5.0, ba.WeakCall(foo.bar))
+    ... foo = None
 
-        EXAMPLE C: Wrap a method call with some positional and keyword args:
-        ```python
-        >>> myweakcall = ba.WeakCall(self.dostuff, argval1,
-        ...                          namedarg=argval2)
-        ... # Now we have a single callable to run that whole mess.
-        ... # The same as calling myobj.dostuff(argval1, namedarg=argval2)
-        ... # (provided my_obj still exists; this will do nothing
-        ... # otherwise).
-        ... myweakcall()
-        ```
+    **EXAMPLE C:** Wrap a method call with some positional and keyword args:
+    >>> myweakcall = ba.WeakCall(self.dostuff, argval1,
+    ...                          namedarg=argval2)
+    ... # Now we have a single callable to run that whole mess.
+    ... # The same as calling myobj.dostuff(argval1, namedarg=argval2)
+    ... # (provided my_obj still exists; this will do nothing
+    ... # otherwise).
+    ... myweakcall()
 
-        Note: additional args and keywords you provide to the WeakCall()
-        constructor are stored as regular strong-references; you'll need
-        to wrap them in weakrefs manually if desired.
+    Note: additional args and keywords you provide to the WeakCall()
+    constructor are stored as regular strong-references; you'll need
+    to wrap them in weakrefs manually if desired.
     """
 
     def __init__(self, *args: Any, **keywds: Any) -> None:
@@ -219,7 +213,7 @@ class _WeakCall:
 class _Call:
     """Wraps a callable and arguments into a single callable object.
 
-    Category: General Utility Classes
+    Category: **General Utility Classes**
 
     The callable is strong-referenced so it won't die until this
     object does.
@@ -236,14 +230,12 @@ class _Call:
         Pass a callable as the first arg, followed by any number of
         arguments or keywords.
 
-        Example:
-            Wrap a method call with 1 positional and 1 keyword arg:
-            ```python
-            >>> mycall = ba.Call(myobj.dostuff, argval, namedarg=argval2)
-            ... # Now we have a single callable to run that whole mess.
-            ... # ..the same as calling myobj.dostuff(argval, namedarg=argval2)
-            ... mycall()
-            ```
+        ##### Example
+        Wrap a method call with 1 positional and 1 keyword arg:
+        >>> mycall = ba.Call(myobj.dostuff, argval, namedarg=argval2)
+        ... # Now we have a single callable to run that whole mess.
+        ... # ..the same as calling myobj.dostuff(argval, namedarg=argval2)
+        ... mycall()
         """
         self._call = args[0]
         self._args = args[1:]
@@ -292,7 +284,7 @@ class WeakMethod:
 def verify_object_death(obj: object) -> None:
     """Warn if an object does not get freed within a short period.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This can be handy to detect and prevent memory/resource leaks.
     """
@@ -313,7 +305,7 @@ def verify_object_death(obj: object) -> None:
 def print_active_refs(obj: Any) -> None:
     """Print info about things referencing a given object.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     Useful for tracking down cyclical references and causes for zombie objects.
     """
@@ -370,7 +362,7 @@ def _verify_object_death(wref: weakref.ref) -> None:
 def storagename(suffix: str = None) -> str:
     """Generate a unique name for storing class data in shared places.
 
-    Category: General Utility Functions
+    Category: **General Utility Functions**
 
     This consists of a leading underscore, the module path at the
     call site with dots replaced by underscores, the containing class's
@@ -380,19 +372,17 @@ def storagename(suffix: str = None) -> str:
 
     Note that this will function even if called in the class definition.
 
-    Examples:
-        Generate a unique name for storage purposes:
-        ```python
-        >>> class MyThingie:
-        ...     # This will give something like
-        ...     # '_mymodule_submodule_mythingie_data'.
-        ...     _STORENAME = ba.storagename('data')
-        ...
-        ...     # Use that name to store some data in the Activity we were
-        ...     # passed.
-        ...     def __init__(self, activity):
-        ...         activity.customdata[self._STORENAME] = {}
-        ```
+    ##### Examples
+    Generate a unique name for storage purposes:
+    >>> class MyThingie:
+    ...     # This will give something like
+    ...     # '_mymodule_submodule_mythingie_data'.
+    ...     _STORENAME = ba.storagename('data')
+    ...
+    ...     # Use that name to store some data in the Activity we were
+    ...     # passed.
+    ...     def __init__(self, activity):
+    ...         activity.customdata[self._STORENAME] = {}
     """
     frame = inspect.currentframe()
     if frame is None:
diff --git a/assets/src/ba_data/python/ba/_keyboard.py b/assets/src/ba_data/python/ba/_keyboard.py
index 8502caaa..36dfc183 100644
--- a/assets/src/ba_data/python/ba/_keyboard.py
+++ b/assets/src/ba_data/python/ba/_keyboard.py
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
 class Keyboard:
     """Chars definitions for on-screen keyboard.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Keyboards are discoverable by the meta-tag system
     and the user can select which one they want to use.
diff --git a/assets/src/ba_data/python/ba/_language.py b/assets/src/ba_data/python/ba/_language.py
index 5d9894b7..6d431ced 100644
--- a/assets/src/ba_data/python/ba/_language.py
+++ b/assets/src/ba_data/python/ba/_language.py
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
 class LanguageSubsystem:
     """Wraps up language related app functionality.
 
-    Category: App Classes
+    Category: **App Classes**
 
     To use this class, access the single instance of it at 'ba.app.lang'.
     """
@@ -367,7 +367,7 @@ class LanguageSubsystem:
 class Lstr:
     """Used to define strings in a language-independent way.
 
-    category: General Utility Classes
+    Category: **General Utility Classes**
 
     These should be used whenever possible in place of hard-coded strings
     so that in-game or UI elements show up correctly on all clients in their
@@ -376,36 +376,28 @@ class Lstr:
     To see available resource keys, look at any of the bs_language_*.py files
     in the game or the translations pages at bombsquadgame.com/translate.
 
-    Examples:
-        EXAMPLE 1: specify a string from a resource path
-        ```python
-        >>> mynode.text = ba.Lstr(resource='audioSettingsWindow.titleText')
-        ```
+    ##### Examples
+    EXAMPLE 1: specify a string from a resource path
+    >>> mynode.text = ba.Lstr(resource='audioSettingsWindow.titleText')
 
-        EXAMPLE 2: specify a translated string via a category and english
-        value; if a translated value is available, it will be used; otherwise
-        the english value will be. To see available translation categories,
-        look under the 'translations' resource section.
-        ```python
-        >>> mynode.text = ba.Lstr(translate=('gameDescriptions',
-        ...                                  'Defeat all enemies'))
-        ```
+    EXAMPLE 2: specify a translated string via a category and english
+    value; if a translated value is available, it will be used; otherwise
+    the english value will be. To see available translation categories,
+    look under the 'translations' resource section.
+    >>> mynode.text = ba.Lstr(translate=('gameDescriptions',
+    ...                                  'Defeat all enemies'))
 
-        EXAMPLE 3: specify a raw value and some substitutions. Substitutions
-        can be used with resource and translate modes as well.
-        ```python
-        >>> mynode.text = ba.Lstr(value='${A} / ${B}',
-        ...               subs=[('${A}', str(score)), ('${B}', str(total))])
-        ```
+    EXAMPLE 3: specify a raw value and some substitutions. Substitutions
+    can be used with resource and translate modes as well.
+    >>> mynode.text = ba.Lstr(value='${A} / ${B}',
+    ...               subs=[('${A}', str(score)), ('${B}', str(total))])
 
-        EXAMPLE 4: ba.Lstr's can be nested. This example would display the
-        resource at res_a but replace ${NAME} with the value of the
-        resource at res_b
-        ```python
-        >>> mytextnode.text = ba.Lstr(
-        ...     resource='res_a',
-        ...     subs=[('${NAME}', ba.Lstr(resource='res_b'))])
-        ```
+    EXAMPLE 4: ba.Lstr's can be nested. This example would display the
+    resource at res_a but replace ${NAME} with the value of the
+    resource at res_b
+    >>> mytextnode.text = ba.Lstr(
+    ...     resource='res_a',
+    ...     subs=[('${NAME}', ba.Lstr(resource='res_b'))])
     """
 
     # pylint: disable=dangerous-default-value
diff --git a/assets/src/ba_data/python/ba/_level.py b/assets/src/ba_data/python/ba/_level.py
index 53e67f1d..968610a9 100644
--- a/assets/src/ba_data/python/ba/_level.py
+++ b/assets/src/ba_data/python/ba/_level.py
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
 class Level:
     """An entry in a ba.Campaign consisting of a name, game type, and settings.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     def __init__(self,
diff --git a/assets/src/ba_data/python/ba/_map.py b/assets/src/ba_data/python/ba/_map.py
index f8739a7c..be653942 100644
--- a/assets/src/ba_data/python/ba/_map.py
+++ b/assets/src/ba_data/python/ba/_map.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 def preload_map_preview_media() -> None:
     """Preload media needed for map preview UIs.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
     """
     _ba.getmodel('level_select_button_opaque')
     _ba.getmodel('level_select_button_transparent')
@@ -31,7 +31,7 @@ def preload_map_preview_media() -> None:
 def get_filtered_map_name(name: str) -> str:
     """Filter a map name to account for name changes, etc.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     This can be used to support old playlists, etc.
     """
@@ -46,7 +46,7 @@ def get_filtered_map_name(name: str) -> str:
 def get_map_display_string(name: str) -> ba.Lstr:
     """Return a ba.Lstr for displaying a given map\'s name.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
     """
     from ba import _language
     return _language.Lstr(translate=('mapsNames', name))
@@ -55,7 +55,7 @@ def get_map_display_string(name: str) -> ba.Lstr:
 def getmaps(playtype: str) -> list[str]:
     """Return a list of ba.Map types supporting a playtype str.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
 
     Maps supporting a given playtype must provide a particular set of
     features and lend themselves to a certain style of play.
@@ -104,7 +104,7 @@ def getmaps(playtype: str) -> list[str]:
 def get_unowned_maps() -> list[str]:
     """Return the list of local maps not owned by the current account.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
     """
     from ba import _store
     unowned_maps: set[str] = set()
@@ -120,7 +120,7 @@ def get_unowned_maps() -> list[str]:
 def get_map_class(name: str) -> type[ba.Map]:
     """Return a map type given a name.
 
-    Category: Asset Functions
+    Category: **Asset Functions**
     """
     name = get_filtered_map_name(name)
     try:
@@ -133,7 +133,7 @@ def get_map_class(name: str) -> type[ba.Map]:
 class Map(Actor):
     """A game map.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Consists of a collection of terrain nodes, metadata, and other
     functionality comprising a game map.
diff --git a/assets/src/ba_data/python/ba/_messages.py b/assets/src/ba_data/python/ba/_messages.py
index 92a7c366..aa22cad4 100644
--- a/assets/src/ba_data/python/ba/_messages.py
+++ b/assets/src/ba_data/python/ba/_messages.py
@@ -50,24 +50,19 @@ class DeathType(Enum):
 class DieMessage:
     """A message telling an object to die.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     Most ba.Actor-s respond to this.
-
-    Attributes:
-
-        immediate
-            If this is set to True, the actor should disappear immediately.
-            This is for 'removing' stuff from the game more so than 'killing'
-            it. If False, the actor should die a 'normal' death and can take
-            its time with lingering corpses, sound effects, etc.
-
-        how
-            The particular reason for death.
-
     """
+
     immediate: bool = False
+    """If this is set to True, the actor should disappear immediately.
+       This is for 'removing' stuff from the game more so than 'killing'
+       it. If False, the actor should die a 'normal' death and can take
+       its time with lingering corpses, sound effects, etc."""
+
     how: DeathType = DeathType.GENERIC
+    """The particular reason for death."""
 
 
 PlayerType = TypeVar('PlayerType', bound='ba.Player')
@@ -76,19 +71,15 @@ PlayerType = TypeVar('PlayerType', bound='ba.Player')
 class PlayerDiedMessage:
     """A message saying a ba.Player has died.
 
-    category: Message Classes
-
-    Attributes:
-
-       killed
-          If True, the player was killed;
-          If False, they left the game or the round ended.
-
-       how
-          The particular type of death.
+    Category: **Message Classes**
     """
+
     killed: bool
+    """If True, the player was killed;
+       If False, they left the game or the round ended."""
+
     how: ba.DeathType
+    """The particular type of death."""
 
     def __init__(self, player: ba.Player, was_killed: bool,
                  killerplayer: Optional[ba.Player], how: ba.DeathType):
@@ -132,41 +123,34 @@ class PlayerDiedMessage:
 class StandMessage:
     """A message telling an object to move to a position in space.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     Used when teleporting players to home base, etc.
-
-    Attributes:
-
-        position
-            Where to move to.
-
-        angle
-            The angle to face (in degrees)
     """
+
     position: Sequence[float] = (0.0, 0.0, 0.0)
+    """Where to move to."""
+
     angle: float = 0.0
+    """The angle to face (in degrees)"""
 
 
 @dataclass
 class PickUpMessage:
     """Tells an object that it has picked something up.
 
-    Category: Message Classes
-
-    Attributes:
-
-        node
-            The ba.Node that is getting picked up.
+    Category: **Message Classes**
     """
+
     node: ba.Node
+    """The ba.Node that is getting picked up."""
 
 
 @dataclass
 class DropMessage:
     """Tells an object that it has dropped what it was holding.
 
-    Category: Message Classes
+    Category: **Message Classes**
     """
 
 
@@ -174,35 +158,29 @@ class DropMessage:
 class PickedUpMessage:
     """Tells an object that it has been picked up by something.
 
-    Category: Message Classes
-
-    Attributes:
-
-        node
-            The ba.Node doing the picking up.
+    Category: **Message Classes**
     """
+
     node: ba.Node
+    """The ba.Node doing the picking up."""
 
 
 @dataclass
 class DroppedMessage:
     """Tells an object that it has been dropped.
 
-    Category: Message Classes
-
-    Attributes:
-
-        node
-            The ba.Node doing the dropping.
+    Category: **Message Classes**
     """
+
     node: ba.Node
+    """The ba.Node doing the dropping."""
 
 
 @dataclass
 class ShouldShatterMessage:
     """Tells an object that it should shatter.
 
-    Category: Message Classes
+    Category: **Message Classes**
     """
 
 
@@ -210,21 +188,18 @@ class ShouldShatterMessage:
 class ImpactDamageMessage:
     """Tells an object that it has been jarred violently.
 
-    Category: Message Classes
-
-    Attributes:
-
-        intensity
-            The intensity of the impact.
+    Category: **Message Classes**
     """
+
     intensity: float
+    """The intensity of the impact."""
 
 
 @dataclass
 class FreezeMessage:
     """Tells an object to become frozen.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     As seen in the effects of an ice ba.Bomb.
     """
@@ -234,7 +209,7 @@ class FreezeMessage:
 class ThawMessage:
     """Tells an object to stop being frozen.
 
-    Category: Message Classes
+    Category: **Message Classes**
     """
 
 
@@ -242,20 +217,17 @@ class ThawMessage:
 class CelebrateMessage:
     """Tells an object to celebrate.
 
-    Category: Message Classes
-
-    Attributes:
-
-        duration
-            Amount of time to celebrate in seconds.
+    Category: **Message Classes**
     """
+
     duration: float = 10.0
+    """Amount of time to celebrate in seconds."""
 
 
 class HitMessage:
     """Tells an object it has been hit in some way.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     This is used by punches, explosions, etc to convey
     their effect to a target.
diff --git a/assets/src/ba_data/python/ba/_meta.py b/assets/src/ba_data/python/ba/_meta.py
index 7776a5b3..017ff85b 100644
--- a/assets/src/ba_data/python/ba/_meta.py
+++ b/assets/src/ba_data/python/ba/_meta.py
@@ -37,7 +37,7 @@ class ScanResults:
 class MetadataSubsystem:
     """Subsystem for working with script metadata in the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.meta'.
     """
diff --git a/assets/src/ba_data/python/ba/_multiteamsession.py b/assets/src/ba_data/python/ba/_multiteamsession.py
index 8a1b7bae..29b4c1e7 100644
--- a/assets/src/ba_data/python/ba/_multiteamsession.py
+++ b/assets/src/ba_data/python/ba/_multiteamsession.py
@@ -22,7 +22,7 @@ DEFAULT_TEAM_NAMES = ('Blue', 'Red')
 class MultiTeamSession(Session):
     """Common base class for ba.DualTeamSession and ba.FreeForAllSession.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Free-for-all-mode is essentially just teams-mode with each ba.Player having
     their own ba.Team, so there is much overlap in functionality.
diff --git a/assets/src/ba_data/python/ba/_music.py b/assets/src/ba_data/python/ba/_music.py
index 7cf3815f..bb417661 100644
--- a/assets/src/ba_data/python/ba/_music.py
+++ b/assets/src/ba_data/python/ba/_music.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 class MusicType(Enum):
     """Types of music available to play in-game.
 
-    Category: Enums
+    Category: **Enums**
 
     These do not correspond to specific pieces of music, but rather to
     'situations'. The actual music played for each type can be overridden
@@ -51,7 +51,7 @@ class MusicType(Enum):
 class MusicPlayMode(Enum):
     """Influences behavior when playing music.
 
-    Category: Enums
+    Category: **Enums**
     """
     REGULAR = 'regular'
     TEST = 'test'
@@ -61,7 +61,7 @@ class MusicPlayMode(Enum):
 class AssetSoundtrackEntry:
     """A music entry using an internal asset.
 
-    Category: App Classes
+    Category: **App Classes**
     """
     assetname: str
     volume: float = 1.0
@@ -120,7 +120,7 @@ ASSET_SOUNDTRACK_ENTRIES: dict[MusicType, AssetSoundtrackEntry] = {
 class MusicSubsystem:
     """Subsystem for music playback in the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.music'.
     """
@@ -385,7 +385,7 @@ class MusicSubsystem:
 class MusicPlayer:
     """Wrangles soundtrack music playback.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Music can be played either through the game itself
     or via a platform-specific external player.
@@ -474,7 +474,7 @@ def setmusic(musictype: Optional[ba.MusicType],
              continuous: bool = False) -> None:
     """Set the app to play (or stop playing) a certain type of music.
 
-    category: Gameplay Functions
+    category: **Gameplay Functions**
 
     This function will handle loading and playing sound assets as necessary,
     and also supports custom user soundtracks on specific platforms so the
diff --git a/assets/src/ba_data/python/ba/_nodeactor.py b/assets/src/ba_data/python/ba/_nodeactor.py
index 756a7fce..e9e78a23 100644
--- a/assets/src/ba_data/python/ba/_nodeactor.py
+++ b/assets/src/ba_data/python/ba/_nodeactor.py
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
 class NodeActor(Actor):
     """A simple ba.Actor type that wraps a single ba.Node.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     This Actor will delete its Node when told to die, and it's
     exists() call will return whether the Node still exists or not.
diff --git a/assets/src/ba_data/python/ba/_plugin.py b/assets/src/ba_data/python/ba/_plugin.py
index 7637717c..a56e4a73 100644
--- a/assets/src/ba_data/python/ba/_plugin.py
+++ b/assets/src/ba_data/python/ba/_plugin.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class PluginSubsystem:
     """Subsystem for plugin handling in the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Access the single shared instance of this class at 'ba.app.plugins'.
     """
@@ -96,7 +96,7 @@ class PluginSubsystem:
 class PotentialPlugin:
     """Represents a ba.Plugin which can potentially be loaded.
 
-    Category: App Classes
+    Category: **App Classes**
 
     These generally represent plugins which were detected by the
     meta-tag scan. However they may also represent plugins which
@@ -111,7 +111,7 @@ class PotentialPlugin:
 class Plugin:
     """A plugin to alter app behavior in some way.
 
-    Category: App Classes
+    Category: **App Classes**
 
     Plugins are discoverable by the meta-tag system
     and the user can select which ones they want to activate.
diff --git a/assets/src/ba_data/python/ba/_powerup.py b/assets/src/ba_data/python/ba/_powerup.py
index 520d3020..246cf7bb 100644
--- a/assets/src/ba_data/python/ba/_powerup.py
+++ b/assets/src/ba_data/python/ba/_powerup.py
@@ -16,31 +16,27 @@ if TYPE_CHECKING:
 class PowerupMessage:
     """A message telling an object to accept a powerup.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     This message is normally received by touching a ba.PowerupBox.
-
-    Attributes:
-
-       poweruptype
-          The type of powerup to be granted (a string).
-          See ba.Powerup.poweruptype for available type values.
-
-       sourcenode
-          The node the powerup game from, or None otherwise.
-          If a powerup is accepted, a ba.PowerupAcceptMessage should be sent
-          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
+    """The type of powerup to be granted (a string).
+       See ba.Powerup.poweruptype for available type values."""
+
     sourcenode: Optional[ba.Node] = None
+    """The node the powerup game from, or None otherwise.
+       If a powerup is accepted, a ba.PowerupAcceptMessage should be sent
+       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."""
 
 
 @dataclass
 class PowerupAcceptMessage:
     """A message informing a ba.Powerup that it was accepted.
 
-    Category: Message Classes
+    Category: **Message Classes**
 
     This is generally sent in response to a ba.PowerupMessage
     to inform the box (or whoever granted it) that it can go away.
diff --git a/assets/src/ba_data/python/ba/_score.py b/assets/src/ba_data/python/ba/_score.py
index b5272118..8b8d009a 100644
--- a/assets/src/ba_data/python/ba/_score.py
+++ b/assets/src/ba_data/python/ba/_score.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class ScoreType(Enum):
     """Type of scores.
 
-    Category: Enums
+    Category: **Enums**
     """
     SECONDS = 's'
     MILLISECONDS = 'ms'
@@ -27,7 +27,7 @@ class ScoreType(Enum):
 class ScoreConfig:
     """Settings for how a game handles scores.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     label: str = 'Score'
diff --git a/assets/src/ba_data/python/ba/_servermode.py b/assets/src/ba_data/python/ba/_servermode.py
index 6df38d79..87e525d7 100644
--- a/assets/src/ba_data/python/ba/_servermode.py
+++ b/assets/src/ba_data/python/ba/_servermode.py
@@ -77,7 +77,7 @@ def _cmd(command_data: bytes) -> None:
 class ServerController:
     """Overall controller for the app in server mode.
 
-    Category: App Classes
+    Category: **App Classes**
     """
 
     def __init__(self, config: ServerConfig) -> None:
diff --git a/assets/src/ba_data/python/ba/_session.py b/assets/src/ba_data/python/ba/_session.py
index 32041f9b..d0ee1264 100644
--- a/assets/src/ba_data/python/ba/_session.py
+++ b/assets/src/ba_data/python/ba/_session.py
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 class Session:
     """Defines a high level series of ba.Activity-es with a common purpose.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Examples of sessions are ba.FreeForAllSession, ba.DualTeamSession, and
     ba.CoopSession.
diff --git a/assets/src/ba_data/python/ba/_stats.py b/assets/src/ba_data/python/ba/_stats.py
index 675bfeb5..282545b4 100644
--- a/assets/src/ba_data/python/ba/_stats.py
+++ b/assets/src/ba_data/python/ba/_stats.py
@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 class PlayerScoredMessage:
     """Informs something that a ba.Player scored.
 
-    Category: Message Classes
+    Category: **Message Classes**
     """
 
     score: int
@@ -31,7 +31,7 @@ class PlayerScoredMessage:
 class PlayerRecord:
     """Stats for an individual player in a ba.Stats object.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     This does not necessarily correspond to a ba.Player that is
     still present (stats may be retained for players that leave
@@ -229,7 +229,7 @@ class PlayerRecord:
 class Stats:
     """Manages scores and statistics for a ba.Session.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_team.py b/assets/src/ba_data/python/ba/_team.py
index 0cdfbe75..170b62af 100644
--- a/assets/src/ba_data/python/ba/_team.py
+++ b/assets/src/ba_data/python/ba/_team.py
@@ -17,39 +17,32 @@ if TYPE_CHECKING:
 class SessionTeam:
     """A team of one or more ba.SessionPlayers.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Note that a SessionPlayer *always* has a SessionTeam;
     in some cases, such as free-for-all ba.Sessions,
     each SessionTeam consists of just one SessionPlayer.
-
-    Attributes:
-
-        name
-            The team's name.
-
-        id
-            The unique numeric id of the team.
-
-        color
-            The team's color.
-
-        players
-            The list of ba.SessionPlayers on the team.
-
-        customdata
-            A dict for use by the current ba.Session for
-            storing data associated with this team.
-            Unlike customdata, this persists for the duration
-            of the session.
     """
 
     # Annotate our attr types at the class level so they're introspectable.
+
     name: Union[ba.Lstr, str]
+    """The team's name."""
+
     color: tuple[float, ...]  # FIXME: can't we make this fixed len?
+    """The team's color."""
+
     players: list[ba.SessionPlayer]
+    """The list of ba.SessionPlayer-s on the team."""
+
     customdata: dict
+    """A dict for use by the current ba.Session for
+       storing data associated with this team.
+       Unlike customdata, this persists for the duration
+       of the session."""
+
     id: int
+    """The unique numeric id of the team."""
 
     def __init__(self,
                  team_id: int = 0,
@@ -79,7 +72,7 @@ PlayerType = TypeVar('PlayerType', bound='ba.Player')
 class Team(Generic[PlayerType]):
     """A team in a specific ba.Activity.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     These correspond to ba.SessionTeam objects, but are created per activity
     so that the activity can use its own custom team subclass.
@@ -197,7 +190,7 @@ class Team(Generic[PlayerType]):
 class EmptyTeam(Team['ba.EmptyPlayer']):
     """An empty player for use by Activities that don't need to define one.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     ba.Player and ba.Team are 'Generic' types, and so passing those top level
     classes as type arguments when defining a ba.Activity reduces type safety.
diff --git a/assets/src/ba_data/python/ba/_teamgame.py b/assets/src/ba_data/python/ba/_teamgame.py
index 93076210..a2bc794d 100644
--- a/assets/src/ba_data/python/ba/_teamgame.py
+++ b/assets/src/ba_data/python/ba/_teamgame.py
@@ -24,7 +24,7 @@ TeamType = TypeVar('TeamType', bound='ba.Team')
 class TeamGameActivity(GameActivity[PlayerType, TeamType]):
     """Base class for teams and free-for-all mode games.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     (Free-for-all is essentially just a special case where every
     ba.Player has their own ba.Team)
diff --git a/assets/src/ba_data/python/ba/_ui.py b/assets/src/ba_data/python/ba/_ui.py
index bf019471..06298010 100644
--- a/assets/src/ba_data/python/ba/_ui.py
+++ b/assets/src/ba_data/python/ba/_ui.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 class UISubsystem:
     """Consolidated UI functionality for the app.
 
-    Category: App Classes
+    Category: **App Classes**
 
     To use this class, access the single instance of it at 'ba.app.ui'.
     """
diff --git a/assets/src/ba_data/python/bastd/actor/bomb.py b/assets/src/ba_data/python/bastd/actor/bomb.py
index ebfc9f01..ae710e94 100644
--- a/assets/src/ba_data/python/bastd/actor/bomb.py
+++ b/assets/src/ba_data/python/bastd/actor/bomb.py
@@ -22,112 +22,110 @@ PlayerType = TypeVar('PlayerType', bound='ba.Player')
 class BombFactory:
     """Wraps up media and other resources used by ba.Bombs.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     A single instance of this is shared between all bombs
     and can be retrieved via bastd.actor.bomb.get_factory().
-
-    Attributes:
-
-       bomb_model: ba.Model
-          The ba.Model of a standard or ice bomb.
-
-       sticky_bomb_model: ba.Model
-          The ba.Model of a sticky-bomb.
-
-       impact_bomb_model: ba.Model
-          The ba.Model of an impact-bomb.
-
-       land_mine_model: ba.Model
-          The ba.Model of a land-mine.
-
-       tnt_model: ba.Model
-          The ba.Model of a tnt box.
-
-       regular_tex: ba.Texture
-          The ba.Texture for regular bombs.
-
-       ice_tex: ba.Texture
-          The ba.Texture for ice bombs.
-
-       sticky_tex: ba.Texture
-          The ba.Texture for sticky bombs.
-
-       impact_tex: ba.Texture
-          The ba.Texture for impact bombs.
-
-       impact_lit_tex: ba.Texture
-          The ba.Texture for impact bombs with lights lit.
-
-       land_mine_tex: ba.Texture
-          The ba.Texture for land-mines.
-
-       land_mine_lit_tex: ba.Texture
-          The ba.Texture for land-mines with the light lit.
-
-       tnt_tex: ba.Texture
-          The ba.Texture for tnt boxes.
-
-       hiss_sound: ba.Sound
-          The ba.Sound for the hiss sound an ice bomb makes.
-
-       debris_fall_sound: ba.Sound
-          The ba.Sound for random falling debris after an explosion.
-
-       wood_debris_fall_sound: ba.Sound
-          A ba.Sound for random wood debris falling after an explosion.
-
-       explode_sounds: Sequence[ba.Sound]
-          A tuple of ba.Sound-s for explosions.
-
-       freeze_sound: ba.Sound
-          A ba.Sound of an ice bomb freezing something.
-
-       fuse_sound: ba.Sound
-          A ba.Sound of a burning fuse.
-
-       activate_sound: ba.Sound
-          A ba.Sound for an activating impact bomb.
-
-       warn_sound: ba.Sound
-          A ba.Sound for an impact bomb about to explode due to time-out.
-
-       bomb_material: ba.Material
-          A ba.Material applied to all bombs.
-
-       normal_sound_material: ba.Material
-          A ba.Material that generates standard bomb noises on impacts, etc.
-
-       sticky_material: ba.Material
-          A ba.Material that makes 'splat' sounds and makes collisions softer.
-
-       land_mine_no_explode_material: ba.Material
-          A ba.Material that keeps land-mines from blowing up.
-          Applied to land-mines when they are created to allow land-mines to
-          touch without exploding.
-
-       land_mine_blast_material: ba.Material
-          A ba.Material applied to activated land-mines that causes them to
-          explode on impact.
-
-       impact_blast_material: ba.Material
-          A ba.Material applied to activated impact-bombs that causes them to
-          explode on impact.
-
-       blast_material: ba.Material
-          A ba.Material applied to bomb blast geometry which triggers impact
-          events with what it touches.
-
-       dink_sounds: Sequence[ba.Sound]
-          A tuple of ba.Sound-s for when bombs hit the ground.
-
-       sticky_impact_sound: ba.Sound
-          The ba.Sound for a squish made by a sticky bomb hitting something.
-
-       roll_sound: ba.Sound
-          ba.Sound for a rolling bomb.
     """
 
+    bomb_model: ba.Model
+    """The ba.Model of a standard or ice bomb."""
+
+    sticky_bomb_model: ba.Model
+    """The ba.Model of a sticky-bomb."""
+
+    impact_bomb_model: ba.Model
+    """The ba.Model of an impact-bomb."""
+
+    land_mine_model: ba.Model
+    """The ba.Model of a land-mine."""
+
+    tnt_model: ba.Model
+    """The ba.Model of a tnt box."""
+
+    regular_tex: ba.Texture
+    """The ba.Texture for regular bombs."""
+
+    ice_tex: ba.Texture
+    """The ba.Texture for ice bombs."""
+
+    sticky_tex: ba.Texture
+    """The ba.Texture for sticky bombs."""
+
+    impact_tex: ba.Texture
+    """The ba.Texture for impact bombs."""
+
+    impact_lit_tex: ba.Texture
+    """The ba.Texture for impact bombs with lights lit."""
+
+    land_mine_tex: ba.Texture
+    """The ba.Texture for land-mines."""
+
+    land_mine_lit_tex: ba.Texture
+    """The ba.Texture for land-mines with the light lit."""
+
+    tnt_tex: ba.Texture
+    """The ba.Texture for tnt boxes."""
+
+    hiss_sound: ba.Sound
+    """The ba.Sound for the hiss sound an ice bomb makes."""
+
+    debris_fall_sound: ba.Sound
+    """The ba.Sound for random falling debris after an explosion."""
+
+    wood_debris_fall_sound: ba.Sound
+    """A ba.Sound for random wood debris falling after an explosion."""
+
+    explode_sounds: Sequence[ba.Sound]
+    """A tuple of ba.Sound-s for explosions."""
+
+    freeze_sound: ba.Sound
+    """A ba.Sound of an ice bomb freezing something."""
+
+    fuse_sound: ba.Sound
+    """A ba.Sound of a burning fuse."""
+
+    activate_sound: ba.Sound
+    """A ba.Sound for an activating impact bomb."""
+
+    warn_sound: ba.Sound
+    """A ba.Sound for an impact bomb about to explode due to time-out."""
+
+    bomb_material: ba.Material
+    """A ba.Material applied to all bombs."""
+
+    normal_sound_material: ba.Material
+    """A ba.Material that generates standard bomb noises on impacts, etc."""
+
+    sticky_material: ba.Material
+    """A ba.Material that makes 'splat' sounds and makes collisions softer."""
+
+    land_mine_no_explode_material: ba.Material
+    """A ba.Material that keeps land-mines from blowing up.
+       Applied to land-mines when they are created to allow land-mines to
+       touch without exploding."""
+
+    land_mine_blast_material: ba.Material
+    """A ba.Material applied to activated land-mines that causes them to
+       explode on impact."""
+
+    impact_blast_material: ba.Material
+    """A ba.Material applied to activated impact-bombs that causes them to
+       explode on impact."""
+
+    blast_material: ba.Material
+    """A ba.Material applied to bomb blast geometry which triggers impact
+       events with what it touches."""
+
+    dink_sounds: Sequence[ba.Sound]
+    """A tuple of ba.Sound-s for when bombs hit the ground."""
+
+    sticky_impact_sound: ba.Sound
+    """The ba.Sound for a squish made by a sticky bomb hitting something."""
+
+    roll_sound: ba.Sound
+    """ba.Sound for a rolling bomb."""
+
     _STORENAME = ba.storagename()
 
     @classmethod
diff --git a/assets/src/ba_data/python/bastd/actor/flag.py b/assets/src/ba_data/python/bastd/actor/flag.py
index 21fafb62..2d7f2133 100644
--- a/assets/src/ba_data/python/bastd/actor/flag.py
+++ b/assets/src/ba_data/python/bastd/actor/flag.py
@@ -15,38 +15,36 @@ if TYPE_CHECKING:
 
 
 class FlagFactory:
-    """Wraps up media and other resources used by ba.Flags.
+    """Wraps up media and other resources used by `Flag`s.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     A single instance of this is shared between all flags
-    and can be retrieved via bastd.actor.flag.get_factory().
-
-    Attributes:
-
-       flagmaterial: ba.Material
-          The ba.Material applied to all ba.Flags.
-
-       impact_sound: ba.Sound
-          The ba.Sound used when a ba.Flag hits the ground.
-
-       skid_sound: ba.Sound
-          The ba.Sound used when a ba.Flag skids along the ground.
-
-       no_hit_material: ba.Material
-          A ba.Material that prevents contact with most objects;
-          applied to 'non-touchable' flags.
-
-       flag_texture: ba.Texture
-          The ba.Texture for flags.
+    and can be retrieved via FlagFactory.get().
     """
 
+    flagmaterial: ba.Material
+    """The ba.Material applied to all `Flag`s."""
+
+    impact_sound: ba.Sound
+    """The ba.Sound used when a `Flag` hits the ground."""
+
+    skid_sound: ba.Sound
+    """The ba.Sound used when a `Flag` skids along the ground."""
+
+    no_hit_material: ba.Material
+    """A ba.Material that prevents contact with most objects;
+       applied to 'non-touchable' flags."""
+
+    flag_texture: ba.Texture
+    """The ba.Texture for flags."""
+
     _STORENAME = ba.storagename()
 
     def __init__(self) -> None:
-        """Instantiate a FlagFactory.
+        """Instantiate a `FlagFactory`.
 
-        You shouldn't need to do this; call bastd.actor.flag.get_factory() to
+        You shouldn't need to do this; call FlagFactory.get() to
         get a shared instance.
         """
         shared = SharedObjects.get()
@@ -109,7 +107,7 @@ class FlagFactory:
 
     @classmethod
     def get(cls) -> FlagFactory:
-        """Get/create a shared FlagFactory instance."""
+        """Get/create a shared `FlagFactory` instance."""
         activity = ba.getactivity()
         factory = activity.customdata.get(cls._STORENAME)
         if factory is None:
@@ -121,58 +119,47 @@ class FlagFactory:
 
 @dataclass
 class FlagPickedUpMessage:
-    """A message saying a ba.Flag has been picked up.
+    """A message saying a `Flag` has been picked up.
 
-        category: Message Classes
+    Category: **Message Classes**
+    """
 
-        Attributes:
-
-           flag
-              The ba.Flag that has been picked up.
-
-           node
-              The ba.Node doing the picking up.
-        """
     flag: Flag
+    """The `Flag` that has been picked up."""
+
     node: ba.Node
+    """The ba.Node doing the picking up."""
 
 
 @dataclass
 class FlagDiedMessage:
-    """A message saying a ba.Flag has died.
+    """A message saying a `Flag` has died.
 
-    category: Message Classes
-
-    Attributes:
-
-       flag
-          The ba.Flag that died.
+    Category: **Message Classes**
     """
+
     flag: Flag
+    """The `Flag` that died."""
 
 
 @dataclass
 class FlagDroppedMessage:
-    """A message saying a ba.Flag has been dropped.
+    """A message saying a `Flag` has been dropped.
 
-    category: Message Classes
-
-    Attributes:
-
-       flag
-          The ba.Flag that was dropped.
-
-       node
-          The ba.Node that was holding it.
+    Category: **Message Classes**
     """
+
     flag: Flag
+    """The `Flag` that was dropped."""
+
     node: ba.Node
+    """The ba.Node that was holding it."""
 
 
 class Flag(ba.Actor):
     """A flag; used in games such as capture-the-flag or king-of-the-hill.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Can be stationary or carry-able by players.
     """
@@ -189,7 +176,7 @@ class Flag(ba.Actor):
         useful for things like king-of-the-hill where players should
         not be moving the flag around.
 
-        'materials can be a list of extra ba.Material-s to apply to the flag.
+        'materials can be a list of extra `ba.Material`s to apply to the flag.
 
         If 'dropped_timeout' is provided (in seconds), the flag will die
         after remaining untouched for that long once it has been moved
@@ -262,8 +249,8 @@ class Flag(ba.Actor):
             if not self._has_moved:
                 nodepos = self.node.position
                 if (max(
-                        abs(nodepos[i] - self._initial_position[i])
-                        for i in list(range(3))) > 1.0):
+                    abs(nodepos[i] - self._initial_position[i])
+                    for i in list(range(3))) > 1.0):
                     self._has_moved = True
 
             if self._held_count > 0 or not self._has_moved:
diff --git a/assets/src/ba_data/python/bastd/actor/playerspaz.py b/assets/src/ba_data/python/bastd/actor/playerspaz.py
index 6cc762e7..29b535ac 100644
--- a/assets/src/ba_data/python/bastd/actor/playerspaz.py
+++ b/assets/src/ba_data/python/bastd/actor/playerspaz.py
@@ -17,31 +17,29 @@ TeamType = TypeVar('TeamType', bound=ba.Team)
 
 
 class PlayerSpazHurtMessage:
-    """A message saying a ba.PlayerSpaz was hurt.
+    """A message saying a PlayerSpaz was hurt.
 
-    category: Message Classes
-
-    Attributes:
-
-       spaz: ba.PlayerSpaz
-          The ba.PlayerSpaz that was hurt
+    Category: **Message Classes**
     """
 
+    spaz: PlayerSpaz
+    """The PlayerSpaz that was hurt"""
+
     def __init__(self, spaz: PlayerSpaz):
         """Instantiate with the given ba.Spaz value."""
         self.spaz = spaz
 
 
 class PlayerSpaz(Spaz):
-    """A ba.Spaz subclass meant to be controlled by a ba.Player.
+    """A Spaz subclass meant to be controlled by a ba.Player.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     When a PlayerSpaz dies, it delivers a ba.PlayerDiedMessage
     to the current ba.Activity. (unless the death was the result of the
     player leaving the game, in which case no message is sent)
 
-    When a PlayerSpaz is hurt, it delivers a ba.PlayerSpazHurtMessage
+    When a PlayerSpaz is hurt, it delivers a PlayerSpazHurtMessage
     to the current ba.Activity.
     """
 
diff --git a/assets/src/ba_data/python/bastd/actor/powerupbox.py b/assets/src/ba_data/python/bastd/actor/powerupbox.py
index 3dda1d9a..cfd51e1d 100644
--- a/assets/src/ba_data/python/bastd/actor/powerupbox.py
+++ b/assets/src/ba_data/python/bastd/actor/powerupbox.py
@@ -23,69 +23,67 @@ class _TouchedMessage:
 class PowerupBoxFactory:
     """A collection of media and other resources used by ba.Powerups.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     A single instance of this is shared between all powerups
     and can be retrieved via ba.Powerup.get_factory().
-
-    Attributes:
-
-       model: ba.Model
-          The ba.Model of the powerup box.
-
-       model_simple: ba.Model
-          A simpler ba.Model of the powerup box, for use in shadows, etc.
-
-       tex_bomb: ba.Texture
-          Triple-bomb powerup ba.Texture.
-
-       tex_punch: ba.Texture
-          Punch powerup ba.Texture.
-
-       tex_ice_bombs: ba.Texture
-          Ice bomb powerup ba.Texture.
-
-       tex_sticky_bombs: ba.Texture
-          Sticky bomb powerup ba.Texture.
-
-       tex_shield: ba.Texture
-          Shield powerup ba.Texture.
-
-       tex_impact_bombs: ba.Texture
-          Impact-bomb powerup ba.Texture.
-
-       tex_health: ba.Texture
-          Health powerup ba.Texture.
-
-       tex_land_mines: ba.Texture
-          Land-mine powerup ba.Texture.
-
-       tex_curse: ba.Texture
-          Curse powerup ba.Texture.
-
-       health_powerup_sound: ba.Sound
-          ba.Sound played when a health powerup is accepted.
-
-       powerup_sound: ba.Sound
-          ba.Sound played when a powerup is accepted.
-
-       powerdown_sound: ba.Sound
-          ba.Sound that can be used when powerups wear off.
-
-       powerup_material: ba.Material
-          ba.Material applied to powerup boxes.
-
-       powerup_accept_material: ba.Material
-          Powerups will send a ba.PowerupMessage to anything they touch
-          that has this ba.Material applied.
     """
 
+    model: ba.Model
+    """The ba.Model of the powerup box."""
+
+    model_simple: ba.Model
+    """A simpler ba.Model of the powerup box, for use in shadows, etc."""
+
+    tex_bomb: ba.Texture
+    """Triple-bomb powerup ba.Texture."""
+
+    tex_punch: ba.Texture
+    """Punch powerup ba.Texture."""
+
+    tex_ice_bombs: ba.Texture
+    """Ice bomb powerup ba.Texture."""
+
+    tex_sticky_bombs: ba.Texture
+    """Sticky bomb powerup ba.Texture."""
+
+    tex_shield: ba.Texture
+    """Shield powerup ba.Texture."""
+
+    tex_impact_bombs: ba.Texture
+    """Impact-bomb powerup ba.Texture."""
+
+    tex_health: ba.Texture
+    """Health powerup ba.Texture."""
+
+    tex_land_mines: ba.Texture
+    """Land-mine powerup ba.Texture."""
+
+    tex_curse: ba.Texture
+    """Curse powerup ba.Texture."""
+
+    health_powerup_sound: ba.Sound
+    """ba.Sound played when a health powerup is accepted."""
+
+    powerup_sound: ba.Sound
+    """ba.Sound played when a powerup is accepted."""
+
+    powerdown_sound: ba.Sound
+    """ba.Sound that can be used when powerups wear off."""
+
+    powerup_material: ba.Material
+    """ba.Material applied to powerup boxes."""
+
+    powerup_accept_material: ba.Material
+    """Powerups will send a ba.PowerupMessage to anything they touch
+       that has this ba.Material applied."""
+
     _STORENAME = ba.storagename()
 
     def __init__(self) -> None:
         """Instantiate a PowerupBoxFactory.
 
-        You shouldn't need to do this; call ba.Powerup.get_factory()
+        You shouldn't need to do this; call Powerup.get_factory()
         to get a shared instance.
         """
         from ba.internal import get_default_powerup_distribution
@@ -191,18 +189,16 @@ class PowerupBox(ba.Actor):
 
     This will deliver a ba.PowerupMessage to anything that touches it
     which has the ba.PowerupBoxFactory.powerup_accept_material applied.
-
-    Attributes:
-
-       poweruptype: str
-          The string powerup type.  This can be 'triple_bombs', 'punch',
-          'ice_bombs', 'impact_bombs', 'land_mines', 'sticky_bombs', 'shield',
-          'health', or 'curse'.
-
-       node: ba.Node
-          The 'prop' ba.Node representing this box.
     """
 
+    poweruptype: str
+    """The string powerup type.  This can be 'triple_bombs', 'punch',
+       'ice_bombs', 'impact_bombs', 'land_mines', 'sticky_bombs', 'shield',
+       'health', or 'curse'."""
+
+    node: ba.Node
+    """The 'prop' ba.Node representing this box."""
+
     def __init__(self,
                  position: Sequence[float] = (0.0, 1.0, 0.0),
                  poweruptype: str = 'triple_bombs',
diff --git a/assets/src/ba_data/python/bastd/actor/spawner.py b/assets/src/ba_data/python/bastd/actor/spawner.py
index b1ed9c11..16693bd7 100644
--- a/assets/src/ba_data/python/bastd/actor/spawner.py
+++ b/assets/src/ba_data/python/bastd/actor/spawner.py
@@ -16,29 +16,27 @@ if TYPE_CHECKING:
 class Spawner:
     """Utility for delayed spawning of objects.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
-    Creates a light flash and sends a ba.Spawner.SpawnMessage
+    Creates a light flash and sends a Spawner.SpawnMessage
     to the current activity after a delay.
     """
 
     class SpawnMessage:
-        """Spawn message sent by a ba.Spawner after its delay has passed.
+        """Spawn message sent by a Spawner after its delay has passed.
 
-        category: Message Classes
-
-        Attributes:
-
-           spawner
-              The ba.Spawner we came from.
-
-           data
-              The data object passed by the user.
-
-           pt
-              The spawn position.
+        Category: **Message Classes**
         """
 
+        spawner: Spawner
+        """The ba.Spawner we came from."""
+
+        data: Any
+        """The data object passed by the user."""
+
+        pt: Sequence[float]
+        """The spawn position."""
+
         def __init__(
                 self,
                 spawner: Spawner,
diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py
index 37ab09e9..b6101ea8 100644
--- a/assets/src/ba_data/python/bastd/actor/spaz.py
+++ b/assets/src/ba_data/python/bastd/actor/spaz.py
@@ -42,23 +42,21 @@ class Spaz(ba.Actor):
     """
     Base class for various Spazzes.
 
-    category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     A Spaz is the standard little humanoid character in the game.
     It can be controlled by a player or by AI, and can have
     various different appearances.  The name 'Spaz' is not to be
     confused with the 'Spaz' character in the game, which is just
     one of the skins available for instances of this class.
-
-    Attributes:
-
-       node: ba.Node
-          The 'spaz' ba.Node.
     """
 
     # pylint: disable=too-many-public-methods
     # pylint: disable=too-many-locals
 
+    node: ba.Node
+    """The 'spaz' ba.Node."""
+
     points_mult = 1
     curse_time: Optional[float] = 5.0
     default_bomb_count = 1
diff --git a/assets/src/ba_data/python/bastd/actor/spazbot.py b/assets/src/ba_data/python/bastd/actor/spazbot.py
index e225962f..62b012cd 100644
--- a/assets/src/ba_data/python/bastd/actor/spazbot.py
+++ b/assets/src/ba_data/python/bastd/actor/spazbot.py
@@ -27,17 +27,15 @@ PRO_BOT_HIGHLIGHT = (0.6, 0.1, 0.05)
 class SpazBotPunchedMessage:
     """A message saying a ba.SpazBot got punched.
 
-    category: Message Classes
-
-    Attributes:
-
-       spazbot: ba.SpazBot
-          The ba.SpazBot that got punched.
-
-       damage: int
-          How much damage was done to the ba.SpazBot.
+    Category: **Message Classes**
     """
 
+    spazbot: SpazBot
+    """The ba.SpazBot that got punched."""
+
+    damage: int
+    """How much damage was done to the SpazBot."""
+
     def __init__(self, spazbot: SpazBot, damage: int):
         """Instantiate a message with the given values."""
         self.spazbot = spazbot
@@ -47,20 +45,18 @@ class SpazBotPunchedMessage:
 class SpazBotDiedMessage:
     """A message saying a ba.SpazBot has died.
 
-    category: Message Classes
-
-    Attributes:
-
-       spazbot: ba.SpazBot
-          The ba.SpazBot that was killed.
-
-       killerplayer: ba.Player
-          The ba.Player that killed it (or None).
-
-       how: ba.DeathType
-          The particular type of death.
+    Category: **Message Classes**
     """
 
+    spazbot: SpazBot
+    """The SpazBot that was killed."""
+
+    killerplayer: ba.Player
+    """The ba.Player that killed it (or None)."""
+
+    how: ba.DeathType
+    """The particular type of death."""
+
     def __init__(self, spazbot: SpazBot, killerplayer: Optional[ba.Player],
                  how: ba.DeathType):
         """Instantiate with given values."""
@@ -72,7 +68,7 @@ class SpazBotDiedMessage:
 class SpazBot(Spaz):
     """A really dumb AI version of ba.Spaz.
 
-    category: Bot Classes
+    Category: **Bot Classes**
 
     Add these to a ba.BotSet to use them.
 
diff --git a/assets/src/ba_data/python/bastd/actor/spazfactory.py b/assets/src/ba_data/python/bastd/actor/spazfactory.py
index 128d3098..1a5bb9be 100644
--- a/assets/src/ba_data/python/bastd/actor/spazfactory.py
+++ b/assets/src/ba_data/python/bastd/actor/spazfactory.py
@@ -11,72 +11,70 @@ from bastd.gameutils import SharedObjects
 import _ba
 
 if TYPE_CHECKING:
-    from typing import Any
+    from typing import Any, Sequence
 
 
 class SpazFactory:
     """Wraps up media and other resources used by ba.Spaz instances.
 
-    Category: Gameplay Classes
+    Category: **Gameplay Classes**
 
     Generally one of these is created per ba.Activity and shared
-    between all spaz instances.  Use ba.Spaz.get_factory() to return
+    between all spaz instances. Use ba.Spaz.get_factory() to return
     the shared factory for the current activity.
-
-    Attributes:
-
-       impact_sounds_medium: Sequence[ba.Sound]
-          A tuple of ba.Sound-s for when a ba.Spaz hits something kinda hard.
-
-       impact_sounds_hard: Sequence[ba.Sound]
-          A tuple of ba.Sound-s for when a ba.Spaz hits something really hard.
-
-       impact_sounds_harder: Sequence[ba.Sound]
-          A tuple of ba.Sound-s for when a ba.Spaz hits something really
-          really hard.
-
-       single_player_death_sound: ba.Sound
-          The sound that plays for an 'important' spaz death such as in
-          co-op games.
-
-       punch_sound: ba.Sound
-          A standard punch ba.Sound.
-
-       punch_sound_strong: Sequence[ba.Sound]
-          A tuple of stronger sounding punch ba.Sounds.
-
-       punch_sound_stronger: ba.Sound
-          A really really strong sounding punch ba.Sound.
-
-       swish_sound: ba.Sound
-          A punch swish ba.Sound.
-
-       block_sound: ba.Sound
-          A ba.Sound for when an attack is blocked by invincibility.
-
-       shatter_sound: ba.Sound
-          A ba.Sound for when a frozen ba.Spaz shatters.
-
-       splatter_sound: ba.Sound
-          A ba.Sound for when a ba.Spaz blows up via curse.
-
-       spaz_material: ba.Material
-          A ba.Material applied to all of parts of a ba.Spaz.
-
-       roller_material: ba.Material
-          A ba.Material applied to the invisible roller ball body that
-          a ba.Spaz uses for locomotion.
-
-       punch_material: ba.Material
-          A ba.Material applied to the 'fist' of a ba.Spaz.
-
-       pickup_material: ba.Material
-          A ba.Material applied to the 'grabber' body of a ba.Spaz.
-
-       curse_material: ba.Material
-          A ba.Material applied to a cursed ba.Spaz that triggers an explosion.
     """
 
+    impact_sounds_medium: Sequence[ba.Sound]
+    """A tuple of ba.Sound-s for when a ba.Spaz hits something kinda hard."""
+
+    impact_sounds_hard: Sequence[ba.Sound]
+    """A tuple of ba.Sound-s for when a ba.Spaz hits something really hard."""
+
+    impact_sounds_harder: Sequence[ba.Sound]
+    """A tuple of ba.Sound-s for when a ba.Spaz hits something really
+       really hard."""
+
+    single_player_death_sound: ba.Sound
+    """The sound that plays for an 'important' spaz death such as in
+       co-op games."""
+
+    punch_sound: ba.Sound
+    """A standard punch ba.Sound."""
+
+    punch_sound_strong: Sequence[ba.Sound]
+    """A tuple of stronger sounding punch ba.Sounds."""
+
+    punch_sound_stronger: ba.Sound
+    """A really really strong sounding punch ba.Sound."""
+
+    swish_sound: ba.Sound
+    """A punch swish ba.Sound."""
+
+    block_sound: ba.Sound
+    """A ba.Sound for when an attack is blocked by invincibility."""
+
+    shatter_sound: ba.Sound
+    """A ba.Sound for when a frozen ba.Spaz shatters."""
+
+    splatter_sound: ba.Sound
+    """A ba.Sound for when a ba.Spaz blows up via curse."""
+
+    spaz_material: ba.Material
+    """A ba.Material applied to all of parts of a ba.Spaz."""
+
+    roller_material: ba.Material
+    """A ba.Material applied to the invisible roller ball body that
+       a ba.Spaz uses for locomotion."""
+
+    punch_material: ba.Material
+    """A ba.Material applied to the 'fist' of a ba.Spaz."""
+
+    pickup_material: ba.Material
+    """A ba.Material applied to the 'grabber' body of a ba.Spaz."""
+
+    curse_material: ba.Material
+    """A ba.Material applied to a cursed ba.Spaz that triggers an explosion."""
+
     _STORENAME = ba.storagename()
 
     def _preload(self, character: str) -> None:
diff --git a/assets/src/ba_data/python/bastd/ui/config.py b/assets/src/ba_data/python/bastd/ui/config.py
index b9e74000..d8567e51 100644
--- a/assets/src/ba_data/python/bastd/ui/config.py
+++ b/assets/src/ba_data/python/bastd/ui/config.py
@@ -17,13 +17,11 @@ class ConfigCheckBox:
 
     It will automatically save and apply the config when its
     value changes.
-
-    Attributes:
-
-        widget
-            The underlying ba.Widget instance.
     """
 
+    widget: ba.Widget
+    """The underlying ba.Widget instance."""
+
     def __init__(self,
                  parent: ba.Widget,
                  configkey: str,
@@ -65,22 +63,20 @@ class ConfigNumberEdit:
 
     It will automatically save and apply the config when its
     value changes.
-
-    Attributes:
-
-        nametext
-            The text widget displaying the name.
-
-        valuetext
-            The text widget displaying the current value.
-
-        minusbutton
-            The button widget used to reduce the value.
-
-        plusbutton
-            The button widget used to increase the value.
     """
 
+    nametext: ba.Widget
+    """The text widget displaying the name."""
+
+    valuetext: ba.Widget
+    """The text widget displaying the current value."""
+
+    minusbutton: ba.Widget
+    """The button widget used to reduce the value."""
+
+    plusbutton: ba.Widget
+    """The button widget used to increase the value."""
+
     def __init__(self,
                  parent: ba.Widget,
                  configkey: str,
diff --git a/src/ballistica/python/class/python_class_collide_model.cc b/src/ballistica/python/class/python_class_collide_model.cc
index 71b3237c..b66764db 100644
--- a/src/ballistica/python/class/python_class_collide_model.cc
+++ b/src/ballistica/python/class/python_class_collide_model.cc
@@ -27,7 +27,7 @@ void PythonClassCollideModel::SetupType(PyTypeObject* obj) {
       "\n"
       "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getcollidemodel to instantiate one.";
+      "Use ba.getcollidemodel() to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_context.cc b/src/ballistica/python/class/python_class_context.cc
index 2948c930..9df99fb1 100644
--- a/src/ballistica/python/class/python_class_context.cc
+++ b/src/ballistica/python/class/python_class_context.cc
@@ -21,7 +21,7 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "\n"
       "Category: **General Utility Classes**\n"
       "\n"
-      "Many operations such as ba.newnode or ba.gettexture operate\n"
+      "Many operations such as ba.newnode() or ba.gettexture() operate\n"
       "implicitly on the current context. Each ba.Activity has its own\n"
       "Context and objects within that activity (nodes, media, etc) can only\n"
       "interact with other objects from that context.\n"
@@ -36,7 +36,7 @@ void PythonClassContext::SetupType(PyTypeObject* obj) {
       "When instantiating a ba.Context instance, a single `'source'` "
       "argument\n"
       "is passed, which can be one of the following strings/objects:\n\n"
-      "`'empty'`:\n"
+      "###### `'empty'`\n"
       "> Gives an empty context; it can be handy to run code here to ensure\n"
       "it does no loading of media, creation of nodes, etc.\n"
       "\n"
diff --git a/src/ballistica/python/class/python_class_data.cc b/src/ballistica/python/class/python_class_data.cc
index eb27df33..2e37a415 100644
--- a/src/ballistica/python/class/python_class_data.cc
+++ b/src/ballistica/python/class/python_class_data.cc
@@ -26,7 +26,7 @@ void PythonClassData::SetupType(PyTypeObject* obj) {
       "\n"
       "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getdata to instantiate one.";
+      "Use ba.getdata() to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_material.cc b/src/ballistica/python/class/python_class_material.cc
index f5d651e5..8de56cbd 100644
--- a/src/ballistica/python/class/python_class_material.cc
+++ b/src/ballistica/python/class/python_class_material.cc
@@ -51,21 +51,21 @@ void PythonClassMaterial::SetupType(PyTypeObject* obj) {
       "\n"
       "An entity applied to game objects to modify collision behavior.\n"
       "\n"
-      "Category: Gameplay Classes\n"
+      "Category: **Gameplay Classes**\n"
       "\n"
       "A material can affect physical characteristics, generate sounds,\n"
       "or trigger callback functions when collisions occur.\n"
       "\n"
-      "Materials are applied to ``'parts'``, which are groups of one or more\n"
+      "Materials are applied to 'parts', which are groups of one or more\n"
       "rigid bodies created as part of a ba.Node. Nodes can have any number\n"
       "of parts, each with its own set of materials. Generally materials are\n"
-      "specified as array attributes on the Node. The ``'spaz'`` node, for\n"
-      "example, has various attributes such as ``'materials'``,\n"
-      "``'roller_materials'``, and ``'punch_materials'``, which correspond\n"
+      "specified as array attributes on the Node. The `spaz` node, for\n"
+      "example, has various attributes such as `materials`,\n"
+      "`roller_materials`, and `punch_materials`, which correspond\n"
       "to the various parts it creates.\n"
       "\n"
       "Use ba.Material to instantiate a blank material, and then use its\n"
-      "ba.Material.add_actions method to define what the material does.\n"
+      "ba.Material.add_actions() method to define what the material does.\n"
       "\n"
       "Attributes:\n"
       "\n"
@@ -342,7 +342,7 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "`'at_connect'` or `'at_disconnect'`, and `message_obj` is the message\n"
      "object to send.\n"
      "This has the same effect as calling the node's\n"
-     "ba.Node.handlemessage method.\n"
+     "ba.Node.handlemessage() method.\n"
      "\n"
      "###### `('modify_part_collision', attr, value)`\n"
      "> Changes some\n"
@@ -362,7 +362,7 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "overrides for this collision), `'stiffness'` (float value,\n"
      "how springy the physical response is), `'damping'` (float\n"
      "value, how damped the physical response is), `'bounce'` (float\n"
-     "value; how bouncy the physical response is)."
+     "value; how bouncy the physical response is).\n"
      "\n"
      "###### `('modify_node_collision', attr, value)`\n"
      "> Similar to\n"
@@ -410,7 +410,6 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "\n"
      "**Example 2:** send a ba.DieMessage to anything we touch, but cause\n"
      "no physical response. This should cause any ba.Actor to drop dead:\n"
-     "```python\n"
      ">>> m = ba.Material()\n"
      "... m.add_actions(\n"
      "...     actions=(('modify_part_collision', 'physical', False),\n"
@@ -418,7 +417,6 @@ PyMethodDef PythonClassMaterial::tp_methods[] = {
      "...                  ba.DieMessage())))\n"
      "\n"
      "**Example 3:** play some sounds when we're contacting the ground:\n"
-     "```python\n"
      ">>> m = ba.Material()\n"
      "... m.add_actions(\n"
      "...     conditions=('they_have_material',\n"
diff --git a/src/ballistica/python/class/python_class_node.cc b/src/ballistica/python/class/python_class_node.cc
index 684b7891..751a17a6 100644
--- a/src/ballistica/python/class/python_class_node.cc
+++ b/src/ballistica/python/class/python_class_node.cc
@@ -25,7 +25,7 @@ void PythonClassNode::SetupType(PyTypeObject* obj) {
   obj->tp_doc =
       "Reference to a Node; the low level building block of the game.\n"
       "\n"
-      "Category: Gameplay Classes\n"
+      "Category: **Gameplay Classes**\n"
       "\n"
       "At its core, a game is nothing more than a scene of Nodes\n"
       "with attributes getting interconnected or set over time.\n"
@@ -34,8 +34,8 @@ void PythonClassNode::SetupType(PyTypeObject* obj) {
       "to a game node; *not* the node itself. This means a Node's\n"
       "lifecycle is completely independent of how many Python references\n"
       "to it exist. To explicitly add a new node to the game, use\n"
-      "ba.newnode, and to explicitly delete one, use ba.Node.delete.\n"
-      "ba.Node.exists can be used to determine if a Node still points to\n"
+      "ba.newnode(), and to explicitly delete one, use ba.Node.delete().\n"
+      "ba.Node.exists() can be used to determine if a Node still points to\n"
       "a live node in the game.\n"
       "\n"
       "You can use ba.Node(None) to instantiate an invalid\n"
diff --git a/src/ballistica/python/class/python_class_session_player.cc b/src/ballistica/python/class/python_class_session_player.cc
index 8f914a77..7dd71794 100644
--- a/src/ballistica/python/class/python_class_session_player.cc
+++ b/src/ballistica/python/class/python_class_session_player.cc
@@ -53,7 +53,7 @@ void PythonClassSessionPlayer::SetupType(PyTypeObject* obj) {
       "Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'\n"
       "references under-the-hood; a player can leave the game at\n"
       " any point. For this reason, you should make judicious use of the\n"
-      "ba.SessionPlayer.exists method (or boolean operator) to ensure\n"
+      "ba.SessionPlayer.exists() method (or boolean operator) to ensure\n"
       "that a SessionPlayer is still present if retaining references to one\n"
       "for any length of time.\n"
       "\n"
diff --git a/src/ballistica/python/class/python_class_sound.cc b/src/ballistica/python/class/python_class_sound.cc
index 52a58545..ba6b5732 100644
--- a/src/ballistica/python/class/python_class_sound.cc
+++ b/src/ballistica/python/class/python_class_sound.cc
@@ -26,7 +26,7 @@ void PythonClassSound::SetupType(PyTypeObject* obj) {
       "\n"
       "Category: **Asset Classes**\n"
       "\n"
-      "Use ba.getsound to instantiate one.";
+      "Use ba.getsound() to instantiate one.";
   obj->tp_repr = (reprfunc)tp_repr;
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/class/python_class_widget.cc b/src/ballistica/python/class/python_class_widget.cc
index 2008afe2..5311ee6b 100644
--- a/src/ballistica/python/class/python_class_widget.cc
+++ b/src/ballistica/python/class/python_class_widget.cc
@@ -26,7 +26,7 @@ void PythonClassWidget::SetupType(PyTypeObject* obj) {
       "\n"
       "This class represents a weak reference to a widget object\n"
       "in the internal C++ layer. Currently, functions such as\n"
-      "ba.buttonwidget must be used to instantiate or edit these.";
+      "ba.buttonwidget() must be used to instantiate or edit these.";
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
   obj->tp_repr = (reprfunc)tp_repr;
diff --git a/src/ballistica/python/methods/python_methods_app.cc b/src/ballistica/python/methods/python_methods_app.cc
index b9830b18..51a2d652 100644
--- a/src/ballistica/python/methods/python_methods_app.cc
+++ b/src/ballistica/python/methods/python_methods_app.cc
@@ -1034,7 +1034,7 @@ auto PythonMethodsApp::GetMethods() -> std::vector<PyMethodDef> {
          " require the ability to do so, use the ba.Timer class instead.\n"
          "\n"
          "##### Arguments\n"
-         "###### time (float):\n"
+         "###### time (float)\n"
          "> Length of time (in seconds by default) that the timer will wait\n"
          "before firing. Note that the actual delay experienced may vary\n "
          "depending on the timetype. (see below)\n"
diff --git a/src/ballistica/python/methods/python_methods_system.cc b/src/ballistica/python/methods/python_methods_system.cc
index 7c46c60f..aa3c28e6 100644
--- a/src/ballistica/python/methods/python_methods_system.cc
+++ b/src/ballistica/python/methods/python_methods_system.cc
@@ -812,7 +812,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Category: **General Utility Functions**\n"
        "\n"
-       "Ensure that ba.clipboard_available returns True before adding\n"
+       "Ensure that ba.clipboard_available() returns True before adding\n"
        " buttons/etc. that make use of this functionality."},
       {"clipboard_get_text", (PyCFunction)PyClipboardGetText, METH_NOARGS,
        "clipboard_get_text() -> str\n"
@@ -821,7 +821,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Category: **General Utility Functions**\n"
        "\n"
-       "Ensure that ba.clipboard_has_text returns True before calling\n"
+       "Ensure that ba.clipboard_has_text() returns True before calling\n"
        " this function."},
       {"printobjects", (PyCFunction)PyPrintObjects,
        METH_VARARGS | METH_KEYWORDS,

From 6fddc0988718020554160f967227701adfc0b74f Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Tue, 22 Feb 2022 22:16:43 +0300
Subject: [PATCH 17/21] tidying up docstrings

---
 assets/src/ba_data/python/._ba_sources_hash      |  2 +-
 assets/src/ba_data/python/_ba.py                 |  6 +++---
 assets/src/ba_data/python/ba/_activity.py        |  2 +-
 assets/src/ba_data/python/ba/_actor.py           |  8 ++++----
 assets/src/ba_data/python/ba/_player.py          | 16 +++++-----------
 assets/src/ba_data/python/ba/_plugin.py          |  2 +-
 assets/src/ba_data/python/bastd/actor/flag.py    |  4 ++--
 assets/src/ba_data/python/bastd/actor/spazbot.py |  2 +-
 src/ballistica/python/class/python_class_node.cc |  2 +-
 .../python/methods/python_methods_system.cc      |  4 ++--
 10 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 48a48da1..51d0de9b 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-251300217209184493283326875275347381659
\ No newline at end of file
+32362240586742836034231639790863797313
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index 2048b45d..7ab61494 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -511,7 +511,7 @@ class Node:
     ba.Node.exists() can be used to determine if a Node still points to
     a live node in the game.
 
-    You can use ba.Node(None) to instantiate an invalid
+    You can use `ba.Node(None)` to instantiate an invalid
     Node reference (sometimes used as attr values/etc).
     """
 
@@ -1330,7 +1330,7 @@ def clipboard_has_text() -> bool:
     Category: **General Utility Functions**
 
     This will return False if no system clipboard is available; no need
-     to call ba.clipboard_available() separately.
+     to call ba.clipboard_is_supported() separately.
     """
     return bool()
 
@@ -1351,7 +1351,7 @@ def clipboard_set_text(value: str) -> None:
 
     Category: **General Utility Functions**
 
-    Ensure that ba.clipboard_available() returns True before adding
+    Ensure that ba.clipboard_is_supported() returns True before adding
      buttons/etc. that make use of this functionality.
     """
     return None
diff --git a/assets/src/ba_data/python/ba/_activity.py b/assets/src/ba_data/python/ba/_activity.py
index 78a79f02..50622430 100644
--- a/assets/src/ba_data/python/ba/_activity.py
+++ b/assets/src/ba_data/python/ba/_activity.py
@@ -356,7 +356,7 @@ class Activity(DependencyComponent, Generic[PlayerType, TeamType]):
         Upon this call, the Activity should fade in backgrounds,
         start playing music, etc. It does not yet have access to players
         or teams, however. They remain owned by the previous Activity
-        up until ba.Activity.on_begin is called.
+        up until ba.Activity.on_begin() is called.
         """
 
     def on_transition_out(self) -> None:
diff --git a/assets/src/ba_data/python/ba/_actor.py b/assets/src/ba_data/python/ba/_actor.py
index 009000f0..d6a7c194 100644
--- a/assets/src/ba_data/python/ba/_actor.py
+++ b/assets/src/ba_data/python/ba/_actor.py
@@ -52,9 +52,9 @@ class Actor:
     if you want an Actor to stick around until explicitly killed
     regardless of references.
 
-    Another key feature of ba.Actor is its ba.Actor.handlemessage() method, which
-    takes a single arbitrary object as an argument. This provides a safe way
-    to communicate between ba.Actor, ba.Activity, ba.Session, and any other
+    Another key feature of ba.Actor is its ba.Actor.handlemessage() method,
+    which takes a single arbitrary object as an argument. This provides a safe
+    way to communicate between ba.Actor, ba.Activity, ba.Session, and any other
     class providing a handlemessage() method. The most universally handled
     message type for Actors is the ba.DieMessage.
 
@@ -113,7 +113,7 @@ class Actor:
         return self
 
     def on_expire(self) -> None:
-        """Called for remaining ba.Actor-s when their ba.Activity shuts down.
+        """Called for remaining `ba.Actor`s when their ba.Activity shuts down.
 
         Actors can use this opportunity to clear callbacks or other
         references which have the potential of keeping the ba.Activity
diff --git a/assets/src/ba_data/python/ba/_player.py b/assets/src/ba_data/python/ba/_player.py
index 996bfb66..3da52bd3 100644
--- a/assets/src/ba_data/python/ba/_player.py
+++ b/assets/src/ba_data/python/ba/_player.py
@@ -222,8 +222,7 @@ class Player(Generic[TeamType]):
         return self._sessionplayer.exists() and not self._expired
 
     def getname(self, full: bool = False, icon: bool = True) -> str:
-        """getname(full: bool = False, icon: bool = True) -> str
-
+        """
         Returns the player's name. If icon is True, the long version of the
         name may include an icon.
         """
@@ -232,8 +231,7 @@ class Player(Generic[TeamType]):
         return self._sessionplayer.getname(full=full, icon=icon)
 
     def is_alive(self) -> bool:
-        """is_alive() -> bool
-
+        """
         Returns True if the player has a ba.Actor assigned and its
         is_alive() method return True. False is returned otherwise.
         """
@@ -242,8 +240,7 @@ class Player(Generic[TeamType]):
         return self.actor is not None and self.actor.is_alive()
 
     def get_icon(self) -> dict[str, Any]:
-        """get_icon() -> dict[str, Any]
-
+        """
         Returns the character's icon (images, colors, etc contained in a dict)
         """
         assert self._postinited
@@ -253,9 +250,7 @@ class Player(Generic[TeamType]):
     def assigninput(self, inputtype: Union[ba.InputType, tuple[ba.InputType,
                                                                ...]],
                     call: Callable) -> None:
-        """assigninput(type: Union[ba.InputType, Tuple[ba.InputType, ...]],
-          call: Callable) -> None
-
+        """
         Set the python callable to be run for one or more types of input.
         """
         assert self._postinited
@@ -263,8 +258,7 @@ class Player(Generic[TeamType]):
         return self._sessionplayer.assigninput(type=inputtype, call=call)
 
     def resetinput(self) -> None:
-        """resetinput() -> None
-
+        """
         Clears out the player's assigned input actions.
         """
         assert self._postinited
diff --git a/assets/src/ba_data/python/ba/_plugin.py b/assets/src/ba_data/python/ba/_plugin.py
index a56e4a73..6de548a8 100644
--- a/assets/src/ba_data/python/ba/_plugin.py
+++ b/assets/src/ba_data/python/ba/_plugin.py
@@ -18,7 +18,7 @@ class PluginSubsystem:
 
     Category: **App Classes**
 
-    Access the single shared instance of this class at 'ba.app.plugins'.
+    Access the single shared instance of this class at `ba.app.plugins`.
     """
 
     def __init__(self) -> None:
diff --git a/assets/src/ba_data/python/bastd/actor/flag.py b/assets/src/ba_data/python/bastd/actor/flag.py
index 2d7f2133..6fae9d40 100644
--- a/assets/src/ba_data/python/bastd/actor/flag.py
+++ b/assets/src/ba_data/python/bastd/actor/flag.py
@@ -249,8 +249,8 @@ class Flag(ba.Actor):
             if not self._has_moved:
                 nodepos = self.node.position
                 if (max(
-                    abs(nodepos[i] - self._initial_position[i])
-                    for i in list(range(3))) > 1.0):
+                        abs(nodepos[i] - self._initial_position[i])
+                        for i in list(range(3))) > 1.0):
                     self._has_moved = True
 
             if self._held_count > 0 or not self._has_moved:
diff --git a/assets/src/ba_data/python/bastd/actor/spazbot.py b/assets/src/ba_data/python/bastd/actor/spazbot.py
index 62b012cd..e9bb4bda 100644
--- a/assets/src/ba_data/python/bastd/actor/spazbot.py
+++ b/assets/src/ba_data/python/bastd/actor/spazbot.py
@@ -51,7 +51,7 @@ class SpazBotDiedMessage:
     spazbot: SpazBot
     """The SpazBot that was killed."""
 
-    killerplayer: ba.Player
+    killerplayer: Optional[ba.Player]
     """The ba.Player that killed it (or None)."""
 
     how: ba.DeathType
diff --git a/src/ballistica/python/class/python_class_node.cc b/src/ballistica/python/class/python_class_node.cc
index 751a17a6..0ad9ed7e 100644
--- a/src/ballistica/python/class/python_class_node.cc
+++ b/src/ballistica/python/class/python_class_node.cc
@@ -38,7 +38,7 @@ void PythonClassNode::SetupType(PyTypeObject* obj) {
       "ba.Node.exists() can be used to determine if a Node still points to\n"
       "a live node in the game.\n"
       "\n"
-      "You can use ba.Node(None) to instantiate an invalid\n"
+      "You can use `ba.Node(None)` to instantiate an invalid\n"
       "Node reference (sometimes used as attr values/etc).";
   obj->tp_new = tp_new;
   obj->tp_dealloc = (destructor)tp_dealloc;
diff --git a/src/ballistica/python/methods/python_methods_system.cc b/src/ballistica/python/methods/python_methods_system.cc
index aa3c28e6..7d748064 100644
--- a/src/ballistica/python/methods/python_methods_system.cc
+++ b/src/ballistica/python/methods/python_methods_system.cc
@@ -803,7 +803,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "Category: **General Utility Functions**\n"
        "\n"
        "This will return False if no system clipboard is available; no need\n"
-       " to call ba.clipboard_available() separately."},
+       " to call ba.clipboard_is_supported() separately."},
       {"clipboard_set_text", (PyCFunction)PyClipboardSetText,
        METH_VARARGS | METH_KEYWORDS,
        "clipboard_set_text(value: str) -> None\n"
@@ -812,7 +812,7 @@ auto PythonMethodsSystem::GetMethods() -> std::vector<PyMethodDef> {
        "\n"
        "Category: **General Utility Functions**\n"
        "\n"
-       "Ensure that ba.clipboard_available() returns True before adding\n"
+       "Ensure that ba.clipboard_is_supported() returns True before adding\n"
        " buttons/etc. that make use of this functionality."},
       {"clipboard_get_text", (PyCFunction)PyClipboardGetText, METH_NOARGS,
        "clipboard_get_text() -> str\n"

From 04a7479c59ff72cacf0d0d279927b6df4d2ab7b9 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Wed, 23 Feb 2022 00:13:07 +0300
Subject: [PATCH 18/21] stub for index page

---
 assets/src/pdoc/templates/index.html.jinja2 | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 assets/src/pdoc/templates/index.html.jinja2

diff --git a/assets/src/pdoc/templates/index.html.jinja2 b/assets/src/pdoc/templates/index.html.jinja2
new file mode 100644
index 00000000..d049542b
--- /dev/null
+++ b/assets/src/pdoc/templates/index.html.jinja2
@@ -0,0 +1,29 @@
+{% extends "default/index.html.jinja2" %}
+
+{% block content %}
+    <header class="pdoc">
+        {% block logo %}
+            <a href="https://ballistica.net">
+                <img src="https://files.ballistica.net/ballistica_media/ballistica_logo_half.png"
+                     alt="project logo"/>
+            </a>
+        {% endblock %}
+        {% if search %}
+            <input type="search" placeholder="Search Ballistica Python API Documentation..." aria-label="search box">
+        {% endif %}
+    </header>
+    <main class="pdoc">
+        <h1>header woo-hoo</h1>
+        Welcome to blah blah blah, some <b>bold</b> text, create an
+        <a href="https://github.com/efroemling/ballistica/issues/">issue</a>
+        if something in this docs feels incorrect or can be improved blah blah
+        <code>
+            some code hooray
+        </code>
+        <br/>
+        TODO: add some normal text here.
+    </main>
+    {% if search %}
+        {% include "search.html.jinja2" %}
+    {% endif %}
+{% endblock %}

From ff3f8a8c35e11a1e1fbdcab3b2fa677e5bd4c9e8 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Wed, 23 Feb 2022 17:39:12 +0300
Subject: [PATCH 19/21] update index page

---
 assets/src/ba_data/python/ba/__init__.py    |  2 +-
 assets/src/pdoc/templates/index.html.jinja2 | 30 ++++++++++++++-------
 tools/batools/docs.py                       |  5 ++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/assets/src/ba_data/python/ba/__init__.py b/assets/src/ba_data/python/ba/__init__.py
index a773a787..1f32e5bf 100644
--- a/assets/src/ba_data/python/ba/__init__.py
+++ b/assets/src/ba_data/python/ba/__init__.py
@@ -18,7 +18,7 @@ from _ba import (
     newnode, playsound, printnodes, printobjects, pushcall, quit, rowwidget,
     safecolor, screenmessage, scrollwidget, set_analytics_screen, charstr,
     textwidget, time, timer, open_url, widget, clipboard_is_supported,
-    clipboard_has_text, clipboard_get_text, clipboard_set_text)
+    clipboard_has_text, clipboard_get_text, clipboard_set_text, getdata)
 from ba._activity import Activity
 from ba._plugin import PotentialPlugin, Plugin, PluginSubsystem
 from ba._actor import Actor
diff --git a/assets/src/pdoc/templates/index.html.jinja2 b/assets/src/pdoc/templates/index.html.jinja2
index d049542b..efc2fba5 100644
--- a/assets/src/pdoc/templates/index.html.jinja2
+++ b/assets/src/pdoc/templates/index.html.jinja2
@@ -9,19 +9,29 @@
             </a>
         {% endblock %}
         {% if search %}
-            <input type="search" placeholder="Search Ballistica Python API Documentation..." aria-label="search box">
+            <input type="search"
+                   placeholder="Search Python API Documentation..."
+                   aria-label="search box">
         {% endif %}
     </header>
     <main class="pdoc">
-        <h1>header woo-hoo</h1>
-        Welcome to blah blah blah, some <b>bold</b> text, create an
-        <a href="https://github.com/efroemling/ballistica/issues/">issue</a>
-        if something in this docs feels incorrect or can be improved blah blah
-        <code>
-            some code hooray
-        </code>
-        <br/>
-        TODO: add some normal text here.
+        <h1>Welcome to Ballistica Documentations!</h1>
+        <i>Last updated for Ballistica {{ ba_version }}
+            (build {{ ba_build }})</i>
+        <hr/>
+        <p>
+            Here you can find information about Python classes/functions
+            used by Ballistica.
+            Fell free to create an
+            <a href="https://github.com/efroemling/ballistica/issues/">
+                issue</a>
+            or send a
+            <a href="https://github.com/efroemling/ballistica/pulls/">PR</a>
+            if something in this docs feels incorrect or can be improved.
+            Note that <code>bastd</code>'s docs may look a little terrible
+            right
+            now, hope that's temporary. :)
+        </p>
     </main>
     {% if search %}
         {% include "search.html.jinja2" %}
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index e12c7177..f47587c9 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -75,6 +75,7 @@ def parse_docs_attrs(attrs: list[AttributeInfo], docs: str) -> str:
 
 def generate(projroot: str) -> None:
     """Main entry point."""
+    from batools.version import get_current_version
     import pdoc
 
     # Make sure we're running from the dir above this script.
@@ -87,7 +88,11 @@ def generate(projroot: str) -> None:
     outdirname = (Path(projroot) / 'build' / 'docs_html').absolute()
     sys.path.append(str(pythondir))
 
+    version, build_number = get_current_version()
+
     try:
+        pdoc.render.env.globals['ba_version'] = version
+        pdoc.render.env.globals['ba_build'] = build_number
         pdoc.render.configure(search=True,
                               show_source=True,
                               template_directory=templatesdir)

From 52182406563538b5c46225b277f61cc0cc8eb864 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Wed, 9 Mar 2022 22:29:18 +0300
Subject: [PATCH 20/21] tidy up

---
 assets/src/ba_data/python/._ba_sources_hash                | 2 +-
 assets/src/ba_data/python/_ba.py                           | 4 +---
 src/ballistica/python/class/python_class_session_player.cc | 2 +-
 src/ballistica/python/methods/python_methods_gameplay.cc   | 2 +-
 src/ballistica/python/methods/python_methods_graphics.cc   | 2 +-
 tools/batools/dummymodule.py                               | 3 ++-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index 873c68f4..c986901a 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-135697331021140808219546877225423515533
+279025597381990417612350974335348401455
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index f199c10c..a6d81958 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -1654,9 +1654,7 @@ def get_chat_messages() -> list[str]:
 
 
 def get_client_public_device_uuid(client_id: int) -> Optional[str]:
-    """get_client_public_device_uuid(client_id: int) -> Optional[str]
-
-    (internal)
+    """(internal)
 
     Category: General Utility Functions
 
diff --git a/src/ballistica/python/class/python_class_session_player.cc b/src/ballistica/python/class/python_class_session_player.cc
index 7dd71794..8544ced5 100644
--- a/src/ballistica/python/class/python_class_session_player.cc
+++ b/src/ballistica/python/class/python_class_session_player.cc
@@ -50,7 +50,7 @@ void PythonClassSessionPlayer::SetupType(PyTypeObject* obj) {
       "\n"
       "These are created and managed internally and\n"
       "provided to your ba.Session/ba.Activity instances.\n"
-      "Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'\n"
+      "Be aware that, like `ba.Node`s, ba.SessionPlayer objects are 'weak'\n"
       "references under-the-hood; a player can leave the game at\n"
       " any point. For this reason, you should make judicious use of the\n"
       "ba.SessionPlayer.exists() method (or boolean operator) to ensure\n"
diff --git a/src/ballistica/python/methods/python_methods_gameplay.cc b/src/ballistica/python/methods/python_methods_gameplay.cc
index 6ce50d1d..b3d0559b 100644
--- a/src/ballistica/python/methods/python_methods_gameplay.cc
+++ b/src/ballistica/python/methods/python_methods_gameplay.cc
@@ -728,7 +728,7 @@ auto PythonMethodsGameplay::GetMethods() -> std::vector<PyMethodDef> {
       {"getnodes", PyGetNodes, METH_VARARGS,
        "getnodes() -> list\n"
        "\n"
-       "Return all nodes in the current ba.Context."
+       "Return all nodes in the current ba.Context.\n"
        "\n"
        "Category: **Gameplay Functions**"},
 
diff --git a/src/ballistica/python/methods/python_methods_graphics.cc b/src/ballistica/python/methods/python_methods_graphics.cc
index 9756dd58..4af0ef13 100644
--- a/src/ballistica/python/methods/python_methods_graphics.cc
+++ b/src/ballistica/python/methods/python_methods_graphics.cc
@@ -439,7 +439,7 @@ auto PythonMethodsGraphics::GetMethods() -> std::vector<PyMethodDef> {
        "(U+E000-U+F8FF) and are specific to the game; exporting or rendering\n"
        "them elsewhere will be meaningless.\n"
        "\n"
-       "see ba.SpecialChar for the list of available characters."},
+       "See ba.SpecialChar for the list of available characters."},
   };
 }
 
diff --git a/tools/batools/dummymodule.py b/tools/batools/dummymodule.py
index 954a9bd6..051103af 100755
--- a/tools/batools/dummymodule.py
+++ b/tools/batools/dummymodule.py
@@ -629,7 +629,8 @@ def generate(sources_hash: str, outfilename: str) -> None:
             # Ignore _ba.app.
             continue
         else:
-            raise Exception(f'found unknown obj {entry}')
+            raise Exception(
+                f'found unknown obj {entry}, {getattr(module, entry)}')
     funcnames.sort()
     classnames.sort()
     out = (get_public_license('python')

From 10bee2b707a4d31660285f2551d4517ee2b81d93 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Wed, 9 Mar 2022 22:33:27 +0300
Subject: [PATCH 21/21] update dummy _ba module

---
 assets/src/ba_data/python/._ba_sources_hash | 2 +-
 assets/src/ba_data/python/_ba.py            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index c986901a..33d01432 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-279025597381990417612350974335348401455
\ No newline at end of file
+61174160426480901885067629344524001940
\ No newline at end of file
diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py
index a6d81958..e70d9afa 100644
--- a/assets/src/ba_data/python/_ba.py
+++ b/assets/src/ba_data/python/_ba.py
@@ -737,7 +737,7 @@ class SessionPlayer:
 
     These are created and managed internally and
     provided to your ba.Session/ba.Activity instances.
-    Be aware that, like ba.Nodes, ba.SessionPlayer objects are 'weak'
+    Be aware that, like `ba.Node`s, ba.SessionPlayer objects are 'weak'
     references under-the-hood; a player can leave the game at
      any point. For this reason, you should make judicious use of the
     ba.SessionPlayer.exists() method (or boolean operator) to ensure
@@ -1264,7 +1264,7 @@ def charstr(char_id: ba.SpecialChar) -> str:
     (U+E000-U+F8FF) and are specific to the game; exporting or rendering
     them elsewhere will be meaningless.
 
-    see ba.SpecialChar for the list of available characters.
+    See ba.SpecialChar for the list of available characters.
     """
     return str()
 
@@ -2026,6 +2026,7 @@ def getmodel(name: str) -> ba.Model:
 
 def getnodes() -> list:
     """Return all nodes in the current ba.Context.
+
     Category: **Gameplay Functions**
     """
     return list()