From cd4a6121ead201e6b33fe044383cb2b03909f077 Mon Sep 17 00:00:00 2001 From: Antrare Date: Tue, 27 Dec 2022 15:32:28 +1100 Subject: [PATCH 1/7] Update extended_room.py Small QOL improvement to looking at details, tell the room contents (including the player) what they are looking closely at. --- evennia/contrib/grid/extended_room/extended_room.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/grid/extended_room/extended_room.py b/evennia/contrib/grid/extended_room/extended_room.py index 5d848551c..41438a6db 100644 --- a/evennia/contrib/grid/extended_room/extended_room.py +++ b/evennia/contrib/grid/extended_room/extended_room.py @@ -359,7 +359,10 @@ class CmdExtendedRoomLook(default_cmds.CmdLook): ): detail = location.return_detail(args) if detail: - # we found a detail instead. Show that. + # we found a detail + # tell all the objects in the room we're looking closely at something + caller.location.msg_contents("$You() $conj(look) closely at the $obj(target).\n", from_obj=caller, mapping={"target": args}) + # show the detail to the player caller.msg(detail) return # no detail found. Trigger delayed error messages From b7d8c1e2e0fecd79bf3e5ed378a5046a1823026c Mon Sep 17 00:00:00 2001 From: Antrare Date: Tue, 27 Dec 2022 17:12:49 +1100 Subject: [PATCH 2/7] Update tests.py Fix test for the new return. --- evennia/contrib/grid/extended_room/tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/grid/extended_room/tests.py b/evennia/contrib/grid/extended_room/tests.py index 22a43d500..f65ae0abe 100644 --- a/evennia/contrib/grid/extended_room/tests.py +++ b/evennia/contrib/grid/extended_room/tests.py @@ -63,7 +63,10 @@ class TestExtendedRoom(BaseEvenniaCommandTest): "here", "Room(#{})\n{}".format(rid, self.SPRING_DESC), ) - self.call(extended_room.CmdExtendedRoomLook(), "testdetail", self.DETAIL_DESC) + self.call( + extended_room.CmdExtendedRoomLook(), + "testdetail", + "You look closely at the {}.\n|{}".format("testdetail", self.DETAIL_DESC) self.call( extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'." ) From 21548c4ff40ef8202d184e5e4a5dbd941f658a6c Mon Sep 17 00:00:00 2001 From: Antrare Date: Tue, 27 Dec 2022 17:23:36 +1100 Subject: [PATCH 3/7] Update tests.py ugh --- evennia/contrib/grid/extended_room/tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/evennia/contrib/grid/extended_room/tests.py b/evennia/contrib/grid/extended_room/tests.py index f65ae0abe..6b49d810b 100644 --- a/evennia/contrib/grid/extended_room/tests.py +++ b/evennia/contrib/grid/extended_room/tests.py @@ -67,6 +67,7 @@ class TestExtendedRoom(BaseEvenniaCommandTest): extended_room.CmdExtendedRoomLook(), "testdetail", "You look closely at the {}.\n|{}".format("testdetail", self.DETAIL_DESC) + ) self.call( extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'." ) From 3df26543e586627e587c06c89b68b43f20bc3739 Mon Sep 17 00:00:00 2001 From: Antrare Date: Sat, 7 Jan 2023 20:51:04 +1100 Subject: [PATCH 4/7] Update extended_room.py --- evennia/contrib/grid/extended_room/extended_room.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/grid/extended_room/extended_room.py b/evennia/contrib/grid/extended_room/extended_room.py index 41438a6db..2c9fa39bf 100644 --- a/evennia/contrib/grid/extended_room/extended_room.py +++ b/evennia/contrib/grid/extended_room/extended_room.py @@ -361,7 +361,7 @@ class CmdExtendedRoomLook(default_cmds.CmdLook): if detail: # we found a detail # tell all the objects in the room we're looking closely at something - caller.location.msg_contents("$You() $conj(look) closely at the $obj(target).\n", from_obj=caller, mapping={"target": args}) + caller.location.msg_contents("$You() $conj(look) closely at $obj(target).\n", from_obj=caller, mapping={"target": args}) # show the detail to the player caller.msg(detail) return From 34db5bfd32633730749820cc9847f5ff328f70c6 Mon Sep 17 00:00:00 2001 From: Antrare Date: Sat, 7 Jan 2023 20:51:28 +1100 Subject: [PATCH 5/7] Update tests.py --- evennia/contrib/grid/extended_room/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/grid/extended_room/tests.py b/evennia/contrib/grid/extended_room/tests.py index 6b49d810b..991987c19 100644 --- a/evennia/contrib/grid/extended_room/tests.py +++ b/evennia/contrib/grid/extended_room/tests.py @@ -66,7 +66,7 @@ class TestExtendedRoom(BaseEvenniaCommandTest): self.call( extended_room.CmdExtendedRoomLook(), "testdetail", - "You look closely at the {}.\n|{}".format("testdetail", self.DETAIL_DESC) + "You look closely at {}.\n|{}".format("testdetail", self.DETAIL_DESC) ) self.call( extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'." From 298784cbab9898afb3f1bb253957c6698433a899 Mon Sep 17 00:00:00 2001 From: Antrare Date: Sat, 7 Jan 2023 21:01:37 +1100 Subject: [PATCH 6/7] Update extended_room.py --- evennia/contrib/grid/extended_room/extended_room.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/grid/extended_room/extended_room.py b/evennia/contrib/grid/extended_room/extended_room.py index 2c9fa39bf..843c39e0a 100644 --- a/evennia/contrib/grid/extended_room/extended_room.py +++ b/evennia/contrib/grid/extended_room/extended_room.py @@ -361,7 +361,7 @@ class CmdExtendedRoomLook(default_cmds.CmdLook): if detail: # we found a detail # tell all the objects in the room we're looking closely at something - caller.location.msg_contents("$You() $conj(look) closely at $obj(target).\n", from_obj=caller, mapping={"target": args}) + caller.location.msg_contents(f"$You() $conj(look) closely at {args}.\n", from_obj=caller) # show the detail to the player caller.msg(detail) return From 7d4e83d3c8d7d729f827acd62c7339ac633c4914 Mon Sep 17 00:00:00 2001 From: Antrare Date: Mon, 30 Jan 2023 11:53:26 +1100 Subject: [PATCH 7/7] Update tests.py --- evennia/contrib/grid/extended_room/tests.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/evennia/contrib/grid/extended_room/tests.py b/evennia/contrib/grid/extended_room/tests.py index 991987c19..d5ec1e0f2 100644 --- a/evennia/contrib/grid/extended_room/tests.py +++ b/evennia/contrib/grid/extended_room/tests.py @@ -71,6 +71,19 @@ class TestExtendedRoom(BaseEvenniaCommandTest): self.call( extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'." ) + + def test_cmdextendedlook_second_person(self): + # char2 is already in the same room. + # replace char2.msg with a Mock; this disables it and will catch what it is called with + self.char2.msg = Mock() + + self.call( + extended_room.CmdExtendedRoomLook(), + "testdetail" + ) + + # check what char2 saw. + self.char2.msg.assert_called_with(text=('Char looks closely at testdetail.\n', {}), from_obj=self.char1) def test_cmdsetdetail(self): self.call(extended_room.CmdExtendedRoomDetail(), "", "Details on Room")