From: Christian Heller Date: Mon, 7 Dec 2020 01:34:51 +0000 (+0100) Subject: Simplify pick up failure messages. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/decks/condition_titles?a=commitdiff_plain;h=20081e06dcb7dddcf58baee5be74cd6ad740f22c;p=plomrogue2 Simplify pick up failure messages. --- diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index a6602ce..1204001 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -86,15 +86,15 @@ class Task_PICK_UP(Task): get_neighbors_yxyx(self.thing.position).values() reach = [self.thing.position] + list(neighbors) if to_pick_up is None: - raise PlayError('no thing of ID %s exists %s' % self.args[0]) + raise PlayError('no such thing exists') elif to_pick_up == self.thing: raise PlayError('cannot pick up oneself') elif to_pick_up.type_ == 'Player': raise PlayError('cannot pick up player') elif to_pick_up.position not in reach: - raise PlayError('thing of ID %s not in reach' % self.args[0]) + raise PlayError('thing not in reach') elif not to_pick_up.portable: - raise PlayError('thing of ID %s not portable' % self.args[0]) + raise PlayError('thing not portable') def do(self): to_pick_up = self.thing.game.get_thing(self.args[0])