changed NPC talk key to f and resolved merge conflicts #77

Merged
Spafi merged 2 commits from Spafi/game:main into Development 2024-03-10 12:46:45 +01:00

View file

@ -81,7 +81,7 @@ class NPC(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()