From 4f317bde4c39822c7db3a4f26b5e17419dcbd61d Mon Sep 17 00:00:00 2001 From: flavio Date: Sat, 07 Apr 2012 22:52:59 +0000 Subject: Correcciones --- diff --git a/FGR_T0101.py b/FGR_T0101.py index 6e30920..5e78043 100644 --- a/FGR_T0101.py +++ b/FGR_T0101.py @@ -103,7 +103,7 @@ class FGR_T0101(gtk.Widget): self.seniales.update() self.carteles.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.carteles.draw(self.ventana) self.seniales.draw(self.ventana) @@ -313,13 +313,14 @@ class FGR_T0101(gtk.Widget): self.estado = "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0102.py b/FGR_T0102.py index 2be82b7..f00fbb7 100644 --- a/FGR_T0102.py +++ b/FGR_T0102.py @@ -28,11 +28,9 @@ class FGR_T0102(gtk.Widget): self.ventana = None self.nombre = "Tipos de señales" self.estado = False - # Variables del Juego self.fondo = None self.reloj = None self.puntos = 0 - # Sprites self.textos = None self.botonesmenu = None @@ -40,12 +38,10 @@ class FGR_T0102(gtk.Widget): self.seniales = None self.carteles = None self.senial_select = None - # sonidos self.sonido_error = None self.sonido_exito = None self.sound_select = None - # Escalado self.ventana_real = None self.resolucionreal = None @@ -105,15 +101,13 @@ class FGR_T0102(gtk.Widget): self.seniales.update() self.carteles.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.carteles.draw(self.ventana) self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -134,12 +128,10 @@ class FGR_T0102(gtk.Widget): self.sonido_exito.play() self.senial_select.ubicada= True self.controles.recuadro_select.remove(self.controles) - random.seed() posicion= random.choice(cartel.posiciones) cartel.posiciones.remove(posicion) self.senial_select.rect.x, self.senial_select.rect.y= posicion - self.senial_select= None self.puntos+= 10 self.controles.actualiza_puntos() @@ -223,8 +215,10 @@ class FGR_T0102(gtk.Widget): # ----------- SETEOS ------------- def load(self): - pygame.event.set_blocked([JOYAXISMOTION, JOYBALLMOTION, JOYHATMOTION, JOYBUTTONUP, JOYBUTTONDOWN, KEYUP, USEREVENT]) - pygame.event.set_allowed([MOUSEMOTION, MOUSEBUTTONUP, MOUSEBUTTONDOWN, KEYDOWN, VIDEORESIZE, VIDEOEXPOSE, QUIT, ACTIVEEVENT]) + pygame.event.set_blocked([JOYAXISMOTION, JOYBALLMOTION, JOYHATMOTION, + JOYBUTTONUP, JOYBUTTONDOWN, KEYUP, USEREVENT]) + pygame.event.set_allowed([MOUSEMOTION, MOUSEBUTTONUP, MOUSEBUTTONDOWN, + KEYDOWN, VIDEORESIZE, VIDEOEXPOSE, QUIT, ACTIVEEVENT]) pygame.mouse.set_visible(True) A, B= G.RESOLUCION self.ventana = pygame.Surface( (A, B), flags=HWSURFACE ) @@ -308,13 +302,14 @@ class FGR_T0102(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): letra= pygame.key.nombre(event.key) if letra== "escape": pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0103.py b/FGR_T0103.py index 79fcd41..4535d64 100644 --- a/FGR_T0103.py +++ b/FGR_T0103.py @@ -98,7 +98,7 @@ class FGR_T0103(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -294,13 +294,14 @@ class FGR_T0103(gtk.Widget): self.estado = "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() @@ -409,13 +410,25 @@ class Seniales(pygame.sprite.OrderedUpdates): class Senial(JAMButton): def __init__(self, senial): JAMButton.__init__(self, '',None) - imagen2, self.nombre = senial + imagen2, self.nombre, categoria = senial imagen1 = os.path.join(G.IMAGENES, "FGR_T0103", "memory_logo.jpg") self.set_imagen(origen = imagen1, tamanio=(175, 175)) self.set_tamanios(tamanio = (175, 175), grosorbor=1, detalle=1, espesor=1) self.imagen1 = pygame.transform.scale(pygame.image.load(imagen1),(175, 175)) - self.imagen2 = pygame.transform.scale(pygame.image.load(imagen2),(175, 175)) + simbolo = pygame.transform.scale(pygame.image.load(imagen2),(120, 120)) + fondo = pygame.image.load(os.path.join(G.IMAGENES, "FGR_T0103", "fondo_blanco.jpg")) + fondo = pygame.transform.scale(fondo,(175, 175)) + texto = JAMLabel(categoria) + fuente, tamanio = JAMG.get_Font_fawn() + texto.set_font_from_file(fuente, tamanio = 35) + w,h = texto.get_tamanio() + texto = texto.image + fondo.blit(simbolo, (175/2-120/2, 5)) + fondo.blit(texto, (175/2-w/2, 175-(h+5))) + self.imagen2 = fondo + #self.imagen2 = JAMG.pegar_imagenes_centradas(texto, fondo) self.reset() + def reset(self): self.final_unselect = self.imagen1.copy() self.final_select = JAMG.get_my_surface_whit_border(self.imagen1.copy(), (255,255,255,255), 10) diff --git a/FGR_T0201.py b/FGR_T0201.py index ec5ebe4..ba3586c 100644 --- a/FGR_T0201.py +++ b/FGR_T0201.py @@ -105,15 +105,13 @@ class FGR_T0201(gtk.Widget): self.seniales.update() self.carteles.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.carteles.draw(self.ventana) self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -312,13 +310,14 @@ class FGR_T0201(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0202.py b/FGR_T0202.py index 44548a7..18a2de2 100644 --- a/FGR_T0202.py +++ b/FGR_T0202.py @@ -101,7 +101,7 @@ class FGR_T0202(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -265,13 +265,14 @@ class FGR_T0202(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0204.py b/FGR_T0204.py index 954dfab..bd65baf 100644 --- a/FGR_T0204.py +++ b/FGR_T0204.py @@ -101,7 +101,7 @@ class FGR_T0204(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -309,13 +309,14 @@ class FGR_T0204(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0301.py b/FGR_T0301.py index 10499df..550dec0 100644 --- a/FGR_T0301.py +++ b/FGR_T0301.py @@ -104,15 +104,13 @@ class FGR_T0301(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.carteles.draw(self.ventana) self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -278,13 +276,14 @@ class FGR_T0301(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0302.py b/FGR_T0302.py index 80a6949..48807ee 100644 --- a/FGR_T0302.py +++ b/FGR_T0302.py @@ -101,7 +101,7 @@ class FGR_T0302(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -267,13 +267,14 @@ class FGR_T0302(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0303.py b/FGR_T0303.py index 0bb03f0..5007f54 100644 --- a/FGR_T0303.py +++ b/FGR_T0303.py @@ -101,14 +101,12 @@ class FGR_T0303(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -271,13 +269,14 @@ class FGR_T0303(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0401.py b/FGR_T0401.py index 4420f90..af6d350 100644 --- a/FGR_T0401.py +++ b/FGR_T0401.py @@ -97,14 +97,12 @@ class FGR_T0401(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -267,13 +265,14 @@ class FGR_T0401(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0402.py b/FGR_T0402.py index 23fa290..3f47c1d 100644 --- a/FGR_T0402.py +++ b/FGR_T0402.py @@ -97,7 +97,7 @@ class FGR_T0402(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -269,13 +269,14 @@ class FGR_T0402(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0501.py b/FGR_T0501.py index fdff116..b9bd9de 100644 --- a/FGR_T0501.py +++ b/FGR_T0501.py @@ -97,14 +97,12 @@ class FGR_T0501(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0)) pygame.display.update() - #self.victory() - #self.game_over(None) def reset(self): self.puntos= 0 @@ -268,13 +266,14 @@ class FGR_T0501(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/FGR_T0502.py b/FGR_T0502.py index 9ea4b57..8cbdb1e 100644 --- a/FGR_T0502.py +++ b/FGR_T0502.py @@ -98,7 +98,7 @@ class FGR_T0502(gtk.Widget): self.controles.clear(self.ventana, self.fondo) self.seniales.update() self.controles.update() - self.handle_event_Game() + #self.handle_event_Game() pygame.event.clear() self.seniales.draw(self.ventana) self.controles.draw(self.ventana) @@ -292,13 +292,14 @@ class FGR_T0502(gtk.Widget): self.estado= "Intro"''' # ----------- EVENTOS en MENU --------------- + ''' # ----------- EVENTOS en JUEGO --------------- def handle_event_Game(self): for event in pygame.event.get(pygame.KEYDOWN): tecla= event.key if tecla== pygame.K_ESCAPE: pygame.event.clear() - return self.run_dialog_game(None) + return self.run_dialog_game(None)''' def run_dialog_game(self, button): self.controles.stop() diff --git a/Globals.py b/Globals.py index 6cd6511..4a57512 100644 --- a/Globals.py +++ b/Globals.py @@ -314,12 +314,12 @@ def get_Fondos_FGR_T0103(): return (fondo1, fondo2) def get_seniales_FGR_T0103(): - return [(os.path.join(IMAGENES, "Seniales2", "Circulacion Bicicletas.png"), "Circulacion Bicicletas"), - (os.path.join(IMAGENES, "Seniales2", "No Adelantar.png"), "No Adelantar"), - (os.path.join(IMAGENES, "Seniales2", "Hospital.png"), "Hospital"), - (os.path.join(IMAGENES, "Seniales2", "Pare.png"), "Pare"), - (os.path.join(IMAGENES, "Seniales2", "Sentido Obligacion.png"), "Sentido Obligacion"), - (os.path.join(IMAGENES, "Seniales2", "Paso a Nivel.png"), "Paso a Nivel")] + return [(os.path.join(IMAGENES, "Seniales2", "Circulacion Bicicletas.png"), "Circulacion Bicicletas", "Peligro"), + (os.path.join(IMAGENES, "Seniales2", "No Adelantar.png"), "No Adelantar", "Prohibición"), + (os.path.join(IMAGENES, "Seniales2", "Hospital.png"), "Hospital", "Información"), + (os.path.join(IMAGENES, "Seniales2", "Pare.png"), "Pare", "Prioridad"), + (os.path.join(IMAGENES, "Seniales2", "Sentido Obligacion.png"), "Sentido Obligacion", "Obligación"), + (os.path.join(IMAGENES, "Seniales2", "Paso a Nivel.png"), "Paso a Nivel", "Peligro")] # ------------- T0103 ------------- # ------------- T0201 ------------- diff --git a/activity/activity.info b/activity/activity.info index 7b9a27e..25c83e1 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Derecho_a_Transitar -activity_version = 1 +activity_version = 2 service_name = org.laptop.Derecho_a_Transitar icon = Juego show_launcher = yes -- cgit v0.9.1