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

Development #2

Merged
jaffa merged 114 commits from InfoProjekt/game:Development into Development 2024-03-11 00:39:31 +01:00
Conversation 0 Commits 114 Files changed 50 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 726c5ee2a2 - Show all commits

6
viecher.py
View file

@ -33,7 +33,7 @@ fonts = {
'spacy': 'nasalization-rg.otf', 'spacy': 'nasalization-rg.otf',
'sci-fi': 'neuropol.otf', 'sci-fi': 'neuropol.otf',
'hollow_big_edge': 'papercut.ttf', 'hollow_big_edge': 'papercut.ttf',
'f_shuttle': 'pdark.ttf', 'space_shuttle': 'pdark.ttf',
'thin': 'PixelFJVerdana12pt.ttf', 'thin': 'PixelFJVerdana12pt.ttf',
'random': 'Seattle Avenue.ttf', 'random': 'Seattle Avenue.ttf',
'pixel': 'yoster.ttf' 'pixel': 'yoster.ttf'
@ -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 + 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_SPACE] and isinstance(touches, MainCharacter): if touches is not None and keys[pg.K_f] and isinstance(touches, MainCharacter):
self.talk(objects) self.talk(objects)
self.lastUpdate = pg.time.get_ticks() self.lastUpdate = pg.time.get_ticks()