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

Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development

Browse source 
Reviewed-on: InfoProjekt/game#77
This commit is contained in:
Spafi 2024-03-10 11:46:45 +00:00
commit 4a47efe94d
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)
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()