Add thing protection.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index cedee68266583f9486dea676a0d67bd5bacb2378..1618ee65e49c07493fc2cc67f87a22045f4b998c 100644 (file)
--- 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()
@@ -18,6 +18,7 @@ class ThingBase:
 
 class Thing(ThingBase):
     blocking = False
+    protection = '.'
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -40,11 +41,6 @@ class Thing_Item(Thing):
 
 
 
-class Thing_Furniture(Thing):
-    symbol_hint = 'h'
-
-
-
 class ThingAnimate(Thing):
     blocking = True
 
@@ -81,8 +77,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()