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

InfoProjekt-Development3 #6

Merged
Spafi merged 25 commits from InfoProjekt-Development3 into main 2024-03-10 09:26:52 +01:00
Conversation 0 Commits 25 Files changed 8 +5 -8
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2970e5cecd - Show all commits

11
viecher.py
View file

@ -68,7 +68,6 @@ class NPC(Objects):
def talk(self, objects): def talk(self, objects):
self.talking = True self.talking = True
objects[0][0].talking = True objects[0][0].talking = True
self.conversation.hidden = False
def draw(self, screen): def draw(self, screen):
super().draw(screen) super().draw(screen)
@ -78,7 +77,8 @@ class NPC(Objects):
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)
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_SPACE] and isinstance(touches, MainCharacter):
@ -90,14 +90,11 @@ class Convo(Label):
def __init__(self, text, convo_act, person, x = 140, y = 600, width = 1000, height = 100, font='simple', font_size = 20) -> None: def __init__(self, text, convo_act, person, x = 140, y = 600, width = 1000, height = 100, font='simple', font_size = 20) -> None:
super().__init__(x, y, width, height, text, font, font_size) super().__init__(x, y, width, height, text, font, font_size)
def update(self, keys, objects): def update(self, keys, objects, npc):
if keys[pg.K_SPACE]: if keys[pg.K_SPACE]:
objects[0][0].book.addspell('fireball') objects[0][0].book.addspell('fireball')
self.talking = False npc.talking = False
objects[0][0].talking = False objects[0][0].talking = False
self.hidden = True
class Fighter(Objects): class Fighter(Objects):