add a2g2 button in menu and wheel code

3 files changed, 134 insertions, 2 deletions

diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index 44604c0..1e3ef7c 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -25,8 +25,12 @@ class CArea1Game4(CGameState):
         self.mBackground = Image.loadImage('assets/images/a1g4/a1game4.png', False)
         CGame().setBackground(self.mBackground)
         
+        self.mLabelDefinition = CMultiLabel()
+        self.mLabelDefinition.set_center((600, 150))
+        self.mLabelDefinition.set_size((600, 150))
+        CGame().addChild(self.mLabelDefinition)
+        
         self.mButtonBackA1G4 = CButton()
-
         self.mButtonBackA1G4.set_bgColor((0x99, 0x99, 0x66))
         self.mButtonBackA1G4.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonBackA1G4.set_center((110, 650))
@@ -34,6 +38,7 @@ class CArea1Game4(CGameState):
         self.mButtonBackA1G4.set_text(_('Volver'))
         CGame().addChild(self.mButtonBackA1G4)
         
+        
     def update(self):
 
         CGameState.update(self)
@@ -47,8 +52,9 @@ class CArea1Game4(CGameState):
         CGameState.destroy(self)
 
         CGame().removeChild(self.mButtonBackA1G4)
-
+        CGame().removeChild(self.mLabelDefinition)
         self.mButtonBackA1G4 = None
         self.mBackground = None
+        self.mLabelDefinition = None
 
         print "CArea1Game4 destroy"
diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index 40a96af..59025d1 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -1 +1,107 @@
 # -*- coding: utf-8 -*-
+
+import pygame
+import random
+import MenuState
+import api.Image as Image
+from api.Game import CGame
+from api.GameState import CGameState
+from api.Button import CButton
+from api.Sprite import CSprite
+from api.Label import CLabel
+from api.MultiLabel import CMultiLabel
+from api.Points import CPoints
+from gettext import gettext as _
+
+
+class CArea2Game2(CGameState):
+    
+    def __init__(self):
+        CGameState.__init__(self)
+        
+        self.time = 0
+        self.mWheelList = []
+        self.mCurrentWheel = 0
+        self.mCurrentState = 0
+        
+        self.mBackground = None
+        self.mButtonBackA2G2 = None
+        
+        self.mBackground = Image.loadImage('assets/images/a2g2/a2game2.png', False)
+        CGame().setBackground(self.mBackground)
+
+        
+        self.mButtonBackA2G2 = CButton()
+        self.mButtonBackA2G2.set_bgColor((0x99, 0x99, 0x66))
+        self.mButtonBackA2G2.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
+        self.mButtonBackA2G2.set_center((110, 650))
+        self.mButtonBackA2G2.set_size((200, 40))  
+        self.mButtonBackA2G2.set_text(_('Volver'))
+        CGame().addChild(self.mButtonBackA2G2)
+        
+        self.mWheel = CSprite()
+        self.mWheel.loadImage('assets/images/a2g2/rueda.png', False)
+        self.mWheel.setXY(407, 50)
+        CGame().addChild(self.mWheel)
+        
+        for i in range(8):
+            w = CSprite()
+            w.loadImage('assets/images/a2g2/rueda%s.png' % str(i), True)
+            w.setXY(407, 50)
+            self.mWheelList.append(w)
+                
+        CGame().addChild(self.mWheelList[0])
+        
+        self.mButtonStop = CButton()
+        self.mButtonStop.set_bgColor((0x99, 0x99, 0x66))
+        self.mButtonStop.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
+        self.mButtonStop.set_center((600, 475))
+        self.mButtonStop.set_size((200, 40))  
+        self.mButtonStop.set_text(_('Stop'))
+        CGame().addChild(self.mButtonStop)
+        
+    def update(self):
+
+        CGameState.update(self)
+        
+        self.time = self.time + 1
+
+        if self.mButtonBackA2G2.clicked():
+            ms = MenuState.CMenuState()
+            CGame().setState(ms)
+            return
+        
+        elif self.mButtonStop.clicked():
+            if self.mCurrentState == 0:
+                self.mCurrentState = 1
+            else:
+                self.mCurrentState = 0
+        
+        if self.mCurrentState == 0:
+        
+            if self.time > 5:
+                self.time = 0
+                CGame().removeChild(self.mWheelList[self.mCurrentWheel])
+                
+                self.mCurrentWheel = self.mCurrentWheel + 1
+                
+                if self.mCurrentWheel > 7:
+                    self.mCurrentWheel = 0
+                
+                CGame().addChild(self.mWheelList[self.mCurrentWheel])
+                
+        elif self.mCurrentState == 1:
+            pass
+            
+        
+    def destroy(self):
+        CGameState.destroy(self)
+
+        CGame().removeChild(self.mButtonBackA2G2)
+        CGame().removeChild(self.mButtonStop)
+        CGame().removeChild(self.mWheelList[self.mCurrentWheel])
+        CGame().removeChild(self.mWheel)
+        self.mButtonBackA2G2 = None
+        self.mBackground = None
+
+        print "CArea2Game2 destroy"
\ No newline at end of file
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index aa6fbb3..1e43d8d 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -30,6 +30,9 @@ from game.Area1Game4 import CArea1Game4
 import game.Area1Game6
 from game.Area1Game6 import CArea1Game6
 
+import game.Area2Game2
+from game.Area2Game2 import CArea2Game2
+
 from gettext import gettext as _
 
 class CMenuState(CGameState):
@@ -124,6 +127,14 @@ class CMenuState(CGameState):
         self.mButtonA1G6.set_text('A1 - Juego 6')
         CGame().addChild(self.mButtonA1G6)
         
+        self.mButtonA2G2 = CButton()
+        self.mButtonA2G2.bgColor = (0x99, 0x99, 0x66)
+        self.mButtonA2G2.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
+        self.mButtonA2G2.set_center((110, 620))
+        self.mButtonA2G2.set_size((200, 40))
+        self.mButtonA2G2.set_text('A2 - Juego 2')
+        CGame().addChild(self.mButtonA2G2)
+        
         self.mBackground = Image.loadImage('assets/images/back_menu.png', False)
         CGame().setBackground(self.mBackground)
         
@@ -186,6 +197,13 @@ class CMenuState(CGameState):
             CGame().setState(a1g6)
             return
         
+        elif self.mButtonA2G2.clicked():
+            print "clicked A2G2"
+            #cs = CHelpState()
+            a2g2 = CArea2Game2()
+            CGame().setState(a2g2)
+            return
+        
     #def render(self):
     #    CGameState.render(self)
     #    print "CMenuState render"
@@ -202,6 +220,7 @@ class CMenuState(CGameState):
         CGame().removeChild(self.mButtonA1G3)
         CGame().removeChild(self.mButtonA1G4)
         CGame().removeChild(self.mButtonA1G6)
+        CGame().removeChild(self.mButtonA2G2)
         #self.mButtonPlay.destroy()
         self.mButtonCredits = None
         self.mButtonPlay = None
@@ -211,6 +230,7 @@ class CMenuState(CGameState):
         self.mButtonA1G3 = None
         self.mButtonA1G4 = None
         self.mButtonA1G6 = None
+        self.mButtonA2G2 = None
         self.mBackground = None
         print "CMenuState destroy"