Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development
Reviewed-on: #77
This commit is contained in:
commit
4a47efe94d
1 changed files with 2 additions and 2 deletions
|
|
@ -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()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue