From f6b0ddca94a812fc68643e5980435c0892e6ae9e Mon Sep 17 00:00:00 2001 From: Henddher Pedroza Date: Sun, 16 Sep 2018 19:04:07 -0500 Subject: [PATCH] Add total recipes/armed-puzzles to @lspuzzlerecipes and @lsarmedpuzzles --- evennia/contrib/puzzles.py | 6 ++++++ evennia/contrib/tests.py | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/evennia/contrib/puzzles.py b/evennia/contrib/puzzles.py index 0cab7859ac..2d317efe46 100644 --- a/evennia/contrib/puzzles.py +++ b/evennia/contrib/puzzles.py @@ -565,6 +565,9 @@ class CmdListPuzzleRecipes(MuxCommand): for k, v in protoresult.items(): text.append(msgf_item % (mark, k, v)) mark = '' + else: + text.append(div) + text.append('%d puzzle(s).' % (len(recipes))) text.append(div) caller.msg('\n'.join(text)) @@ -601,6 +604,9 @@ class CmdListArmedPuzzles(MuxCommand): text.append(msgf_item % ( item.name, item.dbref, item.location.name, item.location.dbref)) + else: + text.append(div) + text.append('%d armed puzzle(s).' % (len(armed_puzzles))) text.append(div) caller.msg('\n'.join(text)) diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py index 4810ec9d09..2aaa614ae8 100644 --- a/evennia/contrib/tests.py +++ b/evennia/contrib/tests.py @@ -1485,7 +1485,8 @@ class TestPuzzles(CommandTest): msg, [ r"^-+$", - r"^-+$", + r"^0 puzzle\(s\)\.$", + r"-+$", ], re.MULTILINE | re.DOTALL ) @@ -1513,6 +1514,8 @@ class TestPuzzles(CommandTest): r"^.*key: stone$", r"^.*key: flint$", r"^-+$", + r"^1 puzzle\(s\)\.$", + r"^-+$", ], re.MULTILINE | re.DOTALL ) @@ -1526,6 +1529,8 @@ class TestPuzzles(CommandTest): msg, [ r"^-+$", + r"^-+$", + r"^0 armed puzzle\(s\)\.$", r"^-+$" ], re.MULTILINE | re.DOTALL @@ -1545,6 +1550,7 @@ class TestPuzzles(CommandTest): r"^Puzzle name: makefire$", r"^.*stone.* at \s+ Room.*$", r"^.*flint.* at \s+ Room.*$", + r"^1 armed puzzle\(s\)\.$", r"^-+$", ], re.MULTILINE | re.DOTALL