From a154e71286aba6e0891de404323f92e74abaef2a Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 4 Nov 2021 19:04:43 -0700 Subject: [PATCH] assets by folders --- galaxy.png => backgrounds/galaxy.png | Bin space.ogg => music/space.ogg | Bin r3.py | 18 +++++++++--------- complete.ogg => sfx/complete.ogg | Bin crash.ogg => sfx/crash.ogg | Bin asteroid.png => sprites/asteroid.png | Bin css.png => sprites/css.png | Bin radio.png => sprites/radio.png | Bin sat.png => sprites/sat.png | Bin ss.png => sprites/ss.png | Bin 10 files changed, 9 insertions(+), 9 deletions(-) rename galaxy.png => backgrounds/galaxy.png (100%) rename space.ogg => music/space.ogg (100%) rename complete.ogg => sfx/complete.ogg (100%) rename crash.ogg => sfx/crash.ogg (100%) rename asteroid.png => sprites/asteroid.png (100%) rename css.png => sprites/css.png (100%) rename radio.png => sprites/radio.png (100%) rename sat.png => sprites/sat.png (100%) rename ss.png => sprites/ss.png (100%) diff --git a/galaxy.png b/backgrounds/galaxy.png similarity index 100% rename from galaxy.png rename to backgrounds/galaxy.png diff --git a/space.ogg b/music/space.ogg similarity index 100% rename from space.ogg rename to music/space.ogg diff --git a/r3.py b/r3.py index f77abb7..e857e97 100644 --- a/r3.py +++ b/r3.py @@ -33,9 +33,9 @@ else: FPS = 60 BLACK = (0, 0, 0) #WHITE = (255, 255, 255) - pygame.mixer.music.load('space.ogg') - csfx = pygame.mixer.Sound('crash.ogg') - lcfx = pygame.mixer.Sound('complete.ogg') + pygame.mixer.music.load('music/space.ogg') + csfx = pygame.mixer.Sound('sfx/crash.ogg') + lcfx = pygame.mixer.Sound('sfx/complete.ogg') pygame.mixer.music.play(-1) #sound = pygame.mixer.Sound(file='bmx.ogg') #raw_array = sound.get_raw() @@ -47,7 +47,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = 0 self.y = 0 - self.image = pygame.image.load('galaxy.png') + self.image = pygame.image.load('backgrounds/galaxy.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) self.rect = self.image.get_rect() # Get rect of some size as 'image'. @@ -75,7 +75,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = xset self.y = yset - self.image = pygame.image.load('ss.png') + self.image = pygame.image.load('sprites/ss.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) #self.rect = self.image.get_rect() # Get rect of some size as 'image'. @@ -112,7 +112,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = xset self.y = yset - self.image = pygame.image.load('css.png') + self.image = pygame.image.load('sprites/css.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) #self.rect = self.image.get_rect() # Get rect of some size as 'image'. @@ -125,7 +125,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = xset self.y = yset - self.image = pygame.image.load('sat.png') + self.image = pygame.image.load('sprites/sat.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) #self.rect = self.image.get_rect() # Get rect of some size as 'image'. @@ -138,7 +138,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = xset self.y = yset - self.image = pygame.image.load('radio.png') + self.image = pygame.image.load('sprites/radio.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) #self.rect = self.image.get_rect() # Get rect of some size as 'image'. @@ -151,7 +151,7 @@ else: pygame.sprite.Sprite.__init__(self) self.x = xset self.y = yset - self.image = pygame.image.load('asteroid.png') + self.image = pygame.image.load('sprites/asteroid.png') #self.image = pygame.Surface((32, 32)) #self.image.fill(WHITE) #self.rect = self.image.get_rect() # Get rect of some size as 'image'. diff --git a/complete.ogg b/sfx/complete.ogg similarity index 100% rename from complete.ogg rename to sfx/complete.ogg diff --git a/crash.ogg b/sfx/crash.ogg similarity index 100% rename from crash.ogg rename to sfx/crash.ogg diff --git a/asteroid.png b/sprites/asteroid.png similarity index 100% rename from asteroid.png rename to sprites/asteroid.png diff --git a/css.png b/sprites/css.png similarity index 100% rename from css.png rename to sprites/css.png diff --git a/radio.png b/sprites/radio.png similarity index 100% rename from radio.png rename to sprites/radio.png diff --git a/sat.png b/sprites/sat.png similarity index 100% rename from sat.png rename to sprites/sat.png diff --git a/ss.png b/sprites/ss.png similarity index 100% rename from ss.png rename to sprites/ss.png