From 38d5cdefa26f3268e75a9cf697b7db4c47c8892a Mon Sep 17 00:00:00 2001 From: delizin Date: Fri, 31 Jan 2014 19:09:25 -0500 Subject: [PATCH 1/4] Fixed grammar in drop command --- src/commands/default/general.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/default/general.py b/src/commands/default/general.py index ce8e3e2203..b7863f1f5c 100644 --- a/src/commands/default/general.py +++ b/src/commands/default/general.py @@ -283,7 +283,7 @@ class CmdDrop(MuxCommand): # now we send it into the error handler (this will output consistent # error messages if there are problems). obj = AT_SEARCH_RESULT(caller, self.args, results, False, - nofound_string="You don't carry %s." % self.args, + nofound_string="You aren't carrying %s." % self.args, multimatch_string="You carry more than one %s:" % self.args) if not obj: return From 6e50d7e357f3cbba5da880846c21baa67616459b Mon Sep 17 00:00:00 2001 From: delizin Date: Fri, 31 Jan 2014 22:00:31 -0500 Subject: [PATCH 2/4] Fixed multiword drop bug #442 --- src/commands/default/general.py | 4 ++++ src/objects/objects.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/commands/default/general.py b/src/commands/default/general.py index b7863f1f5c..e0911b59f3 100644 --- a/src/commands/default/general.py +++ b/src/commands/default/general.py @@ -279,12 +279,16 @@ class CmdDrop(MuxCommand): # Because the DROP command by definition looks for items # in inventory, call the search function using location = caller results = caller.search(self.args, location=caller, quiet=True) + caller.msg("Type: " + str(type(results)) + "\nResults: " + str(results)) # now we send it into the error handler (this will output consistent # error messages if there are problems). obj = AT_SEARCH_RESULT(caller, self.args, results, False, nofound_string="You aren't carrying %s." % self.args, multimatch_string="You carry more than one %s:" % self.args) + + #obj = results + if not obj: return diff --git a/src/objects/objects.py b/src/objects/objects.py index 000318af00..f7350deef1 100644 --- a/src/objects/objects.py +++ b/src/objects/objects.py @@ -259,7 +259,7 @@ class Object(TypeClass): location=location, attribute_name=attribute_name, quiet=quiet, - exact=quiet) + exact=False) def execute_cmd(self, raw_string, sessid=None): """ From 33f1b41e7941c7f38ea85d7d8073346fc2950d55 Mon Sep 17 00:00:00 2001 From: delizin Date: Fri, 31 Jan 2014 22:01:48 -0500 Subject: [PATCH 3/4] Fixed multiword drop bug #442 --- src/commands/default/general.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/commands/default/general.py b/src/commands/default/general.py index e0911b59f3..b7863f1f5c 100644 --- a/src/commands/default/general.py +++ b/src/commands/default/general.py @@ -279,16 +279,12 @@ class CmdDrop(MuxCommand): # Because the DROP command by definition looks for items # in inventory, call the search function using location = caller results = caller.search(self.args, location=caller, quiet=True) - caller.msg("Type: " + str(type(results)) + "\nResults: " + str(results)) # now we send it into the error handler (this will output consistent # error messages if there are problems). obj = AT_SEARCH_RESULT(caller, self.args, results, False, nofound_string="You aren't carrying %s." % self.args, multimatch_string="You carry more than one %s:" % self.args) - - #obj = results - if not obj: return From e070617751d03a0bdcebebf5b14043ca8d724b62 Mon Sep 17 00:00:00 2001 From: delizin Date: Fri, 31 Jan 2014 22:05:15 -0500 Subject: [PATCH 4/4] Fixed multiword drop bug #442 --- src/objects/objects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objects/objects.py b/src/objects/objects.py index f7350deef1..551fb8d1c5 100644 --- a/src/objects/objects.py +++ b/src/objects/objects.py @@ -259,7 +259,7 @@ class Object(TypeClass): location=location, attribute_name=attribute_name, quiet=quiet, - exact=False) + exact=exact) def execute_cmd(self, raw_string, sessid=None): """