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

Development #2

Merged
jaffa merged 114 commits from InfoProjekt/game:Development into Development 2024-03-11 00:39:31 +01:00
Conversation 0 Commits 114 Files changed 50 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 091726b8ca - Show all commits

4
viecher.py
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_SPACE]:
if keys[pg.K_f]:
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 keys[pg.K_f]:
if pg.mouse.get_pressed()[0]:
self.attack(objects, vec(mouse))
self.speech.update(self)
if self.health.health <= 0: