diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index d3e225fef..5d1d32657 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -509,12 +509,12 @@ class DefaultObject(ObjectDB): The `DefaultObject` hooks called (if `move_hooks=True`) are, in order: 1. `self.at_before_move(destination)` (if this returns False, move is aborted) - 1. `source_location.at_object_leave(self, destination)` - 1. `self.announce_move_from(destination)` - 1. (move happens here) - 1. `self.announce_move_to(source_location)` - 1. `destination.at_object_receive(self, source_location)` - 1. `self.at_after_move(source_location)` + 2. `source_location.at_object_leave(self, destination)` + 3. `self.announce_move_from(destination)` + 4. (move happens here) + 5. `self.announce_move_to(source_location)` + 6. `destination.at_object_receive(self, source_location)` + 7. `self.at_after_move(source_location)` """ def logerr(string=""): diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py index 519569dfd..59b0d4e42 100644 --- a/evennia/typeclasses/models.py +++ b/evennia/typeclasses/models.py @@ -227,13 +227,13 @@ class TypedObject(SharedMemoryModel): The loading mechanism will attempt the following steps: 1. Attempt to load typeclass given on command line - 1. Attempt to load typeclass stored in db_typeclass_path - 1. Attempt to load `__settingsclasspath__`, which is by the + 2. Attempt to load typeclass stored in db_typeclass_path + 3. Attempt to load `__settingsclasspath__`, which is by the default classes defined to be the respective user-set base typeclass settings, like `BASE_OBJECT_TYPECLASS`. - 1. Attempt to load `__defaultclasspath__`, which is the + 4. Attempt to load `__defaultclasspath__`, which is the base classes in the library, like DefaultObject etc. - 1. If everything else fails, use the database model. + 5. If everything else fails, use the database model. Normal operation is to load successfully at either step 1 or 2 depending on how the class was called. Tracebacks diff --git a/evennia/utils/ansi.py b/evennia/utils/ansi.py index 3eaf5a035..a3dbb962a 100644 --- a/evennia/utils/ansi.py +++ b/evennia/utils/ansi.py @@ -738,6 +738,7 @@ class ANSIString(unicode): def partition(self, sep, reverse=False): """ Similar to split, but always creates a tuple with three items: + 1. The part before the separator 2. The separator itself. 3. The part after.