Mercurial > undermine
changeset 35:73d314cdcf37
merge
| author | Katarzyna Jachim <kasia.jachim@gmail.com> |
|---|---|
| date | Sun, 27 Apr 2014 23:06:51 +0200 |
| parents | 03371242d112 (current diff) 0859ccc84376 (diff) |
| children | ef6af1ed7a3e |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/undermine/game.py Sun Apr 27 22:59:15 2014 +0200 +++ b/undermine/game.py Sun Apr 27 23:06:51 2014 +0200 @@ -20,7 +20,6 @@ self.images = undermine.resources.load_atlas('undermine.png', 64) # self.theme = undermine.resources.load_sound('undermine.ogg') # self.eulogy= undermine.resources.load_sound('death.ogg') - self.depth = 0 def next_level(self, data): self.display.sprites.empty() @@ -66,13 +65,13 @@ def win(self): self.hero.animations.append(self.hero.win_anim()) - self.depth += 1 def die(self): # self.theme.stop() # self.eulogy.play() + self.level[self.hero.pos] = None self.hero.animations.append(self.hero.death_anim()) - self.depth += 0 + self.hero.dead = True def draw_map(self): self.level.draw(self.display.background, self.images) @@ -105,8 +104,7 @@ x, y = thing.pos if not self.level.get_support((x, y + 1)): self.fall(thing, 0) - elif (self.level.get_support((x, y + 1)) and - not self.level.get_dirt((x, y + 1), True) and + elif (self.level.get((x, y + 1)) and self.level.get((x, y + 1)) != self.hero): sides = [-1, 1] random.shuffle(sides) @@ -122,7 +120,7 @@ while self.hero.alive(): self.clock.tick(self.fps) self.tick() - if self.depth == 0: + if self.hero.dead: return False return True
--- a/undermine/sprites.py Sun Apr 27 22:59:15 2014 +0200 +++ b/undermine/sprites.py Sun Apr 27 23:06:51 2014 +0200 @@ -50,6 +50,7 @@ self.images = images self.animations = [self.stand_anim()] self.ready = True + self.dead = False def stand_anim(self): while True: @@ -70,10 +71,10 @@ def death_anim(self): self.ready = False - for step in range(4): + for step in range(8): yield None self.image = self.images[3] - for step in range(4): + for step in range(16): yield None self.kill()