Mercurial > fhrl
changeset 32:970194e9147c
screens
| author | Radomir Dopieralski <sheep-devel@sheep.art.pl> |
|---|---|
| date | Sat, 16 Mar 2013 09:33:20 +0100 |
| parents | 9d36c1dc6b0c |
| children | b1bf0643bc26 |
| files | fhrl/__main__.py fhrl/mobs.py fhrl/over.png fhrl/resources.py fhrl/title.png fhrl/won.png |
| diffstat | 6 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/fhrl/__main__.py Sat Mar 16 09:11:11 2013 +0100 +++ b/fhrl/__main__.py Sat Mar 16 09:33:20 2013 +0100 @@ -13,7 +13,23 @@ self.margin = 128 self.display = Display() + def pause(self, image): + self.display.screen.blit(image, (0, 0)) + pygame.display.flip() + while True: + event = pygame.event.wait() + if event.type == pygame.KEYUP: + if event.key == pygame.K_ESCAPE: + raise SystemExit() + elif event.key in (pygame.K_x, pygame.K_z): + break + elif event.type == pygame.QUIT: + raise SystemExit() + self.display.screen.fill((0, 0, 0)) + pygame.display.flip() + def run(self): + self.pause(self.display.resources.title) hero = Hero() for level in xrange(6): self.level = Level((24, 24), hero, level) @@ -25,6 +41,8 @@ ) self.display.update_all() while self.level.grid[self.level.hero.y][self.level.hero.x] != 5: + if hero.health <= 0: + break while True: anims = self.level.hero.act(self.level, self.display) if anims: @@ -48,6 +66,12 @@ self.display.scroll_by(0, -32) self.display.update_hud(self.level.hero) self.display.play_animations() + if hero.health <= 0: + break + if hero.health > 0: + self.pause(self.display.resources.won) + else: + self.pause(self.display.resources.over) pygame.display.init() Game().run()
--- a/fhrl/mobs.py Sat Mar 16 09:11:11 2013 +0100 +++ b/fhrl/mobs.py Sat Mar 16 09:33:20 2013 +0100 @@ -726,7 +726,7 @@ ['saw', 'flamer', 'gasoline', 'balls', 'medikit'], ['saw', 'flamer', 'gasoline', 'balls', 'medikit', 'vulcan'], ['drill', 'flamer', 'gasoline', 'balls', 'battery', 'medikit', 'beam'], - ['drill', 'flamer', 'gasoline', 'balls', 'battery', 'medikit', 'beam', 'teleporter'], + ['drill', 'flamer', 'gasoline', 'battery', 'medikit', 'beam'], ['toaster'], ] name = random.choice(levels[level])
--- a/fhrl/resources.py Sat Mar 16 09:11:11 2013 +0100 +++ b/fhrl/resources.py Sat Mar 16 09:33:20 2013 +0100 @@ -15,6 +15,9 @@ self.effect = self.load_atlas('effect.png', 48, 48) self.items = self.load_atlas('items.png', 48, 32) self.digits = self.load_atlas('digits.png', 12, 15) + self.title = self.load_image('title.png') + self.over = self.load_image('over.png') + self.won = self.load_image('won.png') @staticmethod def load_image(filename):