V6, 2 horas

34 files changed, 208 insertions, 98 deletions

diff --git a/Gambiarra/command.py b/Gambiarra/command.py
new file mode 100644
index 0000000..46f40f8
--- /dev/null
+++ b/Gambiarra/command.py
@@ -0,0 +1,31 @@
+# gambiarra/command.py
+
+from os.path import abspath
+
+import pygame
+
+class Command(object):
+    image = None
+    
+    def __init__(self, img):
+        self.image = img
+
+    def draw(self, screen, pos):
+        # temos a imagem na variavel <img> e
+        # o 'zero' (ponto onde deve ser desenhado <pos>
+        screen.blit(self.image, (pos[0],pos[1]))
+
+class Play(Command):
+    def __init__(self):
+        super(Play, self).__init__( pygame.image.load(
+                                    abspath("../data/images/playButton.png") ) )
+
+class Help(Command):
+    def __init__(self):
+        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( 
+                                    abspath("../data/images/quitButton.png") ) )
diff --git a/Gambiarra/gambiarra.py b/Gambiarra/gambiarra.py
index a6a0d25..86436d8 100644
--- a/Gambiarra/gambiarra.py
+++ b/Gambiarra/gambiarra.py
@@ -1,11 +1,13 @@
-# /gambiarra/gambiarra.py
+# gambiarra/gambiarra.py
 #aqui fica o codigo do jogo em si
 
 import pygame
 from pygame.locals import *
 import os
-from levels import levels as Levels
+import levels as Levels
 from objects.wall import *
+from objects.target import Target
+from objects.esteira import Esteira
 
 def check_collision(sprite_list, wall_list):
     new_objects = pygame.sprite.RenderPlain()
@@ -20,36 +22,57 @@ def check_collision(sprite_list, wall_list):
         for w in wall_list:
             if obj.rect.colliderect(w.rect):
                 if isinstance(w, DownWall):
-                    obj.speed[1] = -0.7*obj.speed[1]
                     if obj.rect.bottom > w.rect.top:
-                        obj.rect.bottom = w.rect.top - 1
+                       obj.rect.bottom = w.rect.top - 1
+                       obj.speed[1] = -0.7*obj.speed[1]
 
                 if isinstance(w, UpWall):
-                    obj.speed[1] = -0.7*obj.speed[1]
                     if obj.rect.top < w.rect.bottom:
                         obj.rect.top = w.rect.bottom + 1
+                        obj.speed[1] = -0.7*obj.speed[1]
 
                 if isinstance(w, LeftWall):
-                    obj.speed[0] = -0.9*obj.speed[0]
                     if obj.rect.left < w.rect.right:
                         obj.rect.left = w.rect.right + 1
+                        obj.speed[1] = -0.9*obj.speed[1]
 
                 if isinstance(w, RightWall):
-                    obj.speed[0] = -0.9*obj.speed[0]
                     if obj.rect.right > w.rect.left:
                         obj.rect.right = w.rect.left - 1
+                        obj.speed[1] = -0.9*obj.speed[1]
+
+                if isinstance(w, Esteira):
+                    pass
+                    #Considerando que ela rola em sentido horario!
+#                    if (obj.rect.midtop > w.rect.bottom and
+#                        obj.rect.top < w.rect.top):
+#                        print "Pra esquerda!"
+                        # bateu embaixo, acelera pra esquerda
+#                        obj.rect.top = w.rect.bottom
+#                        obj.speed[0] -= 10
+#                    elif (obj.rect.midbottom > w.rect.top and
+#                          obj.rect.bottom < w.rect.bottom):
+#                        print "Pra direita!"
+                        # bateu em cima, acelera pra esquerda
+#                        obj.rect.bottom = w.rec.top
+#                        obj.speed[0] += 10
+
+                if isinstance(w, Target):
+                    pass 
 
     return new_objects
 
+
 class Game(object):
     fps = 30
     screen = None
     screenSize = None
+    playing = None
     run = None
     background = None
     clock = None
     level = 0
-    allLevels = []
+    levels = []
 
     def __init__(self):
         pygame.init()
@@ -57,32 +80,40 @@ class Game(object):
         self.screenSize = self.screen.get_size()
         pygame.display.flip()
         self.run = True
+        self.playing = False
         pygame.display.set_caption("Gambiarra")
         self.clock = pygame.time.Clock()
-        self.allLevels = Levels.init_levels()
+        self.levels = Levels.init_levels()
 
         #inicia o loop
         self.main_loop()
 
     def event_handler(self):
-        #verificar o evento e tomar as acoes
-        pass
+        for event in pygame.event.get():
+            if event.type == MOUSEBUTTONDOWN:
+                self.mouse_event( pygame.mouse.get_pos(), 
+                                  pygame.mouse.get_pressed() )
 
     def update_screen(self, fps):
         #update dos elementos da tela
-        objs = check_collision(self.allLevels[self.level].simulator.objects,
-                               self.allLevels[self.level].simulator._walls)
-        self.allLevels[self.level].simulator.objects = objs
-        for obj in self.allLevels[self.level].simulator.objects:
-            #obj eh um objeto na tela
-            if obj.mobility:
-                newpos = obj.rect.move((obj.speed[0],obj.speed[1]))
-                obj.rect = newpos
-                if obj.speed[0]:
-                    obj.speed[0] *= 0.9
-                else:
-                    obj.speed[0] = 20
-                obj.speed[1] += obj.gravity
+        if self.playing:
+            # executa a simulacao
+            objs = check_collision(self.levels[self.level].simulator.objects,
+                                self.levels[self.level].simulator.staticObjs)
+            self.levels[self.level].simulator.objects = objs
+            for obj in self.levels[self.level].simulator.objects:
+                #obj eh um objeto na tela
+                if obj.mobility:
+                    newpos = obj.rect.move((obj.speed[0],obj.speed[1]))
+                    obj.rect = newpos
+                    if obj.speed[0]:
+                        obj.speed[0] *= 0.9
+                    else:
+                        obj.speed[0] = 20
+                    obj.speed[1] += obj.gravity
+        else:
+            # movimenta elementos na tela
+            pass
 
     def start_window(self):
         #desenha a tela inicial (abstrato -chama os outros metodos predefinidos)
@@ -93,19 +124,39 @@ class Game(object):
         
     def mouse_event(self, mousePos, mouseButtonsPressed ):
         if mouseButtonsPressed[0]:
-            #verificar colisao com thing
-            #colidiu = verificar Colisao!!!
             collided = False
-            #Pegar o objeto
-            obj = None
-            mouseMove = python.mouse.get_rel() 
+            print "botao esquerdo pressionado"
+            for obj in self.levels[self.level].simulator.objects:
+                if obj.rect.collidepoint(mousePos):
+                    print "colidiu objeto"
+                    dragging = obj
+                    collided = True
+                    break
+            
+            mouseMove = pygame.mouse.get_rel()
+            flag = True
             if collided:
+                while flag:
+                    for evt in pygame.event.get():
+                        if evt.type == MOUSEBUTTONDOWN:
+                            button = pygame.mouse.get_pressed()
+                            if button[0]:
+                                print "continua clicando"
+                            if not button[0]:
+                                print "soltou"
+                                flag = False
+                                pygame.mouse.get_rel()
+                        else:
+                            print "evento diferente"
+                            flag = False
+                            pygame.mouse.get_rel()
+
+            
                 while mouseButtonsPressed[0]:
-                    pass
+                    print "arrastando o mouse"
                 
-                mouseMove = python.mouse.get_rel()
-                #comentado porque por enquanto obj eh None
-                #obj.rect = obj.rect.move(mouseMove)
+                mouseMove = pygame.mouse.get_rel()
+                obj.rect = obj.rect.move(mouseMove)
 
     def main_loop(self):
         #loop principal
@@ -114,19 +165,16 @@ class Game(object):
         #   -clique sobre um thing, arrasta
         #   -clique sobre um botao
         
-        #quando clicar em play transformar o botao em stop        
-        playPressed = True
-        if playPressed:
-            while self.run:
-                self.clock.tick(self.fps)
-                self.update_screen(self.fps)
-                self.allLevels[self.level].draw()
+        #quando clicar em play transformar o botao em stop
+        self.event_handler()        
+        while self.run:
+            self.event_handler()
+            self.clock.tick(self.fps)
+            self.update_screen(self.fps)
+            self.levels[self.level].draw()
             
-                pygame.display.flip()
-                for event in pygame.event.get():
-                    if event.type == MOUSEBUTTONDOWN:
-                        self.mouse_event( pygame.mouse.get_pos(), 
-                                          pygame.mouse.get_pressed() )
+            pygame.display.flip()
+
 
 def main():
     game = Game()
diff --git a/Gambiarra/gamemenu.py b/Gambiarra/gamemenu.py
index 32cf7e3..f79da8f 100644
--- a/Gambiarra/gamemenu.py
+++ b/Gambiarra/gamemenu.py
@@ -1,7 +1,19 @@
-# /gambiarra/gamemenu.py
+# gambiarra/gamemenu.py
 
 import pygame
 
+from os.path import abspath
+
 class GameMenu(object):
+    background = None
+    screen = None
+    logo = None
+    iniciar = None
+    
     def __init__(self):
-        pass
+        self.background = pygame.Surface((1200,900))
+        self.background.fill((255,0,255))
+        self.screen = pygame.display.get_surface()
+        self.logo = pygame.image.load(abspath("../data/images/penguin.png"))
+        # mudar o arquivo de logotipo
+        self.iniciar = pygame.image.load(abspath("../data/images/iniciar_normal.png"))
diff --git a/Gambiarra/levels/levels.py b/Gambiarra/levels.py
index 0c62e4a..4d44079 100644
--- a/Gambiarra/levels/levels.py
+++ b/Gambiarra/levels.py
@@ -1,4 +1,4 @@
-# /gambiarra/level.py
+# gambiarra/levels.py
 #arquivo que contem a lista de fases
 
 import pygame
@@ -6,6 +6,12 @@ from objects.balls import *
 from objects.animals import *
 from objects.wall import *
 from objects.esteira import *
+from objects.target import *
+from command import *
+
+def _is_static(obj):
+    if isinstance(obj, Target) or isinstance(obj, Esteira):
+        return True
 
 class SimulationView(object):
     """ This widget holds the objects being simulated. """
@@ -16,13 +22,20 @@ class SimulationView(object):
     def __init__(self, objects):
         self.running = False
         self.background = pygame.Surface((1200, 770))
-        self.background.fill([0,0,150])
-        self.objects = pygame.sprite.RenderPlain(objects)
-        self._walls = []
-        self._walls.append(LeftWall())
-        self._walls.append(RightWall())
-        self._walls.append(UpWall())
-        self._walls.append(DownWall())
+        self.background.fill([99,157,237])
+        self.objects = pygame.sprite.RenderPlain()
+        self.staticObjs = []
+
+        for obj in objects:
+            if _is_static(obj):
+                self.staticObjs.append(obj)
+            else:
+                obj.add(self.objects)
+
+        self.staticObjs.append(LeftWall())
+        self.staticObjs.append(RightWall())
+        self.staticObjs.append(UpWall())
+        self.staticObjs.append(DownWall())
 
     def draw(self, pos = None):
         screen = pygame.display.get_surface()
@@ -31,8 +44,8 @@ class SimulationView(object):
         else:
             screen.blit(self.background, (0, 0))
 
-        for wall in self._walls:
-            wall.draw(screen, wall.rect)
+        for obj in self.staticObjs:
+            obj.draw(screen, obj.rect)
 
         for item in self.objects:
             item.draw(screen, item.rect.topleft)
@@ -52,7 +65,7 @@ class ObjectBar(object):
         else:
             screen.blit(self.background, (0, 770))
 
-        objpos = [0, 785]
+        objpos = [15, 785]
         for item in self.objects:
             item.draw(screen, objpos)
             objpos[0] += item.image.get_width() + 15
@@ -67,14 +80,20 @@ class CommandBar(object):
         self.background = pygame.Surface((200, 130))
         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()    
+        screen = pygame.display.get_surface()
         if pos:
             screen.blit(self.background, (1000 + pos[0], 770 + pos[1]), pos)
         else:
             screen.blit(self.background, (1000, 770))
 
+        pos = [1015, 810]
+        for cmd in self.commands:
+            cmd.draw(screen, pos)
+            pos[0] += cmd.image.get_width() + 15
+
     def update(self):
         pass
 
@@ -97,8 +116,8 @@ class Level(object):
 def init_levels():
     #FIXME: fazer de um jeito menos lusitano
     #Sample levels
-    level1ObjInPlace = [ BowlingBall((200,300)), BeachBall((100,100))]
-    level1ObjToAdd = [ Penguin(), BeachBall() ]
+    level1ObjInPlace = [ BowlingBall((200,300)), BeachBall((300,0)), Esteira((300,500)), Target((1000,600))]
+    level1ObjToAdd = [ Penguin(), BeachBall(), BowlingBall(), Esteira() ]
 
     level2ObjInPlace = [ Penguin((300,600)), Esteira((20,650))]
     level2ObjToAdd = [ BeachBall(), Penguin(), BowlingBall() ]
diff --git a/Gambiarra/levels/__init__.py b/Gambiarra/levels/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/Gambiarra/levels/__init__.py
+++ /dev/null
diff --git a/Gambiarra/objects/animals.py b/Gambiarra/objects/animals.py
index 5dc5b1e..05a436a 100644
--- a/Gambiarra/objects/animals.py
+++ b/Gambiarra/objects/animals.py
@@ -1,19 +1,14 @@
-# /gambiarra/objects/animals.py
-
-# Peguin original art from:
-# http://www.flickr.com/photos/katmere/62037353/
-# Updated at November 10th, 2005.
-# Published under Creative Commons Attribution 2.0 Generic.
+# gambiarra/objects/animals.py
 
 import pygame
 
-from objects.things import Thing
+from things import Thing
 
 from os.path import abspath
 
 class Penguin(Thing):
     def __init__(self, initialPosition=None, editable=True):
         super(Penguin, self).__init__(
-              pygame.image.load(abspath("../data/penguin.png")),
+              pygame.image.load(abspath("../data/images/penguin.png")),
               editable, initialPosition, elasticity = 100, mobility = True,
               gravity = 1)
diff --git a/Gambiarra/objects/balls.py b/Gambiarra/objects/balls.py
index 5960c73..1f6628c 100644
--- a/Gambiarra/objects/balls.py
+++ b/Gambiarra/objects/balls.py
@@ -1,16 +1,16 @@
-# /gambiarra/objects/balls.py
+# gambiarra/objects/balls.py
 # este arquivo contem a bola basica, outras sao derivadas desta
 
 from os.path import abspath
 
 import pygame
 
-from objects.things import Thing
+from things import Thing
 
 class BowlingBall(Thing):
     def __init__(self, initialPosition=None, editable=True):
         super(BowlingBall, self).__init__(
-              pygame.image.load(abspath("../data/bolaBoliche.png")),
+              pygame.image.load(abspath("../data/images/bolaBoliche.png")),
               editable, initialPosition, elasticity = 100, mobility = True,
               gravity = 10)
         # TODO: substituir pela imagem correta
@@ -20,7 +20,7 @@ class BowlingBall(Thing):
 class BeachBall(Thing):
     def __init__(self, initialPosition=None, editable=True):
         super(BeachBall, self).__init__(
-              pygame.image.load(abspath("../data/bola.png")),
+              pygame.image.load(abspath("../data/images/bola.png")),
               editable, initialPosition, elasticity = 100, mobility = True,
               gravity = 10)
         # TODO: substituir pela imagem correta
diff --git a/Gambiarra/objects/esteira.py b/Gambiarra/objects/esteira.py
index ea4fb01..17d6509 100644
--- a/Gambiarra/objects/esteira.py
+++ b/Gambiarra/objects/esteira.py
@@ -1,14 +1,14 @@
-# /gambiarra/esteira.py
+# gambiarra/esteira.py
 
 from os.path import abspath
 
 import pygame
 
-from objects.things import Thing
+from things import Thing
 
 class Esteira(Thing):
     def __init__(self, initialPosition = [0,0], editable=False):
         super(Esteira, self).__init__(
-              pygame.image.load(abspath("../data/esteira.png")),
+              pygame.image.load(abspath("../data/images/esteira.png")),
               editable, initialPosition, elasticity = 100, mobility = False,
               gravity = 10)
\ No newline at end of file
diff --git a/Gambiarra/objects/target.py b/Gambiarra/objects/target.py
new file mode 100644
index 0000000..0791146
--- /dev/null
+++ b/Gambiarra/objects/target.py
@@ -0,0 +1,14 @@
+# gambiarra/target.py
+
+from os.path import abspath
+
+import pygame
+
+from things import Thing
+
+class Target(Thing):
+    def __init__(self, initialPosition = [0,0], editable=False):
+        super(Target, self).__init__(
+              pygame.image.load(abspath("../data/images/target.png")),
+              editable, initialPosition, elasticity = 100, mobility = False,
+              gravity = 10)
\ No newline at end of file
diff --git a/Gambiarra/objects/things.py b/Gambiarra/objects/things.py
index 66633ff..1f214d5 100644
--- a/Gambiarra/objects/things.py
+++ b/Gambiarra/objects/things.py
@@ -1,4 +1,4 @@
-# /gambiarra/objects/things.py
+# gambiarra/objects/things.py
 # classe mais abstrata para "coisas" na tela
 
 import pygame
diff --git a/Gambiarra/objects/wall.py b/Gambiarra/objects/wall.py
index b30fc46..6ef75ed 100644
--- a/Gambiarra/objects/wall.py
+++ b/Gambiarra/objects/wall.py
@@ -1,48 +1,36 @@
-# /gambiarra/objects/balls.py
+# gambiarra/objects/wall.py
 # este arquivo contem a bola basica, outras sao derivadas desta
 
 from os.path import abspath
 
 import pygame
 
-from objects.things import Thing
+from things import Thing
 
 class LeftWall(Thing):
     def __init__(self, initialPosition = [0,0], editable=False):
         super(LeftWall, self).__init__(
-              pygame.image.load(abspath("../data/leftwall.png")),
+              pygame.image.load(abspath("../data/images/leftwall.png")),
               editable, initialPosition, elasticity = 100, mobility = False,
               gravity = 10)
-        # TODO: substituir pela imagem correta
-        #self.img = pygame.Surface((170, 170))
-        #pygame.draw.circle(self.img, [0,10,0], (85, 85), 80)
         
 class RightWall(Thing):
     def __init__(self, initialPosition = [1185,0], editable=False):
         super(RightWall, self).__init__(
-              pygame.image.load(abspath("../data/rightwall.png")),
+              pygame.image.load(abspath("../data/images/rightwall.png")),
               editable, initialPosition, elasticity = 100, mobility = False,
               gravity = 10)
-        # TODO: substituir pela imagem correta
-        #self.img = pygame.Surface((170, 170))
-        #pygame.draw.circle(self.img, [0,10,0], (85, 85), 80)
 
 class UpWall(Thing):
     def __init__(self, initialPosition = [15,0], editable=False):
         super(UpWall, self).__init__(
-              pygame.image.load(abspath("../data/upwall.png")),
+              pygame.image.load(abspath("../data/images/upwall.png")),
               editable, initialPosition, elasticity = 100, mobility = False,
               gravity = 10)
-        # TODO: substituir pela imagem correta
-        #self.img = pygame.Surface((170, 170))
-        #pygame.draw.circle(self.img, [0,10,0], (85, 85), 80)
 
 class DownWall(Thing):
     def __init__(self, initialPosition = [15,755], editable=False):
         super(DownWall, self).__init__(
-              pygame.image.load(abspath("../data/downwall.png")),
+              pygame.image.load(abspath("../data/images/downwall.png")),
               editable, initialPosition, elasticity = 100, mobility = False,
               gravity = 10)
-        # TODO: substituir pela imagem correta
-        #self.img = pygame.Surface((170, 170))
-        #pygame.draw.circle(self.img, [0,10,0], (85, 85), 80)
diff --git a/GambiarraActivity.py b/GambiarraActivity.py
index 4a8b259..efaec3b 100644
--- a/GambiarraActivity.py
+++ b/GambiarraActivity.py
@@ -1,4 +1,4 @@
-# /GambiarraActivity.py
+# GambiarraActivity.py
 #Aqui vai o codigo de inicializacao da atividade
 
 import olpcgames
diff --git a/MANIFEST b/MANIFEST
index 3fb1171..3cd50ff 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -11,6 +11,8 @@ data/downwall.png
 data/leftwall.png
 data/rightwall.png
 data/upwall.png
+data/esteira.png
+data/target.png
 Gambiarra/__init__.py
 Gambiarra/gambiarra.py
 Gambiarra/levels/__init__.py
@@ -22,6 +24,7 @@ Gambiarra/objects/balls.py
 Gambiarra/objects/wall.py
 Gambiarra/objects/things.py
 Gambiarra/objects/esteira.py
+Gambiarra/objects/target.py
 olpcgames/activity.py
 olpcgames/camera.py
 olpcgames/canvas.py
diff --git a/activity/activity.info b/activity/activity.info
index 4bb6019..36a81e1 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,4 +4,4 @@ activity_version = 1
 host_version = 1
 service_name = org.laptop.Gambiarra
 icon = activity-gambiarra
-class = Gambiarra.activity.GambiarraActivity
\ No newline at end of file
+class = GambiarraActivity.GambiarraActivity
\ No newline at end of file
diff --git a/data/esteira.png b/data/esteira.png
deleted file mode 100755
index 3e587ad..0000000
--- a/data/esteira.png
+++ /dev/null
diff --git a/data/bola.png b/data/images/bola.png
index 9412552..9412552 100755
--- a/data/bola.png
+++ b/data/images/bola.png
diff --git a/data/bolaBoliche.png b/data/images/bolaBoliche.png
index 3cb862b..3cb862b 100755
--- a/data/bolaBoliche.png
+++ b/data/images/bolaBoliche.png
diff --git a/data/downwall.png b/data/images/downwall.png
index ffa7f99..ffa7f99 100755
--- a/data/downwall.png
+++ b/data/images/downwall.png
diff --git a/data/images/esteira.png b/data/images/esteira.png
new file mode 100755
index 0000000..315e1ea
--- /dev/null
+++ b/data/images/esteira.png
diff --git a/data/helpButton.png b/data/images/helpButton.png
index 3166eac..3166eac 100755
--- a/data/helpButton.png
+++ b/data/images/helpButton.png
diff --git a/data/images/iniciar_hover.png b/data/images/iniciar_hover.png
new file mode 100755
index 0000000..a6ed6cc
--- /dev/null
+++ b/data/images/iniciar_hover.png
diff --git a/data/images/iniciar_normal.png b/data/images/iniciar_normal.png
new file mode 100755
index 0000000..8d29753
--- /dev/null
+++ b/data/images/iniciar_normal.png
diff --git a/data/leftwall.png b/data/images/leftwall.png
index 78a220f..78a220f 100755
--- a/data/leftwall.png
+++ b/data/images/leftwall.png
diff --git a/data/images/nivel_hover.png b/data/images/nivel_hover.png
new file mode 100755
index 0000000..809bcf4
--- /dev/null
+++ b/data/images/nivel_hover.png
diff --git a/data/images/nivel_normal.png b/data/images/nivel_normal.png
new file mode 100755
index 0000000..31d3c1f
--- /dev/null
+++ b/data/images/nivel_normal.png
diff --git a/data/pen.png b/data/images/pen.png
index 287972d..287972d 100755
--- a/data/pen.png
+++ b/data/images/pen.png
diff --git a/data/penguin.png b/data/images/penguin.png
index 0b585f8..0b585f8 100755
--- a/data/penguin.png
+++ b/data/images/penguin.png
diff --git a/data/playButton.png b/data/images/playButton.png
index 7ab2f81..7ab2f81 100755
--- a/data/playButton.png
+++ b/data/images/playButton.png
diff --git a/data/quitButton.png b/data/images/quitButton.png
index 3e587ad..3e587ad 100755
--- a/data/quitButton.png
+++ b/data/images/quitButton.png
diff --git a/data/rightwall.png b/data/images/rightwall.png
index c9655c1..c9655c1 100755
--- a/data/rightwall.png
+++ b/data/images/rightwall.png
diff --git a/data/images/target.png b/data/images/target.png
new file mode 100755
index 0000000..cb97f97
--- /dev/null
+++ b/data/images/target.png
diff --git a/data/upwall.png b/data/images/upwall.png
index 52aa06e..52aa06e 100755
--- a/data/upwall.png
+++ b/data/images/upwall.png
diff --git a/data/snd/BowlingBall.wav b/data/snd/BowlingBall.wav
new file mode 100755
index 0000000..9e45def
--- /dev/null
+++ b/data/snd/BowlingBall.wav
diff --git a/setup.py b/setup.py
index e5d0545..4882f18 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
-# /setup.py
+# setup.py
 from sugar.activity import bundlebuilder
 bundlebuilder.start('Gambiarra')
\ No newline at end of file