InfoProjekt/game
3
0
Fork 3
Code Issues 17 Pull requests Projects Releases 1 Packages Wiki Activity

Merge branch 'main' of https://git.spafi.eu/Lyzzy/game

Browse source
This commit is contained in:
Lyzzy 2024-03-10 13:04:29 +01:00
commit bb8ec349dd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
viecher.py
View file

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