tabs vs spaces, and added more texture code.
This commit is contained in:
parent
03de948eb4
commit
e21781e586
1 changed files with 44 additions and 43 deletions
33
assets.py
33
assets.py
|
@ -5,38 +5,39 @@ from random import randint
|
|||
class Textures():
|
||||
def __init__(self):
|
||||
self.images = {
|
||||
"PLAYER":"player.png",
|
||||
"BULLET":"bullet.png",
|
||||
"PLAYER":"player",
|
||||
"BULLET":"bullet",
|
||||
"TARGETS":[],
|
||||
"SHOOTER":"shooter.png",
|
||||
"TARGET_BULLET":"target_bullet.png"
|
||||
"SHOOTER":"shooter",
|
||||
"TARGET_BULLET":"bullet_target"
|
||||
}
|
||||
self.path=os.path.dirname(os.path.realpath(__file__)) + "\\resources\\texture_packs\\"
|
||||
self.pack = "default"
|
||||
|
||||
def load_texture_pack(self, packName):
|
||||
if os.path.exists(self.path + packName):
|
||||
def load_texture_pack(self, pack_name):
|
||||
if os.path.exists(self.path + pack_name):
|
||||
self.images["TARGETS"] = []
|
||||
|
||||
targets = glob.glob(self.path+packName+"\\target*.png")
|
||||
targets = glob.glob(self.path+pack_name+"\\target*.png")
|
||||
logging.debug("Found {0} target files.".format(len(targets)))
|
||||
for file in targets:
|
||||
fileName = file.split("\\")[-1]
|
||||
filename = file.split("\\")[-1].replace(".png", "")
|
||||
self.images["TARGETS"].append(filename)
|
||||
|
||||
self.pack = packName
|
||||
else: logging.warn("Cannot find texture pack '{}'".format(packName))
|
||||
self.pack = pack_name
|
||||
else: logging.warn("Cannot find texture pack '{}'".format(ppack_name))
|
||||
|
||||
def get_texture(self, objectName):
|
||||
filename = self.path + self.pack + "\\{0}.png".format(self.images[objectName.upper()])
|
||||
return pygame.image.load(filename)
|
||||
|
||||
def get_target_texture(self):
|
||||
filename = self.path + self.pack + "\\{}.png".format(self.images["TARGETS"][randint(0,len(self.images["TARGETS"]))])
|
||||
index = randint(0,len(self.images["TARGETS"])-1) if len(self.images["TARGETS"]) >=1 else 0
|
||||
filename = self.path + self.pack + "\\{}.png".format(self.images["TARGETS"][randint(0,len(self.images["TARGETS"])-1)])
|
||||
return pygame.image.load(filename)
|
||||
|
||||
def list_packs(self):
|
||||
return [x[0] for x in os.walk(self.path)]
|
||||
return [x[0].replace(self.path, "") for x in os.walk(self.path)]
|
||||
|
||||
|
||||
|
||||
|
@ -59,9 +60,9 @@ def generate_random_level():
|
|||
|
||||
Sounds = {}
|
||||
def init_sounds():
|
||||
music_files = ["main.mp3", "fire.mp3"]
|
||||
music_files = ["main.wav", "OP.wav", "shot.wav"]
|
||||
for file in music_files:
|
||||
path = os.path.dirname(os.path.realpath(__file__)) + "\\resources\\sounds\\" + file
|
||||
if file == "main.mp3": mixer = pygame.mixer.music.load(path)
|
||||
else: mixer = pygame.mixer.Sound(file)
|
||||
Sounds.update(file.split(".")[0], mixer)
|
||||
mixer = pygame.mixer.Sound(path)
|
||||
mixer.set_volume(1.0)
|
||||
Sounds[file.replace(".wav", "")] = mixer
|
Reference in a new issue