Compare commits

..

No commits in common. "091726b8ca12e151bf67a93a3e128f1f62de5e59" and "9396218a11b564994cfa930310fe72866c5ab944" have entirely different histories.

View file

@ -162,7 +162,7 @@ class MainCharacter(Fighter):
self.y -= (2 + self.rect.height - (touches.rect.y - self.y))
return
elif isinstance(touches, NPC):
if keys[pg.K_f]:
if keys[pg.K_SPACE]:
touches.talk(objects)
return
else:
@ -201,7 +201,7 @@ class MainCharacter(Fighter):
def update(self, keys, mouse, objects):
if not self.talking:
self.walk(keys, objects)
if pg.mouse.get_pressed()[0]:
if keys[pg.K_f]:
self.attack(objects, vec(mouse))
self.speech.update(self)
if self.health.health <= 0: