change behavior on a1g1

1 files changed, 23 insertions, 7 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 25b9d8d..c49b50f 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -16,10 +16,11 @@ import MenuState
 from gettext import gettext as _
 
 STATE_STALE = 0
-STATE_DRAG = 1
-STATE_ADJUST = 2
-STATE_RETURN = 3
-STATE_OK = 4
+STATE_STALE_UP = 1
+STATE_DRAG = 2
+STATE_ADJUST = 3
+STATE_RETURN = 4
+STATE_OK = 5
 
 
 class Piece(CSprite):
@@ -51,6 +52,14 @@ class Piece(CSprite):
         if (self.mState == STATE_STALE):
             if self.mouseDown() and (self.mParent.mActivePiece == None):
                 self.mParent.mActivePiece = self.mNum
+                #p = self.mParent.mListPieces[self.mNum]
+                #CGame().removeChild(p)
+                #CGame().addChild(p)
+                self.setState(STATE_STALE_UP)
+        
+        elif (self.mState == STATE_STALE_UP):
+            if self.mouseDown(): # and (self.mParent.mActivePiece == None):
+                self.mParent.mActivePiece = self.mNum
                 p = self.mParent.mListPieces[self.mNum]
                 CGame().removeChild(p)
                 CGame().addChild(p)
@@ -92,9 +101,15 @@ class Piece(CSprite):
             self.setPosition(self.mOrigin)
             #self.setXY(100, 200)
             self.mVel = CVector(0.0, 0.0)
+        if (aState == STATE_STALE_UP):
+            #o = CVector(self.mOrigin.getX(), self.mOrigin.getY())
+            #self.setPosition(self.mOrigin)
+            CGame().addChild(self.mParent.mListOptions[self.mNum])
+            self.setXY(600, 500)
+            self.mVel = CVector(0.0, 0.0)    
         if (aState == STATE_DRAG):
             self.mVel = CVector(0.0, 0.0)
-            CGame().addChild(self.mParent.mListOptions[self.mNum])
+            #CGame().addChild(self.mParent.mListOptions[self.mNum])
         if (aState == STATE_ADJUST):
             self.setVelXY((self.mDest.getX() - self.mPos.getX()) / self.TIME_ADJUST, 
             (self.mDest.getY() - self.mPos.getY()) / self.TIME_ADJUST)
@@ -140,7 +155,6 @@ class CArea1Game1(CGameState):
         self.mBox.loadImage('assets/images/a1g1/A1G1-caja.png', True)
         CGame().addChild(self.mBox)
         
-
         
         self.mButtonBackA1G1 = CButton()
         self.mButtonBackA1G1.set_bgColor((0x99, 0x99, 0x66))
@@ -199,7 +213,7 @@ class CArea1Game1(CGameState):
             op.bgColor = (0x99, 0x99, 0x66)
             op.fgColor = (0xFF, 0xFF, 0xFF)
             op.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-            op.set_center((600, 450))
+            op.set_center((600, 400))
             op.set_size((200, 40))
             op.set_text(unicode(name, 'UTF-8'))
             self.mListOptions.append(op)
@@ -234,6 +248,8 @@ class CArea1Game1(CGameState):
         
         for p in self.mListPieces:
             CGame().removeChild(p)
+        for o in self.mListOptions:
+            CGame().removeChild(o)
 
         #self.mButtonPlay.destroy()
         self.mButtonBack = None