Merge branch 'evennia:master' into master

evennia/commands/default/building.py

@@ -1934,7 +1934,8 @@ class CmdTypeclass(COMMAND_DEFAULT_CLASS):
       update - *only* re-run at_object_creation on this object
               meaning locks or other properties set later may remain.
       reset - clean out *all* the attributes and properties on the
-              object - basically making this a new clean object.
+              object - basically making this a new clean object. This will
+              also reset cmdsets.
       force - change to the typeclass also if the object
               already has a typeclass of the same name.
       list - show available typeclasses. Only typeclasses in modules actually
@@ -2101,7 +2102,7 @@ class CmdTypeclass(COMMAND_DEFAULT_CLASS):
         else:
             update = "update" in self.switches
             reset = "reset" in self.switches
-            hooks = "at_object_creation" if update else "all"
+            hooks = "at_object_creation" if update and not reset else "all"
             old_typeclass_path = obj.typeclass_path
 
             # special prompt for the user in cases where we want

evennia/server/inputfuncs.py

@@ -610,9 +610,18 @@ def msdp_send(session, *args, **kwargs):
 # client specific
 
 
-def external_discord_hello(session, *args, **kwargs):
+def _not_implemented(session, *args, **kwargs):
     """
-    Sent by Mudlet as a greeting; added here to avoid
+    Dummy used to swallow missing-inputfunc errors for
-    logging a missing inputfunc for it.
+    common clients.
     """
     pass
+
+
+# GMCP External.Discord.Hello is sent by Mudlet as a greeting
+# (see https://wiki.mudlet.org/w/Manual:Technical_Manual)
+external_discord_hello = _not_implemented
+
+
+# GMCP Client.Gui is sent by Mudlet for gui setup.
+client_gui = _not_implemented

evennia/utils/dbserialize.py

@@ -391,6 +391,10 @@ class _SaverDeque(_SaverMutable):
     @_save
     def rotate(self, *args):
         self._data.rotate(*args)
+        
+    @_save
+    def remove(self, *args):
+        self._data.remove(*args)
 
 
 _DESERIALIZE_MAPPING = {

requirements.txt

@@ -4,7 +4,7 @@
 django >= 3.2, < 3.3
 twisted >= 21.7.0, < 22.0.0
 pytz
-django-sekizai
+django-sekizai==2.0.0
 inflect
 autobahn >= 20.7.1, < 21.0.0