Skip to content

Commit

Permalink
autopep8
Browse files Browse the repository at this point in the history
  • Loading branch information
@mthenault
mthenault committed Sep 9, 2017
1 parent 675f91f commit 2f816d9
Show file tree
Hide file tree
Showing 19 changed files with 1,948 additions and 1,920 deletions.
108 changes: 53 additions & 55 deletions sources/asteroids.py
View file
Expand Up @@ -3,61 +3,59 @@
import random
import collisions
pygame = common_pygame.pygame
screen= common_pygame.screen
screen = common_pygame.screen


class Asteroids():


def __init__(self, single_sprites):
self.single_sprites=single_sprites
self.compteur=0
self.asteroidList=list()
self.rotateAst=0

def updatecompteur(self):
self.compteur=self.compteur+1

def determine(self, x):
(x_, y, v, s, sprite, h, w) = x
if y-h>=screen.get_height():
return True
return False

def blitAsteroids(self, laserlist):
if len(self.asteroidList)<=2 and self.compteur%10==0:
#x, y, speed, size, sprite, height
size = random.randrange(10, 150)


asteroid=False
#load the appropriate sprite
choix = random.randrange(1,7)
if choix ==1:
spritearg = pygame.transform.scale(self.single_sprites['asteroid1.png'], (size , size )).convert_alpha()
elif choix==2:
spritearg = pygame.transform.scale(self.single_sprites['asteroid3.png'], (size , size )).convert_alpha()
else:
spritearg = pygame.transform.scale(self.single_sprites['asteroid2.png'], (size , size )).convert_alpha()

speed = random.randrange(7, 12)


height = spritearg.get_height()
width = spritearg.get_width()
self.asteroidList.append((random.randrange(0, screen.get_width()),0, speed, size ,spritearg, height, width))

#determine : false if keep, true if delete
self.asteroidList[:] = [x for x in self.asteroidList if not self.determine(x)]

for index in xrange(len(self.asteroidList)):
#verify if a laser is not touching the asteroid



(x, y, v, s, sprite, h, w) = self.asteroidList[index]
screen.blit(sprite,(x, y-h))
y=y+v
self.asteroidList[index]=(x, y, v, s, sprite, h, w)



def __init__(self, single_sprites):
self.single_sprites = single_sprites
self.compteur = 0
self.asteroidList = list()
self.rotateAst = 0

def updatecompteur(self):
self.compteur = self.compteur + 1

def determine(self, x):
(x_, y, v, s, sprite, h, w) = x
if y - h >= screen.get_height():
return True
return False

def blitAsteroids(self, laserlist):
if len(self.asteroidList) <= 2 and self.compteur % 10 == 0:
#x, y, speed, size, sprite, height
size = random.randrange(10, 150)

asteroid = False
# load the appropriate sprite
choix = random.randrange(1, 7)
if choix == 1:
spritearg = pygame.transform.scale(
self.single_sprites['asteroid1.png'], (size, size)).convert_alpha()
elif choix == 2:
spritearg = pygame.transform.scale(
self.single_sprites['asteroid3.png'], (size, size)).convert_alpha()
else:
spritearg = pygame.transform.scale(
self.single_sprites['asteroid2.png'], (size, size)).convert_alpha()

speed = random.randrange(7, 12)

height = spritearg.get_height()
width = spritearg.get_width()
self.asteroidList.append((random.randrange(
0, screen.get_width()), 0, speed, size, spritearg, height, width))

# determine : false if keep, true if delete
self.asteroidList[:] = [
x for x in self.asteroidList if not self.determine(x)]

for index in xrange(len(self.asteroidList)):
# verify if a laser is not touching the asteroid

(x, y, v, s, sprite, h, w) = self.asteroidList[index]
screen.blit(sprite, (x, y - h))
y = y + v
self.asteroidList[index] = (x, y, v, s, sprite, h, w)
121 changes: 63 additions & 58 deletions sources/background.py
View file
Expand Up @@ -2,65 +2,70 @@
import common_pygame
import random
pygame = common_pygame.pygame
screen= common_pygame.screen
screen = common_pygame.screen


class BackGen():


def __init__(self, single_sprites):
self.single_sprites=single_sprites
self.compteur=0
self.asteroidList=list()
self.ast = self.single_sprites['asteroid1.png']
self.rotateAst=0

def updatecompteur(self):
self.compteur=self.compteur+1

def blitStars(self):
screen.blit(self.single_sprites['background.png'],(0,-600+(self.compteur%200*3)))
screen.blit(self.single_sprites['background.png'],(0,self.compteur%200*3))

def determine(self, x):
(x_, y, v, s, sprite, h, w) = x
if y-h>=screen.get_height():
return True
return False

def blitPlanets(self):
if len(self.asteroidList)<=2 and self.compteur%10==0:
#x, y, speed, size, sprite, height
size = random.randrange(10, 200)


asteroid=False
#load the appropriate sprite
choix = random.randrange(1,4)
if choix==1:
spritearg = pygame.transform.scale(self.single_sprites['planet1.png'], (size , size )).convert_alpha()
elif choix==2:
spritearg = pygame.transform.scale(self.single_sprites['planet2.png'], (size , size )).convert_alpha()
else:
spritearg = pygame.transform.scale(self.single_sprites['planet3.png'], (size , size )).convert_alpha()

speed = random.randrange(2, 4)

height = spritearg.get_height()
width = spritearg.get_width()
self.asteroidList.append((random.randrange(0, screen.get_width()),0, speed, size ,spritearg, height, width))

#determine : false if keep, true if delete
self.asteroidList[:] = [x for x in self.asteroidList if not self.determine(x)]

for index in xrange(len(self.asteroidList)):
(x, y, v, s, sprite, h, w) = self.asteroidList[index]
screen.blit(sprite,(x, y-h))
y=y+v
self.asteroidList[index]=(x, y, v, s, sprite, h, w)


def blitFog(self):
screen.blit(self.single_sprites['backgroundtransp.png'],(0,-600+(self.compteur%40*15)))
screen.blit(self.single_sprites['backgroundtransp.png'],(0,self.compteur%40*15))

def __init__(self, single_sprites):
self.single_sprites = single_sprites
self.compteur = 0
self.asteroidList = list()
self.ast = self.single_sprites['asteroid1.png']
self.rotateAst = 0

def updatecompteur(self):
self.compteur = self.compteur + 1

def blitStars(self):
screen.blit(self.single_sprites[
'background.png'], (0, -600 + (self.compteur % 200 * 3)))
screen.blit(self.single_sprites[
'background.png'], (0, self.compteur % 200 * 3))

def determine(self, x):
(x_, y, v, s, sprite, h, w) = x
if y - h >= screen.get_height():
return True
return False

def blitPlanets(self):
if len(self.asteroidList) <= 2 and self.compteur % 10 == 0:
#x, y, speed, size, sprite, height
size = random.randrange(10, 200)

asteroid = False
# load the appropriate sprite
choix = random.randrange(1, 4)
if choix == 1:
spritearg = pygame.transform.scale(
self.single_sprites['planet1.png'], (size, size)).convert_alpha()
elif choix == 2:
spritearg = pygame.transform.scale(
self.single_sprites['planet2.png'], (size, size)).convert_alpha()
else:
spritearg = pygame.transform.scale(
self.single_sprites['planet3.png'], (size, size)).convert_alpha()

speed = random.randrange(2, 4)

height = spritearg.get_height()
width = spritearg.get_width()
self.asteroidList.append((random.randrange(
0, screen.get_width()), 0, speed, size, spritearg, height, width))

# determine : false if keep, true if delete
self.asteroidList[:] = [
x for x in self.asteroidList if not self.determine(x)]

for index in xrange(len(self.asteroidList)):
(x, y, v, s, sprite, h, w) = self.asteroidList[index]
screen.blit(sprite, (x, y - h))
y = y + v
self.asteroidList[index] = (x, y, v, s, sprite, h, w)

def blitFog(self):
screen.blit(self.single_sprites[
'backgroundtransp.png'], (0, -600 + (self.compteur % 40 * 15)))
screen.blit(self.single_sprites[
'backgroundtransp.png'], (0, self.compteur % 40 * 15))
62 changes: 31 additions & 31 deletions sources/bonus.py
View file
Expand Up @@ -2,36 +2,36 @@
import common_pygame
import random
pygame = common_pygame.pygame
screen= common_pygame.screen
screen = common_pygame.screen


class Bonus():
def __init__(self, sounds, menu):
self.menu=menu
self.sounds=sounds
self.bonusType=0
self.bonusAnim=0
self.font = pygame.font.Font(None,64)
self.bonusList = list()
self.bonusList.append(self.font.render(str("plasma gun !"), True, (255,255, 0)))
self.score=0
self.bonuscount=1

def ProcessBonus(self, ship):
#if ship.score %200 ==0 and ship.weapon==1 and ship.score>0:

if ship.score>400*self.bonuscount and self.score<400*self.bonuscount:
self.menu.play_sound(self.sounds["plasmagun.wav"])
ship.setWeapon(2)
self.bonusType=0
self.bonusAnim=30
self.score=ship.score
self.bonuscount=self.bonuscount+1

if self.bonusAnim>0 :
self.bonusAnim=self.bonusAnim-1
#show bonus for the plasma weapon
if self.bonusType==0:
screen.blit(self.bonusList[0], (250,250 ))




def __init__(self, sounds, menu):
self.menu = menu
self.sounds = sounds
self.bonusType = 0
self.bonusAnim = 0
self.font = pygame.font.Font(None, 64)
self.bonusList = list()
self.bonusList.append(self.font.render(
str("plasma gun !"), True, (255, 255, 0)))
self.score = 0
self.bonuscount = 1

def ProcessBonus(self, ship):
# if ship.score %200 ==0 and ship.weapon==1 and ship.score>0:

if ship.score > 400 * self.bonuscount and self.score < 400 * self.bonuscount:
self.menu.play_sound(self.sounds["plasmagun.wav"])
ship.setWeapon(2)
self.bonusType = 0
self.bonusAnim = 30
self.score = ship.score
self.bonuscount = self.bonuscount + 1

if self.bonusAnim > 0:
self.bonusAnim = self.bonusAnim - 1
# show bonus for the plasma weapon
if self.bonusType == 0:
screen.blit(self.bonusList[0], (250, 250))
30 changes: 15 additions & 15 deletions sources/collisions.py
View file
@@ -1,16 +1,16 @@
#detect collisions of two different rectangles
# detect collisions of two different rectangles
def iscollision(AposX, AposY, AsizeX, AsizeY, BposX, BposY, BsizeX, BsizeY):
if ((AposX+AsizeX <= BposX +BsizeX \
and AposX +AsizeX >= BposX )\
or
(AposX <= BposX + BsizeX\
and AposX +AsizeX >= BposX ))\
\
and ((AposY+AsizeY <= BposY +BsizeY \
and AposY +AsizeY> BposY) \
or
(AposY <= BposY +BsizeY \
and AposY > BposY)):
return True
else:
return False
if ((AposX + AsizeX <= BposX + BsizeX
and AposX + AsizeX >= BposX)
or
(AposX <= BposX + BsizeX
and AposX + AsizeX >= BposX ))\
\
and ((AposY + AsizeY <= BposY + BsizeY
and AposY + AsizeY > BposY)
or
(AposY <= BposY + BsizeY
and AposY > BposY)):
return True
else:
return False
15 changes: 8 additions & 7 deletions sources/common_pygame.py
View file
@@ -1,17 +1,18 @@
import pygame, sys, pygame.mixer
import pygame
import sys
import pygame.mixer
from pygame.locals import *

pygame.init()

clock = pygame.time.Clock()
screen = pygame.display.set_mode((800,600))
screen = pygame.display.set_mode((800, 600))
pygame.mouse.set_visible(False)
#pygame.mouse.set_visible(0)
# pygame.mouse.set_visible(0)
pygame.mixer.set_num_channels(32)
pygame.display.set_caption("MICshooter")

screenwidth=screen.get_width()
screenheight=screen.get_height()

explosions=0
screenwidth = screen.get_width()
screenheight = screen.get_height()

explosions = 0

0 comments on commit 2f816d9

Please sign in to comment.