Updated HTML docs.

docs/2.x/api/evennia.objects.objects.html

@@ -218,6 +218,21 @@ entities you define should inherit from DefaultObject at some distance.</p>
 <strong>evennia.create_object()</strong> function rather than to initialize the class
 directly - this will both set things up and efficiently save the object
 without <strong>obj.save()</strong> having to be called explicitly.</p>
+<dl class="py attribute">
+<dt id="evennia.objects.objects.DefaultObject.cmdset_provider_order">
+<code class="sig-name descname">cmdset_provider_order</code><em class="property"> = 100</em><a class="headerlink" href="#evennia.objects.objects.DefaultObject.cmdset_provider_order" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
+<dl class="py attribute">
+<dt id="evennia.objects.objects.DefaultObject.cmdset_provider_error_order">
+<code class="sig-name descname">cmdset_provider_error_order</code><em class="property"> = 100</em><a class="headerlink" href="#evennia.objects.objects.DefaultObject.cmdset_provider_error_order" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
+<dl class="py attribute">
+<dt id="evennia.objects.objects.DefaultObject.cmdset_provider_type">
+<code class="sig-name descname">cmdset_provider_type</code><em class="property"> = 'object'</em><a class="headerlink" href="#evennia.objects.objects.DefaultObject.cmdset_provider_type" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
 <dl class="py attribute">
 <dt id="evennia.objects.objects.DefaultObject.lockstring">
 <code class="sig-name descname">lockstring</code><em class="property"> = 'control:id({account_id}) or perm(Admin);delete:id({account_id}) or perm(Admin)'</em><a class="headerlink" href="#evennia.objects.objects.DefaultObject.lockstring" title="Permalink to this definition">¶</a></dt>
@@ -265,6 +280,20 @@ without <strong>obj.save()</strong> having to be called explicitly.</p>
 currently connected to this object.</p>
 </dd></dl>
 
+<dl class="py method">
+<dt id="evennia.objects.objects.DefaultObject.get_cmdset_providers">
+<code class="sig-name descname">get_cmdset_providers</code><span class="sig-paren">(</span><span class="sig-paren">)</span> &#x2192; dict<a class="reference internal" href="../_modules/evennia/objects/objects.html#DefaultObject.get_cmdset_providers"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#evennia.objects.objects.DefaultObject.get_cmdset_providers" title="Permalink to this definition">¶</a></dt>
+<dd><p>Overrideable method which returns a dictionary of every kind of object which
+has a cmdsethandler linked to this Object, and should participate in cmdset
+merging.</p>
+<p>Objects might be aware of an Account. Otherwise, just themselves, by default.</p>
+<dl class="field-list simple">
+<dt class="field-odd">Returns</dt>
+<dd class="field-odd"><p><em>dict[str, CmdSetProvider]</em> – The CmdSetProviders linked to this Object.</p>
+</dd>
+</dl>
+</dd></dl>
+
 <dl class="py method">
 <dt id="evennia.objects.objects.DefaultObject.is_superuser">
 <em class="property">property </em><code class="sig-name descname">is_superuser</code><a class="headerlink" href="#evennia.objects.objects.DefaultObject.is_superuser" title="Permalink to this definition">¶</a></dt>
@@ -1091,8 +1120,30 @@ place to do it. This is called also if the object currently
 have no cmdsets.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Keyword Arguments</dt>
-<dd class="field-odd"><p><strong>caller</strong> (<a class="reference internal" href="evennia.server.session.html#evennia.server.session.Session" title="evennia.server.session.Session"><em>Session</em></a><em>, </em><em>Object</em><em> or </em><em>Account</em>) – The caller requesting
-this cmdset.</p>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>caller</strong> (<a class="reference internal" href="evennia.contrib.base_systems.ingame_python.callbackhandler.html#evennia.contrib.base_systems.ingame_python.callbackhandler.Callback.obj" title="evennia.contrib.base_systems.ingame_python.callbackhandler.Callback.obj"><em>obj</em></a>) – The object requesting the cmdsets.</p></li>
+<li><p><strong>current</strong> (<a class="reference internal" href="evennia.accounts.accounts.html#evennia.accounts.accounts.DefaultAccount.cmdset" title="evennia.accounts.accounts.DefaultAccount.cmdset"><em>cmdset</em></a>) – The current merged cmdset.</p></li>
+<li><p><strong>force_init</strong> (<em>bool</em>) – If <strong>True</strong>, force a re-build of the cmdset. (seems unused)</p></li>
+<li><p><strong>**kwargs</strong> – Arbitrary input for overloads.</p></li>
+</ul>
+</dd>
+</dl>
+</dd></dl>
+
+<dl class="py method">
+<dt id="evennia.objects.objects.DefaultObject.get_cmdsets">
+<code class="sig-name descname">get_cmdsets</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">caller</span></em>, <em class="sig-param"><span class="n">current</span></em>, <em class="sig-param"><span class="o">**</span><span class="n">kwargs</span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/evennia/objects/objects.html#DefaultObject.get_cmdsets"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#evennia.objects.objects.DefaultObject.get_cmdsets" title="Permalink to this definition">¶</a></dt>
+<dd><p>Called by the CommandHandler to get a list of cmdsets to merge.</p>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters</dt>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>caller</strong> (<em>obj</em>) – The object requesting the cmdsets.</p></li>
+<li><p><strong>current</strong> (<em>cmdset</em>) – The current merged cmdset.</p></li>
+<li><p><strong>**kwargs</strong> – Arbitrary input for overloads.</p></li>
+</ul>
+</dd>
+<dt class="field-even">Returns</dt>
+<dd class="field-even"><p><em>tuple</em> – A tuple of (current, cmdsets), which is probably self.cmdset.current and self.cmdset.cmdset_stack</p>
 </dd>
 </dl>
 </dd></dl>