fix a2g2: now can show all questions

1 files changed, 45 insertions, 13 deletions

diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index 91d3f31..fe52c2c 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -26,8 +26,10 @@ class CArea2Game2(CGameState):
         
         self.time = 0
         self.mWheelList = []
+        self.mWheelUsed = []
         self.mCurrentWheel = 0
         self.mCurrentState = 0
+        self.mMaxWheels = 8
         self.mBad = 0
         self.mGood = 0
         self.mQuestionShowed = False
@@ -58,6 +60,7 @@ class CArea2Game2(CGameState):
             w.loadImage('assets/images/a2g2/rueda%s.png' % str(i), True)
             w.setXY(407, 50)
             self.mWheelList.append(w)
+            self.mWheelUsed.append(w)
                 
         CGame().addChild(self.mWheelList[0])
         
@@ -94,11 +97,11 @@ class CArea2Game2(CGameState):
         self.mPoints.setXY(200, 10)
         CGame().addChild(self.mPoints)
         
+        self.flag = False
+        
     def update(self):
 
         CGameState.update(self)
-        
-        self.time = self.time + 1
 
         if self.mButtonBackA2G2.clicked():
             ms = MenuState.CMenuState()
@@ -106,22 +109,36 @@ class CArea2Game2(CGameState):
             return
         
         if self.mCurrentState == 0:
+            self.time = self.time + 1
             
             if self.time > 5:
                 self.time = 0
-                CGame().removeChild(self.mWheelList[self.mCurrentWheel])
+
+                if not self.flag:
+                    CGame().removeChild(self.mWheelList[self.mCurrentWheel])
+                else:
+                    self.flag = False
                 
                 self.mCurrentWheel = self.mCurrentWheel + 1
                 
-                if self.mCurrentWheel > 7:
+                if self.mCurrentWheel > self.mMaxWheels - 1:
                     self.mCurrentWheel = 0
+                    
+                if len(self.mWheelList) > 0:
+                    CGame().addChild(self.mWheelList[self.mCurrentWheel])
                 
-                CGame().addChild(self.mWheelList[self.mCurrentWheel])
-           
-            if self.mButtonStop.clicked():
+                if self.mMaxWheels == 1:
+                    self.mCurrentState = 1
+            
+                elif self.mMaxWheels == 0:
+                    self.mCurrentState = 3
+                    
+          
+            elif self.mButtonStop.clicked():
                 self.mCurrentState = 1
                 
         elif self.mCurrentState == 1:
+            
             if self.mQuestionShowed == False:
                 self.mTupleQuestion = area2game2_data.ITEMS[self.mCurrentWheel]
                 self.mLabelQuestion.set_text(self.mTupleQuestion[0])
@@ -159,23 +176,38 @@ class CArea2Game2(CGameState):
                     self.time = 0
                     
             elif self.mQuestionAnswered == True:
-                #self.time = self.mActiveDialog.getTimeState()
-                #if self.time > 4*30:
-                CGame().addChild(self.mButtonStop)
+                #if self.time > 10:
+                self.mWheelList.remove(self.mWheelList[self.mCurrentWheel])
+                self.mMaxWheels = self.mMaxWheels - 1
+                self.flag = True
+                
+                if self.mMaxWheels > 0:
+                    CGame().addChild(self.mButtonStop)
                 self.mQuestionShowed = False
-                self.mQuestionAnswered = False
                 self.time = 0
                 self.mCurrentState = 0
-                
+                self.mQuestionAnswered = False
+        
+        elif self.mCurrentState == 3:
+            pass        
         
     def destroy(self):
         CGameState.destroy(self)
 
         CGame().removeChild(self.mButtonBackA2G2)
         CGame().removeChild(self.mButtonStop)
-        CGame().removeChild(self.mWheelList[self.mCurrentWheel])
+        for i in range(8):
+            CGame().removeChild(self.mWheelUsed[i])
+            self.mWheelUsed[i] = None
         CGame().removeChild(self.mWheel)
+        CGame().removeChild(self.mPoints)
+        CGame().removeChild(self.mLabelQuestion)
+        CGame().removeChild(self.mButtonTrue)
+        CGame().removeChild(self.mButtonFalse)
         self.mButtonBackA2G2 = None
         self.mBackground = None
+        self.mPoints = None
+        self.mButtonTrue = None
+        self.mButtonFalse = None
 
         print "CArea2Game2 destroy"
\ No newline at end of file