From 7a7e379310347d56b3f8339b78b4eac79aad0bcd Mon Sep 17 00:00:00 2001 From: JohniFi <25084862+JohniFi@users.noreply.github.com> Date: Mon, 31 Mar 2025 16:34:51 +0200 Subject: [PATCH 1/3] add get_display_name to ExitCommand --- evennia/objects/objects.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 3b750c9db4..3bf1f5c211 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -3484,6 +3484,9 @@ class ExitCommand(_COMMAND_DEFAULT_CLASS): # No shorthand error message. Call hook. self.obj.at_failed_traverse(self.caller) + def get_display_name(self, looker=None, **kwargs): + return self.obj.get_display_name(looker, **kwargs) + def get_extra_info(self, caller, **kwargs): """ Shows a bit of information on where the exit leads. From 302047eda542951ec25fd71471f5e7a6ce8ca774 Mon Sep 17 00:00:00 2001 From: JohniFi <25084862+JohniFi@users.noreply.github.com> Date: Mon, 31 Mar 2025 17:39:12 +0200 Subject: [PATCH 2/3] ommit display_name in extra_info --- evennia/objects/objects.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 3bf1f5c211..5ec6617e46 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -3464,7 +3464,7 @@ class ExitCommand(_COMMAND_DEFAULT_CLASS): """ - obj = None + #obj = None def func(self): """ @@ -3504,7 +3504,7 @@ class ExitCommand(_COMMAND_DEFAULT_CLASS): if self.obj.destination: return " (exit to %s)" % self.obj.destination.get_display_name(caller, **kwargs) else: - return " (%s)" % self.obj.get_display_name(caller, **kwargs) + return _(" (exit)") # From 32b0d694e9ecdb6cc7f5b1bb4787ed7f0d48e609 Mon Sep 17 00:00:00 2001 From: JohniFi <25084862+JohniFi@users.noreply.github.com> Date: Mon, 31 Mar 2025 23:24:32 +0200 Subject: [PATCH 3/3] add check for obj (and add typing for linting) --- evennia/objects/objects.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 5ec6617e46..d4e4fbf6e0 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -3464,12 +3464,13 @@ class ExitCommand(_COMMAND_DEFAULT_CLASS): """ - #obj = None - def func(self): """ Default exit traverse if no syscommand is defined. """ + if not hasattr(self, "obj") or self.obj is None: + return + self.obj = typing.cast(DefaultExit, self.obj) if self.obj.access(self.caller, "traverse"): # we may traverse the exit.