[asadetris] 4 new revisions pushed by hugoruscitti on 2010-06-02 02:21 GMT

[codesite...@google.com]

4 new revisions:

Revision: 2cb38316cc
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Sun May 30 20:15:17 2010
Log: mostrando nombres en la lista de creditos en dos columnas.
http://code.google.com/p/asadetris/source/detail?r=2cb38316cc

Revision: 56591168f9
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 17:41:37 2010
Log: haciendo que las piezas bajen menos rapido
http://code.google.com/p/asadetris/source/detail?r=56591168f9

Revision: 0093b602c7
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 18:08:33 2010
Log: el juego ahora se puede poner en pausa con la tecla 'p'
http://code.google.com/p/asadetris/source/detail?r=0093b602c7

Revision: 66c059226b
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 19:21:38 2010
Log: se puede quitar la pausa del juego pulsando ESC.
http://code.google.com/p/asadetris/source/detail?r=66c059226b

==============================================================================
Revision: 2cb38316cc
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Sun May 30 20:15:17 2010
Log: mostrando nombres en la lista de creditos en dos columnas.
http://code.google.com/p/asadetris/source/detail?r=2cb38316cc

Modified:
/images/creditscene/background.png
/lib/credits_scene.py

=======================================
--- /images/creditscene/background.png Sun May 23 10:58:24 2010
+++ /images/creditscene/background.png Sun May 30 20:15:17 2010
Binary file, no diff available.
=======================================
--- /lib/credits_scene.py Sun May 23 10:58:24 2010
+++ /lib/credits_scene.py Sun May 30 20:15:17 2010
@@ -11,12 +11,14 @@
scene.Scene.__init__(self, director)

self.background, rect =
utils.load_images("creditscene/background.png")
- self.font = utils.load_font("FreeSans.ttf", 25)
-
- self.authors = ["Hugo Ruscitti", "Juanxo", "Dokan", "lacabra25", \
- "Juan Carlos", "thepoi", "joksnet", "Walter
Velazquez"]
-
- self.rendered_authors = self.render_authors()
+ self.font = utils.load_font("FreeSans.ttf", 20)
+
+ self.program = ["Hugo Ruscitti", "Juanxo", "Dokan", "lacabra25",
+ "Juan Carlos", "thepoi", "joksnet"]
+ self.art = ["Walter Velazquez"]
+
+ self.rendered_program = self.render_authors(self.program)
+ self.rendered_art = self.render_authors(self.art)


def on_update(self):
@@ -24,11 +26,15 @@

def on_draw(self, screen):
screen.blit(self.background, (0, 0))
- pos_y = 100
- for author in self.rendered_authors:
- pos_x = screen.get_width() / 2 - author.get_rect().width / 2
- screen.blit(author, (pos_x, pos_y))
- pos_y += author.get_rect().height + 5
+ self.render_names(screen, self.rendered_program, 60, 150)
+ self.render_names(screen, self.rendered_art, 400, 150)
+
+ def render_names(self, screen, names, x, y):
+ "Imprime una lista de imagenes (con nombres de personas) sobre
screen."
+
+ for author in names:
+ screen.blit(author, (x, y))
+ y += author.get_rect().height + 5

def on_event(self, event):
if event.type == pygame.QUIT:
@@ -38,9 +44,11 @@
scene = presents_scene.PresentsScene(self.director, 2)
self.director.change_scene(scene)

- def render_authors(self):
+ def render_authors(self, names):
rendered_authors = []
- for author in self.authors:
+
+ for author in names:
rendered_text = utils.render_text(author, self.font)[0]
rendered_authors.append(rendered_text)
+
return rendered_authors

==============================================================================
Revision: 56591168f9
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 17:41:37 2010
Log: haciendo que las piezas bajen menos rapido
http://code.google.com/p/asadetris/source/detail?r=56591168f9

Modified:
/lib/piece.py

=======================================
--- /lib/piece.py Sun May 30 19:43:53 2010
+++ /lib/piece.py Tue Jun 1 17:41:37 2010
@@ -167,7 +167,7 @@
def update(self):
self.timer += 1

- if self.timer > 40 - self.speed * 5:
+ if self.timer > 40 - self.speed * 4:
self.timer = 0
self.move(0, 1)


==============================================================================
Revision: 0093b602c7
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 18:08:33 2010
Log: el juego ahora se puede poner en pausa con la tecla 'p'
http://code.google.com/p/asadetris/source/detail?r=0093b602c7

Added:
/images/gamescene/pause.png
Modified:
/doc/etapas.otl
/lib/game_scene.py
/lib/game_scene_messages.py
/lib/menu.py

=======================================
--- /dev/null
+++ /images/gamescene/pause.png Tue Jun 1 18:08:33 2010
Binary file, no diff available.
=======================================
--- /doc/etapas.otl Sun May 23 17:41:16 2010
+++ /doc/etapas.otl Tue Jun 1 18:08:33 2010
@@ -19,6 +19,7 @@
☑ soporte para jugar con joystick.
☐ probar en otros sistemas operativos como windows.
☐ genera version ejecutable en formato .exe
+ ☑ que se pueda pausar el juego
☑ mejorar la escena de juego
☑ crear un mensaje al inicio que diga "listo, ya!!"
☑ mostrar un mensaje de game over con una imagen
=======================================
--- /lib/game_scene.py Sun May 23 17:41:16 2010
+++ /lib/game_scene.py Tue Jun 1 18:08:33 2010
@@ -70,8 +70,9 @@
if self.delay_showing_line_animation:
self.delay_showing_line_animation -= 1
else:
- self.board.update()
- self.pieces.update()
+ if self.running:
+ self.board.update()
+ self.pieces.update()

if self.graphic_message:
self.graphic_message.on_update()
@@ -107,6 +108,12 @@
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_ESCAPE:
self._return_to_main_menu()
+ elif event.key == pygame.K_p:
+ if self.running:
+ self.on_game_pause()
+ else:
+ self.graphic_message = None
+ self.running = True
else:
self.emit_on_key_down_event_to_pieces(event)
elif event.type == pygame.JOYBUTTONDOWN:
@@ -115,8 +122,9 @@
self.emit_joyhatmotion_event_to_pieces(event)

def emit_on_key_down_event_to_pieces(self, event):
- for piece in self.pieces.sprites():
- piece.on_key_down_event(event)
+ if self.running:
+ for piece in self.pieces.sprites():
+ piece.on_key_down_event(event)

def emit_joyhatmotion_event_to_pieces(self, event):
for piece in self.pieces.sprites():
@@ -145,7 +153,8 @@
self.display.on_line_complete()

# aumenta la velocidad del juego
- self.game_speed = (self.display.level * 2) * len(lines)
+ self.game_speed = (self.display.level * 2)
+ print self.game_speed
self.delay_showing_line_animation = DELAY_LINE_COMPLE_EFFECT

def pause(self):
@@ -164,3 +173,7 @@

def on_game_over(self):

self.show_graphic_message(game_scene_messages.GameOverMessage(self))
+
+ def on_game_pause(self):
+ self.running = False
+ self.show_graphic_message(game_scene_messages.PauseMessage(self))
=======================================
--- /lib/game_scene_messages.py Sun May 23 13:05:52 2010
+++ /lib/game_scene_messages.py Tue Jun 1 18:08:33 2010
@@ -81,8 +81,24 @@
def on_update(self):
GameSceneMessage.on_update(self)

+ def on_draw(self, screen):
+ self.rect.x = self.x
+ screen.blit(self.graphic_message, self.rect)


+class PauseMessage(GameSceneMessage):
+
+ def __init__(self, game):
+ GameSceneMessage.__init__(self, game)
+ self.graphic_message, self.rect =
utils.load_images('gamescene/pause.png')
+ self.x = - 100
+ self.rect.y = 200
+ self.tweener.addTween(self, x=200, tweenTime=0.3,
+ tweenType=pytweener.Easing.Elastic.easeOut)
+
+ def on_update(self):
+ GameSceneMessage.on_update(self)
+
def on_draw(self, screen):
self.rect.x = self.x
screen.blit(self.graphic_message, self.rect)
=======================================
--- /lib/menu.py Fri Jan 1 16:36:30 2010
+++ /lib/menu.py Tue Jun 1 18:08:33 2010
@@ -22,7 +22,7 @@
def set_position(self, index, inmediately=False):
to_y = self.start_y + index * self.item_height - 2
if not inmediately:
- self.tweener.addTween(self, y=to_y, tweenTime=1)
+ self.tweener.addTween(self, y=to_y, tweenTime=0.5)
else:
self.y = to_y


==============================================================================
Revision: 66c059226b
Author: Hugo Ruscitti <hugoru...@gmail.com>
Date: Tue Jun 1 19:21:38 2010
Log: se puede quitar la pausa del juego pulsando ESC.
http://code.google.com/p/asadetris/source/detail?r=66c059226b

Modified:
/lib/game_scene.py

=======================================
--- /lib/game_scene.py Tue Jun 1 18:08:33 2010
+++ /lib/game_scene.py Tue Jun 1 19:21:38 2010
@@ -107,7 +107,11 @@
self.director.quit()
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_ESCAPE:
- self._return_to_main_menu()
+ if self.running:
+ self._return_to_main_menu()
+ else:
+ self.graphic_message = None
+ self.running = True
elif event.key == pygame.K_p:
if self.running:
self.on_game_pause()