Spafi/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity

Compare commits

base: Spafi:4ccc2dde116ee16880df7b8f70e7ba62d5f1b168
Branches Tags
Spafi:main
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha
..
compare: Spafi:e8d81dfb1116d89743ff65b17646913c2fe83895
Branches Tags
Spafi:main
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

No commits in common. "4ccc2dde116ee16880df7b8f70e7ba62d5f1b168" and "e8d81dfb1116d89743ff65b17646913c2fe83895" have entirely different histories.
4ccc2dde11 ... e8d81dfb11

1 changed files with 2 additions and 2 deletions
Show stats 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 + 200 < pg.time.get_ticks(): if self.lastUpdate + 200 < 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()