1

tabs vs spaces, and added more texture code.

This commit is contained in:
Jake Howard 2015-05-12 12:16:59 +01:00
parent 03de948eb4
commit e21781e586

View File

@ -5,38 +5,39 @@ from random import randint
class Textures(): class Textures():
def __init__(self): def __init__(self):
self.images = { self.images = {
"PLAYER":"player.png", "PLAYER":"player",
"BULLET":"bullet.png", "BULLET":"bullet",
"TARGETS":[], "TARGETS":[],
"SHOOTER":"shooter.png", "SHOOTER":"shooter",
"TARGET_BULLET":"target_bullet.png" "TARGET_BULLET":"bullet_target"
} }
self.path=os.path.dirname(os.path.realpath(__file__)) + "\\resources\\texture_packs\\" self.path=os.path.dirname(os.path.realpath(__file__)) + "\\resources\\texture_packs\\"
self.pack = "default" self.pack = "default"
def load_texture_pack(self, packName): def load_texture_pack(self, pack_name):
if os.path.exists(self.path + packName): if os.path.exists(self.path + pack_name):
self.images["TARGETS"] = [] 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))) logging.debug("Found {0} target files.".format(len(targets)))
for file in targets: for file in targets:
fileName = file.split("\\")[-1] filename = file.split("\\")[-1].replace(".png", "")
self.images["TARGETS"].append(filename) self.images["TARGETS"].append(filename)
self.pack = packName self.pack = pack_name
else: logging.warn("Cannot find texture pack '{}'".format(packName)) else: logging.warn("Cannot find texture pack '{}'".format(ppack_name))
def get_texture(self, objectName): def get_texture(self, objectName):
filename = self.path + self.pack + "\\{0}.png".format(self.images[objectName.upper()]) filename = self.path + self.pack + "\\{0}.png".format(self.images[objectName.upper()])
return pygame.image.load(filename) return pygame.image.load(filename)
def get_target_texture(self): 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) return pygame.image.load(filename)
def list_packs(self): 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 = {} Sounds = {}
def init_sounds(): def init_sounds():
music_files = ["main.mp3", "fire.mp3"] music_files = ["main.wav", "OP.wav", "shot.wav"]
for file in music_files: for file in music_files:
path = os.path.dirname(os.path.realpath(__file__)) + "\\resources\\sounds\\" + file path = os.path.dirname(os.path.realpath(__file__)) + "\\resources\\sounds\\" + file
if file == "main.mp3": mixer = pygame.mixer.music.load(path) mixer = pygame.mixer.Sound(path)
else: mixer = pygame.mixer.Sound(file) mixer.set_volume(1.0)
Sounds.update(file.split(".")[0], mixer) Sounds[file.replace(".wav", "")] = mixer