Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Irber <luiz.irber@gmail.com>2008-04-08 21:56:00 (GMT)
committer Luiz Irber <luiz.irber@gmail.com>2008-04-08 21:56:00 (GMT)
commit6a917f6cbbd8d6ac34320477d5363c8e9f708437 (patch)
tree2a841953ab2be24a408c907b47f209af39c08ab5
parent1fd480d53e99b8f8849e5ebc39134e1dc8cea698 (diff)
Removed whitespaces
-rw-r--r--Gambiarra/command.py6
-rw-r--r--Gambiarra/gambiarra.py14
-rw-r--r--Gambiarra/gamemenu.py18
-rw-r--r--Gambiarra/levels.py8
-rw-r--r--Gambiarra/objects/things.py6
-rw-r--r--Gambiarra/objects/wall.py2
6 files changed, 27 insertions, 27 deletions
diff --git a/Gambiarra/command.py b/Gambiarra/command.py
index 9f1c658..449ad55 100644
--- a/Gambiarra/command.py
+++ b/Gambiarra/command.py
@@ -25,7 +25,7 @@ import pygame
class Command(pygame.sprite.Sprite):
image = None
-
+
def __init__(self, img):
pygame.sprite.Sprite.__init__(self)
self.image = img
@@ -43,10 +43,10 @@ class Play(Command):
class Help(Command):
def __init__(self):
- super(Help, self).__init__( pygame.image.load(
+ super(Help, self).__init__( pygame.image.load(
abspath("../data/images/helpButton.png") ) )
class Quit(Command):
def __init__(self):
- super(Quit, self).__init__( pygame.image.load(
+ super(Quit, self).__init__( pygame.image.load(
abspath("../data/images/quitButton.png") ) )
diff --git a/Gambiarra/gambiarra.py b/Gambiarra/gambiarra.py
index 1919e86..8c15fbf 100644
--- a/Gambiarra/gambiarra.py
+++ b/Gambiarra/gambiarra.py
@@ -88,7 +88,7 @@ def check_collision(sprite_list, wall_list):
if obj.rect.top <= w.rect.bottom:
obj.rect.top = w.rect.bottom + 5
obj.speed[1] *= -0.95*obj.elasticity/100
-
+
if isinstance(w, LeftWall):
if obj.rect.left <= w.rect.right:
obj.rect.left = w.rect.right + 5
@@ -107,7 +107,7 @@ def check_collision(sprite_list, wall_list):
obj.speed[1] = 0
else:
obj.speed[1] *= -0.75*obj.elasticity/100
-
+
if isinstance(w, Elastica):
if (obj.rect.bottom >= w.rect.top and obj.speed[1] > 0):
obj.rect.bottom = w.rect.top - 1
@@ -188,7 +188,7 @@ class Game(object):
def update_screen(self, fps):
#update dos elementos da tela
if self.playing:
-
+
# executa a simulacao
objs = check_collision(self.levels[self.level].simulator.objects,
self.levels[self.level].simulator.staticObjs)
@@ -207,7 +207,7 @@ class Game(object):
if self.selected_element:
if self.selected_element.editable:
self.selected_element.rect.center = pygame.mouse.get_pos()
-
+
def mouse_event(self, mousePos):
if not self.selected_element:
collided = False
@@ -219,18 +219,18 @@ class Game(object):
collided = True
self.selected_element = element
break
-
+
if not self.selected_element:
for element in self.levels[self.level].simulator.staticObjs:
if element.rect.collidepoint(mousePos):
collided = True
self.selected_element = element
-
+
if isinstance(element,Esteira) and element.editable:
self.count += 1
if self.count == 1:
element.sentido=-element.sentido
- self.count = 0
+ self.count = 0
break
if not self.selected_element: #se nao encontrou no for anterior
diff --git a/Gambiarra/gamemenu.py b/Gambiarra/gamemenu.py
index 52e0b86..4624ec3 100644
--- a/Gambiarra/gamemenu.py
+++ b/Gambiarra/gamemenu.py
@@ -29,7 +29,7 @@ class GameMenu(object):
background = None
# level = None
start = None
-
+
def __init__(self):
# pygame.init()
# pygame.display.set_mode((1280,800))
@@ -118,7 +118,7 @@ class LevelButton(object):
numberOfLevels = None
current_level_img = None
clicked = None
-
+
def __init__(self, position, numberOfLevels = 1):
nonHover = pygame.image.load(
abspath("../data/images/nivel_normal.png") )
@@ -132,23 +132,23 @@ class LevelButton(object):
self.numberOfLevels = numberOfLevels
self.current_level_img = None # Precisa 'renderizar' o numero do nivel
self.clicked = False
-
+
def draw(self, screen):
screen.blit(self.current_img, self.position)
-
+
def click(self):
self.clicked = True
self.level += 1
if self.level == self.numberOfLevels :
self.level = 0
-
+
class StartButton(object):
img = None
position = None
current = None
current_img = None
clicked = None
-
+
def __init__(self, position):
nonHover=pygame.image.load(
abspath("../data/images/iniciar_normal.png") )
@@ -159,9 +159,9 @@ class StartButton(object):
self.current = 0
self.current_img = self.img[self.current]
self.clicked = False
-
+
def draw(self, screen):
screen.blit(self.current_img, self.position)
-
+
def click(self):
- self.clicked = True \ No newline at end of file
+ self.clicked = True
diff --git a/Gambiarra/levels.py b/Gambiarra/levels.py
index 2e4efe2..4e90ce1 100644
--- a/Gambiarra/levels.py
+++ b/Gambiarra/levels.py
@@ -41,7 +41,7 @@ class SimulationView(object):
running = None
background = None
objects = None
-
+
def __init__(self, objects):
self.running = False
self.background = pygame.Surface((1200, 770))
@@ -111,7 +111,7 @@ class CommandBar(object):
self.width, self.height = self.background.get_size()
self.background.fill([0,0,255]) #TODO: achar uma cor melhor =D
self.commands = [ Play(), Help(), Quit() ]
-
+
def draw(self, pos=None):
screen = pygame.display.get_surface()
if pos:
@@ -178,7 +178,7 @@ def init_levels():
level2ToGoal = level2ObjInPlace[0]
level2HelpImage = pygame.image.load("../data/images/obj-level2.png")
- level3ObjInPlace = [ BowlingBall((20,20), editable=False),
+ level3ObjInPlace = [ BowlingBall((20,20), editable=False),
Esteira((10, 300),editable=False),
Target((1100, 20), editable=False)]
level3ObjToAdd = [ Elastica(), Elastica()]
@@ -186,7 +186,7 @@ def init_levels():
level3ToGoal = level3ObjInPlace[0]
level3HelpImage = pygame.image.load("../data/images/obj-level3.png")
- level4ObjInPlace = [ BowlingBall((20,20), editable=False),
+ level4ObjInPlace = [ BowlingBall((20,20), editable=False),
SoccerBall((800, 300), editable=False),
Target((900, 90), editable=False),
Target((100, 550), editable=False)]
diff --git a/Gambiarra/objects/things.py b/Gambiarra/objects/things.py
index 3fe6572..f2d0189 100644
--- a/Gambiarra/objects/things.py
+++ b/Gambiarra/objects/things.py
@@ -51,13 +51,13 @@ class Thing(pygame.sprite.Sprite):
gravity = None
snd = None
elasticity = None # * 1%, from 0 up to 100
-
+
def __init__(self, image, editable, snd, initialPosition=None,
elasticity = 70, mobility = False, gravity = 5 ):
pygame.sprite.Sprite.__init__(self) #call Sprite intializer
self.image = image
self.rect = image.get_rect()
-
+
if initialPosition:
self.initialPosition = initialPosition
self.rect.topleft = initialPosition[0], initialPosition[1]
@@ -72,7 +72,7 @@ class Thing(pygame.sprite.Sprite):
# temos a imagem na variavel <img> e
# o 'zero' (ponto onde deve ser desenhado <pos>
screen.blit(self.image, (pos[0],pos[1]))
-
+
def play(self):
if self.snd and pygame.mixer.get_init():
self.snd.play()
diff --git a/Gambiarra/objects/wall.py b/Gambiarra/objects/wall.py
index 866801c..3ec40cc 100644
--- a/Gambiarra/objects/wall.py
+++ b/Gambiarra/objects/wall.py
@@ -31,7 +31,7 @@ class LeftWall(Thing):
pygame.image.load(abspath("../data/images/leftwall.png")),
editable, None,
initialPosition, elasticity = 100, mobility = False, gravity = 10)
-
+
class RightWall(Thing):
def __init__(self, initialPosition = [1185,0], editable=False):
super(RightWall, self).__init__(