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

Compare commits

base: InfoProjekt:3232096d6646d5d5023a402e08829d16f851126e
Branches Tags
InfoProjekt:main
InfoProjekt:Development
InfoProjekt:Alpha
...
compare: InfoProjekt:4a47efe94d6431314604afbe0faaa00f84549c42
Branches Tags
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

3 commits
3232096d66 ... 4a47efe94d

Author SHA1 Message Date
Spafi
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development 
Reviewed-on: #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) 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_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()