fixed wait_until for PiCreatureScene

This commit is contained in:
Grant Sanderson 2019-03-20 13:07:26 -07:00
parent 36c62b4b55
commit 174094254c

View file

@ -211,21 +211,24 @@ class PiCreatureScene(Scene):
]) ])
return self return self
def wait(self, time=1, blink=True): def wait(self, time=1, blink=True, **kwargs):
if "stop_condition" in kwargs:
self.non_blink_wait(time, **kwargs)
return
while time >= 1: while time >= 1:
time_to_blink = self.total_wait_time % self.seconds_to_blink == 0 time_to_blink = self.total_wait_time % self.seconds_to_blink == 0
if blink and self.any_pi_creatures_on_screen() and time_to_blink: if blink and self.any_pi_creatures_on_screen() and time_to_blink:
self.blink() self.blink()
else: else:
self.non_blink_wait() self.non_blink_wait(**kwargs)
time -= 1 time -= 1
self.total_wait_time += 1 self.total_wait_time += 1
if time > 0: if time > 0:
self.non_blink_wait(time) self.non_blink_wait(time, **kwargs)
return self return self
def non_blink_wait(self, time=1): def non_blink_wait(self, time=1, **kwargs):
Scene.wait(self, time) Scene.wait(self, time, **kwargs)
return self return self
def change_mode(self, mode): def change_mode(self, mode):