storyline #79

Merged
jaffa merged 12 commits from Lyzzy/game:main into Development 2024-03-10 19:02:22 +01:00
Showing only changes of commit 2a2d7b2765 - Show all commits

View file

@ -75,13 +75,13 @@ class NPC(Objects):
self.conversation.draw(screen)
def update(self, keys, objects):
if self.lastUpdate + 200 < pg.time.get_ticks():
if self.lastUpdate + 200 < pg.time.get_ticks():
if self.talking:
self.conversation.update(keys, objects)
self.lastUpdate = pg.time.get_ticks()
else:
touches = pg.sprite.spritecollideany(self, objects[0])
if touches is not None and keys[pg.K_SPACE] and isinstance(touches, MainCharacter):
if touches is not None and keys[pg.K_f] and isinstance(touches, MainCharacter):
self.talk(objects)
self.lastUpdate = pg.time.get_ticks()