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

Compare commits

base: Lyzzy:01c3aeae4a3ca7895963290a29eaa93832956367
Branches Tags
Lyzzy:main
Lyzzy:lyzzy-patch-3
Lyzzy:lyzzy-patch-2
Lyzzy:lyzzy-patch-1
Lyzzy:Development
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha
...
compare: Lyzzy:2a2d7b2765d62baf45c4e5bfea274d47938842e3
Branches Tags
Lyzzy:main
Lyzzy:lyzzy-patch-3
Lyzzy:lyzzy-patch-2
Lyzzy:lyzzy-patch-1
Lyzzy:Development
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

4 commits
01c3aeae4a ... 2a2d7b2765

Author SHA1 Message Date
Lyzzy
2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main 
Reviewed-on: #11
 2024-03-10 11:51:09 +00:00
Spafi
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#77
 2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:09 +01:00
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)
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()