diff --git a/__pycache__/enemy.cpython-313.pyc b/__pycache__/enemy.cpython-313.pyc index d918deb..53f1055 100644 Binary files a/__pycache__/enemy.cpython-313.pyc and b/__pycache__/enemy.cpython-313.pyc differ diff --git a/__pycache__/player.cpython-313.pyc b/__pycache__/player.cpython-313.pyc index dda0254..9587a29 100644 Binary files a/__pycache__/player.cpython-313.pyc and b/__pycache__/player.cpython-313.pyc differ diff --git a/__pycache__/settings.cpython-313.pyc b/__pycache__/settings.cpython-313.pyc index 69e10d8..acbd22d 100644 Binary files a/__pycache__/settings.cpython-313.pyc and b/__pycache__/settings.cpython-313.pyc differ diff --git a/enemy.py b/enemy.py index ba5bd20..06fba7b 100644 --- a/enemy.py +++ b/enemy.py @@ -1,19 +1,22 @@ from settings import SCREEN_HEIGHT, SCREEN_WIDTH import random import pygame - +from pygame.locals import ( + RLEACCEL,) class Enemy(pygame.sprite.Sprite): def __init__(self): super(Enemy, self).__init__() - self.surf = pygame.Surface((20, 10)) - self.surf.fill((255, 0, 0)) + self.surf= pygame.image.load("sprites/Enemy_Sprite.png").convert() + self.surf.set_colorkey((0, 0, 0), RLEACCEL) + #self.surf = pygame.Surface((24, 10)) + #self.surf.fill((255, 0, 0)) self.rect = self.surf.get_rect( center=( - random.randint(SCREEN_WIDTH + 20, SCREEN_WIDTH + 100), - random.randint(0, SCREEN_HEIGHT), + random.uniform(SCREEN_WIDTH + 20, SCREEN_WIDTH + 100), + random.uniform(0, SCREEN_HEIGHT), ) ) - self.speed = random.randint(1, 2) + self.speed = random.uniform(1,2) diff --git a/main.py b/main.py index d4cf832..4b4376b 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ from enemy import Enemy from settings import SCREEN_HEIGHT, SCREEN_WIDTH from pygame.locals import ( + RLEACCEL, K_UP, K_DOWN, K_LEFT, @@ -13,13 +14,23 @@ from pygame.locals import ( QUIT, ) +pygame.mixer.init() pygame.init() -ADDENEMY = pygame.USEREVENT + 1 -pygame.time.set_timer(ADDENEMY, 1000) + +pygame.font.init() +my_font = pygame.font.SysFont('Comic Sans MS', 30) + +pygame.mixer.music.load("sounds/aura.mp3") +pygame.mixer.music.play(loops=-1) + +collision_sound = pygame.mixer.Sound("sounds/dead.ogg") + screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) +ADDENEMY = pygame.USEREVENT + 1 +pygame.time.set_timer(ADDENEMY, 1000) running = True @@ -35,8 +46,13 @@ all_sprites.add(enemy) enemies.add(enemy) +bg =pygame.image.load("sprites/Graveyard.png").convert() + +clock = pygame.time.Clock() while running: + screen.blit(bg, (0,0)) + for event in pygame.event.get(): if event.type == KEYDOWN: if event.key == K_ESCAPE: @@ -50,7 +66,6 @@ while running: enemies.add(new_enemy) all_sprites.add(new_enemy) - screen.fill((255, 255, 255)) pressed_keys = pygame.key.get_pressed() @@ -64,8 +79,19 @@ while running: if pygame.sprite.spritecollideany(player, enemies): player.kill() - running=False + collision_sound.play() + pygame.time.delay(1000) + running=False + + text =my_font.render("Ya dead yet?", True, (255,255,0)) + screen.blit(text, (SCREEN_WIDTH-text.get_width(), 0)) pygame.display.flip() -pygame.quit() \ No newline at end of file +clock.tick(5050) + +pygame.mixer.music.stop() +pygame.mixer.quit() + +pygame.quit() + diff --git a/player.py b/player.py index 8f1f843..bd86441 100644 --- a/player.py +++ b/player.py @@ -1,6 +1,7 @@ import pygame from settings import SCREEN_HEIGHT, SCREEN_WIDTH from pygame.locals import ( + RLEACCEL, K_UP, K_DOWN, K_LEFT, @@ -14,19 +15,21 @@ from pygame.locals import ( class Player(pygame.sprite.Sprite): def __init__(self): super().__init__() - self.surf = pygame.Surface((40, 40)) - self.surf.fill((0, 250, 0)) - self.rect = self.surf.get_rect() - + self.surf = pygame.transform.scale( + pygame.image.load("sprites/Heart1.png").convert(), + (50, 66)) + self.surf.set_colorkey((0, 0, 0), RLEACCEL) + self.rect= self.surf.get_rect() + #self.surf = pygame.Surface((40, 40)) def update(self, pressed_keys): if pressed_keys[K_UP]: - self.rect.move_ip(0, -2) + self.rect.move_ip(0, -1) if pressed_keys[K_DOWN]: - self.rect.move_ip(0, 2) + self.rect.move_ip(0, 1) if pressed_keys[K_LEFT]: - self.rect.move_ip(-2, 0) + self.rect.move_ip(-1, 0) if pressed_keys[K_RIGHT]: - self.rect.move_ip(2, 0) + self.rect.move_ip(1, 0) if self.rect.left < 0: self.rect.left = 0 diff --git a/sounds/aura.mp3 b/sounds/aura.mp3 new file mode 100644 index 0000000..3075854 Binary files /dev/null and b/sounds/aura.mp3 differ diff --git a/sounds/dead.ogg b/sounds/dead.ogg new file mode 100644 index 0000000..990a7e0 Binary files /dev/null and b/sounds/dead.ogg differ diff --git a/sprites/Bandit.png b/sprites/Bandit.png new file mode 100644 index 0000000..a6646b1 Binary files /dev/null and b/sprites/Bandit.png differ diff --git a/sprites/Enemy_Sprite.png b/sprites/Enemy_Sprite.png new file mode 100644 index 0000000..53b6f35 Binary files /dev/null and b/sprites/Enemy_Sprite.png differ diff --git a/sprites/Graveyard.png b/sprites/Graveyard.png new file mode 100644 index 0000000..fe3e37d Binary files /dev/null and b/sprites/Graveyard.png differ diff --git a/sprites/Heart1.png b/sprites/Heart1.png new file mode 100644 index 0000000..3b6e37b Binary files /dev/null and b/sprites/Heart1.png differ diff --git a/sprites/Player2.png b/sprites/Player2.png new file mode 100644 index 0000000..eb2c2f4 Binary files /dev/null and b/sprites/Player2.png differ diff --git a/sprites/Player_Sprite.png b/sprites/Player_Sprite.png new file mode 100644 index 0000000..fc71c3c Binary files /dev/null and b/sprites/Player_Sprite.png differ diff --git a/sprites/jack.png b/sprites/jack.png new file mode 100644 index 0000000..7d777d5 Binary files /dev/null and b/sprites/jack.png differ diff --git a/sprites/tile000.png b/sprites/tile000.png new file mode 100644 index 0000000..745ec54 Binary files /dev/null and b/sprites/tile000.png differ diff --git a/sprites/tile001.png b/sprites/tile001.png new file mode 100644 index 0000000..a480301 Binary files /dev/null and b/sprites/tile001.png differ diff --git a/sprites/tile002.png b/sprites/tile002.png new file mode 100644 index 0000000..d6f459c Binary files /dev/null and b/sprites/tile002.png differ diff --git a/sprites/tile003.png b/sprites/tile003.png new file mode 100644 index 0000000..2cd4481 Binary files /dev/null and b/sprites/tile003.png differ diff --git a/sprites/tile004.png b/sprites/tile004.png new file mode 100644 index 0000000..e932089 Binary files /dev/null and b/sprites/tile004.png differ diff --git a/sprites/tile005.png b/sprites/tile005.png new file mode 100644 index 0000000..592527d Binary files /dev/null and b/sprites/tile005.png differ diff --git a/sprites/tile006.png b/sprites/tile006.png new file mode 100644 index 0000000..bf6d313 Binary files /dev/null and b/sprites/tile006.png differ diff --git a/sprites/tile007.png b/sprites/tile007.png new file mode 100644 index 0000000..6aa410b Binary files /dev/null and b/sprites/tile007.png differ diff --git a/sprites/tile008.png b/sprites/tile008.png new file mode 100644 index 0000000..805672e Binary files /dev/null and b/sprites/tile008.png differ diff --git a/sprites/tile009.png b/sprites/tile009.png new file mode 100644 index 0000000..8c14037 Binary files /dev/null and b/sprites/tile009.png differ diff --git a/sprites/tile010.png b/sprites/tile010.png new file mode 100644 index 0000000..75f885a Binary files /dev/null and b/sprites/tile010.png differ diff --git a/sprites/tile011.png b/sprites/tile011.png new file mode 100644 index 0000000..1d281d6 Binary files /dev/null and b/sprites/tile011.png differ diff --git a/sprites/tile012.png b/sprites/tile012.png new file mode 100644 index 0000000..cb63f0b Binary files /dev/null and b/sprites/tile012.png differ diff --git a/sprites/tile013.png b/sprites/tile013.png new file mode 100644 index 0000000..fb5de3d Binary files /dev/null and b/sprites/tile013.png differ diff --git a/sprites/tile014.png b/sprites/tile014.png new file mode 100644 index 0000000..7992f6a Binary files /dev/null and b/sprites/tile014.png differ diff --git a/sprites/tile015.png b/sprites/tile015.png new file mode 100644 index 0000000..ee6ede1 Binary files /dev/null and b/sprites/tile015.png differ