Login

1 files changed, 53 insertions, 76 deletions

diff --git a/FGR_T0301.py b/FGR_T0301.py
index 3d23368..b0de625 100644
--- a/FGR_T0301.py
+++ b/FGR_T0301.py
@@ -6,61 +6,63 @@
 #   https://sites.google.com/site/sugaractivities/
 #   http://codigosdeejemplo.blogspot.com/
 
-import pygame, gc, sys, random, gtk, pygtk
+import pygame
+import gc
+import gobject
+import sys
+import random
+import gtk
 from pygame.locals import *
-
 import Globals as G
 gc.enable()
-
 import BiblioJAM
 from BiblioJAM.JAMButton import JAMButton
 from BiblioJAM.JAMLabel import JAMLabel
 import BiblioJAM.JAMGlobals as JAMG
 
-class FGR_T0301():
-	def __init__(self, main):
-		# Variables para JAMatrix
-		self.ventana= None
-		self.name= "Seré Conductor"
-		self.estado= False
-
-		self.main= main
-		self.ventana= self.main.ventana
-
+class FGR_T0301(gtk.Widget):
+	__gsignals__ = {"run_grupo":(gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,gobject.TYPE_INT))}
+	def __init__(self):
+		gtk.Widget.__init__(self)
+		self.ventana = None
+		self.nombre = "Seré Conductor"
+		self.estado = False
 		# Variables del Juego
-		self.fondo= None
-		self.reloj= None
-		self.puntos= 0
+		self.fondo = None
+		self.reloj = None
+		self.puntos = 0
 
 		# Sprites
-		self.textos= None
-		self.botonesmenu= None
-		self.controles= None
-		self.seniales= None
-		self.carteles= None
-		self.senial_select= None
+		self.textos = None
+		self.botonesmenu = None
+		self.controles = None
+		self.seniales = None
+		self.carteles = None
+		self.senial_select = None
 
 		# sonidos
-		self.sonido_error= None
-		self.sonido_exito= None
-		self.sound_select= None
+		self.sonido_error = None
+		self.sonido_exito = None
+		self.sound_select = None
 
 		# Escalado
-		self.ventana_real= None
-		self.resolucionreal= None
-		self.VA= None
-		self.VH= None
+		self.ventana_real = None
+		self.resolucionreal = None
+		self.VA = None
+		self.VH = None
+		self.load()
+		self.estado = "Intro"
 
 	def run(self):
-		self.preset()
-
-		from BiblioJAM.JAMatrix import JAMatrix
-		matrix= JAMatrix(self, self.ventana_real, self.resolucionreal)
-		matrix.set_imagen_matrix(None)
-		matrix.carga_game()
-
-		self.estado= "Intro"
-		self.switch()
+		if self.estado== "Intro":
+			self.controles.stop()
+			self.fondo = self.fondo1
+			return self.run_menu()
+		elif self.estado== "Game":
+			self.puntos= 0
+			self.fondo = self.fondo2
+			self.reset()
+			return self.run_juego()
 
 	def run_menu(self):
 		self.ventana.blit(self.fondo, (0,0))
@@ -111,18 +113,6 @@ class FGR_T0301():
 			#self.victory()
 			#self.game_over(None)
 
-	def switch(self):
-		if self.estado== "Intro":
-			self.controles.stop()
-			self.fondo = self.fondo1
-			self.set_event_intro()
-			return self.run_menu()
-		elif self.estado== "Game":
-			self.puntos= 0
-			self.fondo = self.fondo2
-			self.reset()
-			return self.run_juego()
-
 	def reset(self):
 		self.puntos= 0
 		self.carteles.init()
@@ -211,7 +201,10 @@ class FGR_T0301():
 		return self.salir(False)
 
 	# ----------- SETEOS -------------
-	def preset(self):
+	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.mouse.set_visible(True)
 		A, B= G.RESOLUCION
 		self.ventana = pygame.Surface( (A, B), flags=HWSURFACE )
 		self.ventana_real= pygame.display.get_surface()
@@ -220,8 +213,6 @@ class FGR_T0301():
 		self.resolucionreal= (C,D)
 		self.VA= float(C)/float(A)
 		self.VH= float(D)/float(B)
-
-	def load(self):
 		self.fondo1, self.fondo2= G.get_Fondos_FGR_T0301()
 		self.textos= Textos_Intro()
 		self.botonesmenu= ButtonsMenu(self)
@@ -231,12 +222,6 @@ class FGR_T0301():
 		self.sonido_error, self.sonido_exito= G.get_Sonidos()
 		self.sound_select= JAMG.get_sound_select()
 		self.reloj = pygame.time.Clock()
-		self.estado= True
-
-	def set_event_intro(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.mouse.set_visible(True)
 
 	# ----------- EVENTOS en MENU ---------------
 	def handle_event_Intro(self):
@@ -339,7 +324,7 @@ class FGR_T0301():
 			dialog.clear(self.ventana, self.fondo)
 			self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
 			pygame.display.update()
-			return self.switch()
+			return self.run()
 		else:
 			dialog.clear(self.ventana, self.fondo)
 			self.ventana_real.blit(pygame.transform.scale(self.ventana, self.resolucionreal), (0,0))
@@ -353,12 +338,15 @@ class FGR_T0301():
 	# ----------- EVENTOS en JUEGO ---------------
 
 	def salir(self, valor= None):
+		'''
 		if valor: self.estado= True
 		if not valor: self.estado= False
 		pygame.mixer.music.unpause()
 		self.seniales.empty()
 		self.carteles.empty()
-		self.controles.empty()
+		self.controles.empty()'''
+		self.estado = False
+		self.emit("run_grupo", "grupo3", self.puntos)
 
 # -------- CONTROLES ----------
 class Controles(pygame.sprite.OrderedUpdates):
@@ -396,7 +384,7 @@ class Controles(pygame.sprite.OrderedUpdates):
 		cartel_titulo.rect.y= -60
 		self.add(cartel_titulo)
 
-		self.titulo= JAMLabel(self.main.name)
+		self.titulo= JAMLabel(self.main.nombre)
 		self.titulo.set_text(color=JAMG.get_blanco())
 		fuente, tamanio= JAMG.get_Font_fawn()
 		self.titulo.set_font_from_file(fuente, tamanio= 40)
@@ -434,7 +422,7 @@ class Controles(pygame.sprite.OrderedUpdates):
 
 	def switching_game(self, button):
 		self.main.estado= "Intro"
-		return self.main.switch()
+		return self.main.run()
 
 	def init(self):
 		sound= self.sonidos_reloj[0]
@@ -677,7 +665,7 @@ class Sprite_Imagen_Palabra(pygame.sprite.Sprite):
 		self.kill()
 
 class Palabra(pygame.sprite.OrderedUpdates):
-	def __init__(self, main, name):
+	def __init__(self, main, nombre):
 		pygame.sprite.OrderedUpdates.__init__(self)
 		self.ubicada= False
 
@@ -844,7 +832,7 @@ class ButtonsMenu(pygame.sprite.OrderedUpdates):
 	def switching(self, button):
 		self.main.estado= "Game"
 		pygame.event.clear()
-		return self.main.switch()
+		return self.main.run()
 # --------- Botones en Menu (Salir y Jugar) ------------------
 
 # --------- Mensaje Final ---------
@@ -950,15 +938,4 @@ class Mensaje(pygame.sprite.OrderedUpdates):
 			self.label2.rect.x= self.x_final_label2
 			self.label1.rect.x= self.x_final_label1
 			self.estado= False
-# --------- Mensaje Final ---------
-
-class Main():
-	def __init__(self):
-		pygame.init()
-		pygame.display.set_mode(G.RESOLUCION , 0, 0)
-		self.ventana= pygame.display.get_surface()
-		FGR_T0301(self)
-
-if __name__ == "__main__":
-	Main()