Compare commits

...

6 commits

Author SHA1 Message Date
01c3aeae4a Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main
Reviewed-on: #10
2024-03-10 09:32:18 +00:00
3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#76
2024-03-10 08:27:07 +00:00
e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main
Reviewed-on: Spafi/game#6
2024-03-10 08:26:52 +00:00
SpagettiFisch
0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:23:59 +01:00
SpagettiFisch
b1b7b21aa2 changed stuff
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:17:22 +01:00
523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#75
2024-03-10 08:16:42 +00:00
2 changed files with 11 additions and 2 deletions

View file

View file

@ -227,7 +227,7 @@ class Stage(GameObjects):
self.current += 1
if self.current >= len(self.rooms):
return 1
def draw(self, screen):
for room in self.rooms:
if room.id == self.current:
@ -291,5 +291,14 @@ class Obstacle(GameObjects):
else:
pygame.draw.rect(screen, '#e7f8e0', self.rect, 2)
class Door(GameObjects):
def __init__(self, name: str, _type: str, bg, objects: list, WIDTH, HEIGHT, x: int, y: int, islocked=True) -> None:
super().__init__(name, _type, bg, objects, WIDTH, HEIGHT)
self.rect = pygame.Rect((x, y), self.background.get_size())
self.locked = islocked
def draw(self, screen):
screen.blit(self.background, self.rect)
def update(self, islocked=True):
self.locked = islocked