diff options
| author | Luiz Irber <luiz.irber@gmail.com> | 2007-11-11 21:48:52 (GMT) |
|---|---|---|
| committer | Luiz Irber <luiz.irber@gmail.com> | 2007-11-11 21:48:52 (GMT) |
| commit | f3dc6676cfa60934ba58b49af15160d5a38255fd (patch) | |
| tree | 0e4c9aa4ac9c08ad5e67fc6068d2dfba0d27dc4c | |
| parent | 4ba2753f0236621fd0c7915222bc98eccd767545 (diff) | |
Versao final do GameJam
| -rw-r--r-- | Gambiarra/levels.py | 8 | ||||
| -rw-r--r-- | Gambiarra/objects/esteira.py | 4 | ||||
| -rw-r--r-- | Gambiarra/objects/target.py | 6 | ||||
| -rw-r--r-- | data/images/obj-level6.png | bin | 213971 -> 213786 bytes |
4 files changed, 9 insertions, 9 deletions
diff --git a/Gambiarra/levels.py b/Gambiarra/levels.py index b0a031f..c0328e5 100644 --- a/Gambiarra/levels.py +++ b/Gambiarra/levels.py @@ -185,7 +185,7 @@ def init_levels(): level4ObjToAdd = [ Esteira(), Esteira()] level4Goal = level4ObjInPlace[-1] level4ToGoal = level4ObjInPlace[0] - level4HelpImage = pygame.image.load("../data/images/obj-level3.png") + level4HelpImage = pygame.image.load("../data/images/obj-level4.png") level5ObjInPlace = [ BowlingBall((1000,300), editable=False), Esteira((1000,500), editable=False), @@ -193,7 +193,7 @@ def init_levels(): level5ObjToAdd = [ Esteira(), Esteira()] level5Goal = level5ObjInPlace[-1] level5ToGoal = level5ObjInPlace[0] - level5HelpImage = pygame.image.load("../data/images/obj-level3.png") + level5HelpImage = pygame.image.load("../data/images/obj-level5.png") level6ObjInPlace = [ BeachBall((800,50),editable = False), Elastica((800,400),editable = False), @@ -202,7 +202,7 @@ def init_levels(): level6ObjToAdd = [ Esteira(), Esteira() ] level6Goal = level6ObjInPlace[-1] level6ToGoal = level6ObjInPlace[0] - level6HelpImage = pygame.image.load("../data/images/obj-level3.png") + level6HelpImage = pygame.image.load("../data/images/obj-level6.png") level1 = Level( level1ObjInPlace, level1ObjToAdd, level1Goal, level1ToGoal, level1HelpImage) @@ -217,4 +217,4 @@ def init_levels(): level6 = Level( level6ObjInPlace, level6ObjToAdd, level6Goal, level6ToGoal, level6HelpImage) - return [level1, level2, level3, level4, level5, level6]
\ No newline at end of file + return [level1, level2, level3, level4, level5, level6] diff --git a/Gambiarra/objects/esteira.py b/Gambiarra/objects/esteira.py index 55be56b..0bcbb3c 100644 --- a/Gambiarra/objects/esteira.py +++ b/Gambiarra/objects/esteira.py @@ -23,7 +23,7 @@ from os.path import abspath import pygame -from things import Thing +from things import Thing, NoSound class Esteira(Thing): @@ -32,7 +32,7 @@ class Esteira(Thing): def __init__(self, initialPosition = [0,0], editable=True): super(Esteira, self).__init__( pygame.image.load(abspath("../data/images/esteira_dir.png")), - editable, pygame.mixer.Sound(abspath("../data/snd/dummy.wav")), + editable, NoSound(), initialPosition, elasticity = 100, mobility = False, gravity = 10) self.sentido = 1 diff --git a/Gambiarra/objects/target.py b/Gambiarra/objects/target.py index e935fde..62a481c 100644 --- a/Gambiarra/objects/target.py +++ b/Gambiarra/objects/target.py @@ -23,12 +23,12 @@ from os.path import abspath import pygame -from things import Thing +from things import Thing, NoSound class Target(Thing): def __init__(self, initialPosition = [0,0], editable=True): super(Target, self).__init__( pygame.image.load(abspath("../data/images/target.png")), - editable, pygame.mixer.Sound(abspath("../data/snd/dummy.wav")), + editable, NoSound(), initialPosition, elasticity = 100, mobility = False, - gravity = 10)
\ No newline at end of file + gravity = 10) diff --git a/data/images/obj-level6.png b/data/images/obj-level6.png Binary files differindex edbc2f1..f07f842 100644 --- a/data/images/obj-level6.png +++ b/data/images/obj-level6.png |
