X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=d348e8400df1239d0105995f1193689dd132cd09;hb=35714a1e0616ada0be5929d5fb8100047e46cdd2;hp=3b00d1fd79b86c183f04f21f9b3d4a965f5f575f;hpb=40cc80146755188192b5f24834d997dd7c32c49c;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 3b00d1f..d348e84 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,4 +1,4 @@
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, PlayError
from plomrogue.mapping import YX
@@ -128,17 +128,22 @@ class Thing_Door(Thing):
symbol_hint = 'D'
blocking = False
portable = True
+ installable = True
def open(self):
self.blocking = False
- self.portable = True
del self.thing_char
def close(self):
self.blocking = True
- self.portable = False
self.thing_char = '#'
+ def install(self):
+ self.portable = False
+
+ def uninstall(self):
+ self.portable = True
+
class Thing_Bottle(Thing):
@@ -285,26 +290,20 @@ class ThingAnimate(Thing):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.next_tasks = []
- self.set_task('WAIT')
+ self.next_task = [None]
+ self.task = None
self._fov = None
- def set_task(self, task_name, args=()):
- task_class = self.game.tasks[task_name]
- self.task = task_class(self, args)
- self.task.check() # will throw GameError if necessary
-
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
- self.next_tasks += [task_class(self, args)]
+ self.next_task = [task_class(self, args)]
def get_next_task(self):
- if len(self.next_tasks) > 0:
- task = self.next_tasks.pop(0)
+ if self.next_task[0]:
+ task = self.next_task[0]
+ self.next_task = [None]
task.check()
return task
- else:
- return None
def proceed(self):
self.drunk -= 1
@@ -321,12 +320,12 @@ class ThingAnimate(Thing):
return
try:
self.task.check()
- except GameError as e:
+ except (PlayError, GameError) as e:
self.task = None
raise e
self.task.todo -= 1
if self.task.todo <= 0:
- self._last_task_result = self.task.do()
+ self.task.do()
self.game.changed = True
self.task = self.get_next_task()