From: Christian Heller Date: Wed, 27 Feb 2019 08:48:15 +0000 (+0100) Subject: Minor code style improvements. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/%7B%7Bprefix%7D%7D/edit?a=commitdiff_plain;h=cffcecff2e4bb085305b9ef0f7cf4b5b20445f44;p=plomrogue2-experiments Minor code style improvements. --- diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py index 35ced5c..ad53438 100644 --- a/new/plomrogue/commands.py +++ b/new/plomrogue/commands.py @@ -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: diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py index 1d59998..5dc2f82 100644 --- a/new/plomrogue/tasks.py +++ b/new/plomrogue/tasks.py @@ -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])