home · contact · privacy
Minor code style improvements.
authorChristian Heller <c.heller@plomlompom.de>
Wed, 27 Feb 2019 08:48:15 +0000 (09:48 +0100)
committerChristian Heller <c.heller@plomlompom.de>
Wed, 27 Feb 2019 08:48:15 +0000 (09:48 +0100)
new/plomrogue/commands.py
new/plomrogue/tasks.py

index 35ced5cb0314d89cea9fbf51fbd3a9db7dad2cd9..ad53438b75974759b19a4bb29394a60b581b2e84 100644 (file)
@@ -84,9 +84,8 @@ def cmd_SAVE(game):
             write(f, 'THING_TYPE %s %s' % (thing.id_, thing.type_))
             write(f, 'THING_POS %s %s' % (thing.id_,
                                           stringify_yx(thing.position)))
-            write(f, 'THING_INVENTORY %s %s' % (thing.id_,
-                                                ','.join([str(i) for i in
-                                                          thing.inventory])))
+            write(f, 'THING_INVENTORY %s %s' %
+                  (thing.id_,','.join([str(i) for i in thing.inventory])))
             if hasattr(thing, 'task'):
                 task = thing.task
                 if task is not None:
index 1d59998385822fee42610e67265873871721c93d..5dc2f82a1db6b206827f2b6a1c23be5daaf8cf2d 100644 (file)
@@ -76,11 +76,10 @@ class Task_DROP(Task):
     argtypes = 'int:nonneg'
 
     def check(self):
-        to_pick_up = self.thing.world.get_thing(self.args[0],
-                                                create_unfound=False)
-        if to_pick_up is None:
+        to_drop = self.thing.world.get_thing(self.args[0], create_unfound=False)
+        if to_drop is None:
             raise GameError('no thing of ID %s to drop' % self.args[0])
-        if to_pick_up.id_ not in self.thing.inventory:
+        if to_drop.id_ not in self.thing.inventory:
             raise GameError('no thing of ID %s to drop in inventory'
                             % self.args[0])