-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, PlayError
from plomrogue.mapping import YX
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
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()