X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/gitweb.js?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=0edf8fbed42a83363ad43d0012a4a1f74cd37685;hb=7385c037c0acb54c06fc7919b5b85548c09f8d65;hp=cedee68266583f9486dea676a0d67bd5bacb2378;hpb=d9c9b5b7d5cac2469ac075010c4d729e1adf0cc4;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index cedee68..0edf8fb 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -6,7 +6,7 @@ from plomrogue.mapping import YX class ThingBase: type_ = '?' - def __init__(self, game, id_=0, position=(YX(0,0),YX(0,0))): + def __init__(self, game, id_=0, position=(YX(0, 0), YX(0, 0))): self.game = game if id_ == 0: self.id_ = self.game.new_thing_id() @@ -40,11 +40,6 @@ class Thing_Item(Thing): -class Thing_Furniture(Thing): - symbol_hint = 'h' - - - class ThingAnimate(Thing): blocking = True @@ -81,8 +76,7 @@ class ThingAnimate(Thing): self.task.check() except GameError as e: self.task = None - raise GameError - return + raise e self.task.todo -= 1 if self.task.todo <= 0: self._last_task_result = self.task.do()