home · contact · privacy
Simplify pick up failure messages.
authorChristian Heller <c.heller@plomlompom.de>
Mon, 7 Dec 2020 01:34:51 +0000 (02:34 +0100)
committerChristian Heller <c.heller@plomlompom.de>
Mon, 7 Dec 2020 01:34:51 +0000 (02:34 +0100)
plomrogue/tasks.py

index a6602cea926822ae8b7a58a4c7c50baad28f6e1b..1204001b4d202ec54ff8a3891d5b13708608045f 100644 (file)
@@ -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:
             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:
         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:
         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])
 
     def do(self):
         to_pick_up = self.thing.game.get_thing(self.args[0])