some cleans

11 files changed, 67 insertions, 161 deletions

diff --git a/src/Main.py b/src/Main.py
index 87062e1..7ec27b5 100755
--- a/src/Main.py
+++ b/src/Main.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-

 

 from api.Game import CGame

-#import game.MenuState

 import game.PresentationState

 

 class EdSexualGame():

@@ -13,7 +12,6 @@ class EdSexualGame():
         

         g = CGame()

 

-        #ms = game.MenuState.CMenuState()

         ms = game.PresentationState.CPresentationState()

         g.setState(ms)

         

diff --git a/src/api/Anim.py b/src/api/Anim.py
index 2310f5e..57ff917 100644
--- a/src/api/Anim.py
+++ b/src/api/Anim.py
@@ -1,25 +1,7 @@
 # -*- coding: utf-8 -*-
 
-
 class CAnim(object):
 
-    mNumFrames = 0
-    mDelay = 0
-    mCurrentFrame = 0
-    mTimeFrame = 0
-    mIsLoop = False
-    
-    # Flag to indicate it the animation has ended.
-    mEnded = False
-
-    # Indicates if frame has changed since the previous update().
-    mFrameHasChanged = False
-
-    # Used to calculate if the previous frame is the same as the current frame.
-    mPreviousFrame = 0
-    
-    mMinFrame = 0
-
     def __init__(self, aNumFrames, aDelay, aIsLoop = False):
         self.init(aNumFrames, aDelay, aIsLoop);
        
@@ -65,4 +47,4 @@ class CAnim(object):
         return self.mEnded
     
     def frameHasChanged(self):
-        return self.mFrameHasChanged
\ No newline at end of file
+        return self.mFrameHasChanged
diff --git a/src/api/Game.py b/src/api/Game.py
index 7aa7ce2..218e5f6 100644
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -3,9 +3,9 @@
 import gc

 import gtk

 import pygame

-import pygame.font

-import pygame.display

-import pygame.sprite

+#import pygame.font

+#import pygame.display

+#import pygame.sprite

 from api.Sprite2 import CSprite

 from api.Mouse import CMouse

 from PartidasMan import getPartidasFromFile

@@ -18,17 +18,6 @@ import Image
 class CGame(object):

        

     mInstance = None

-    mState = None

-    mScreen = None

-    mBackground = None

-    mAllSprites = None

-    mMousePointerSprite = None

-    mMouse = None

-    mGroups = None

-    mMainSprites = None

-    mClock = None

-    mQuit = False

-    mPartidaDict = {}

     

     def __new__(self, *args, **kargs):

         if (self.mInstance is None):

@@ -75,11 +64,12 @@ class CGame(object):
         pygame.init()

         #pygame.display.init()

         #pygame.font.init()

-        #screen = pygame.display.set_mode((1200, 900), FULLSCREEN)

+        self.mState = None

+    

         self.mScreen = pygame.display.get_surface()

         if not(self.mScreen):

             self.mScreen = pygame.display.set_mode((1200, 900))

-        pygame.display.set_caption(_('Game'))

+            pygame.display.set_caption(_('Game'))

         

         self.mBackground = pygame.Surface(self.mScreen.get_size())

         self.mBackground.fill((255, 0, 0))

@@ -88,13 +78,13 @@ class CGame(object):
         #pygame.mixer.init()

         

         #self.mAllSprites = pygame.sprite.Group()

-        Sprites = []

-        self.mAllSprites = pygame.sprite.LayeredUpdates(Sprites)

+        self.mAllSprites = pygame.sprite.LayeredUpdates()

         

         pygame.mouse.set_visible(False)

         self.mMouse = CMouse()

         self.mMousePointerSprite = CSprite()

         self.mMousePointerSprite.setImage(Image.loadImage('assets/images/cursor.png', True))

+        #insert mouse pointer at layer 5

         self.addChild(self.mMousePointerSprite, 5)

         

         self.mScreen.blit(self.mBackground, (0, 0))

@@ -120,21 +110,13 @@ class CGame(object):
         

             self.mMouse.update()

             self.mMousePointerSprite.setXY(self.mMouse.getX(), self.mMouse.getY())

-        

-            #self.mState.preUpdate()

+

             self.mState.update()

             

             self.mAllSprites.clear(self.mScreen, self.mBackground)

             self.mAllSprites.update()

             self.mAllSprites.draw(self.mScreen)

             

-            #for group in self.mAllSprites:

-            #    group.clear(self.mScreen, self.mBackground)

-            #    group.update()

-            #    group.draw(self.mScreen)

-            

-            #self.mState.postUpdate()

-            

             pygame.display.flip()

             self.mClock.tick(30)

             #print ("FPS: %.0f" % self.mClock.get_fps())

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 4644817..23ed8a0 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -323,6 +323,3 @@ class CArea1Game1(CGameState):
         CGame().removeChild(self.mAlpha)
         CGame().removeChild(self.mDialog)
         CGame().removeChild(self.mButtonAccept)
-        
-    def doEvents(self, aEvent):
-        print aEvent.type
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index 3f11d7e..cb5da47 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -79,7 +79,7 @@ class Piece(CSprite):
                 if (d < self.MIN_DISTANCE):
                     self.setState(STATE_ADJUST)
                 else:
-                    print 'set return'
+                    #print 'set return'
                     self.setState(STATE_RETURN)
                 self.mParent.mActivePiece = None
 
@@ -108,15 +108,16 @@ class Piece(CSprite):
         if (aState == STATE_STALE):
             o = CVector(self.mOrigin.getX(), self.mOrigin.getY())
             self.setPosition(o)
-            #self.setXY(100, 200)
             self.mVel = CVector(0.0, 0.0)
+        
         if (aState == STATE_DRAG):
             self.mVel = CVector(0.0, 0.0)
+        
         if (aState == STATE_ADJUST):
             self.setVelXY((self.mDest.getX() - self.mPos.getX()) / self.TIME_ADJUST, 
             (self.mDest.getY() - self.mPos.getY()) / self.TIME_ADJUST)
+        
         if (aState == STATE_RETURN):
-            
             vec = CVector(self.mOrigin.getX() - self.mPos.getX(), self.mOrigin.getY() - self.mPos.getY())
             vec.normalize()
             dist = CMath.dist(self.mOrigin.getX(), self.mOrigin.getY(), self.mPos.getX(), self.mPos.getY())
@@ -132,9 +133,8 @@ class Piece(CSprite):
 
     def getState(self):
         return self.mState
-    
-    
-    
+
+
 class CArea1Game6(CGameState):
 
     def __init__(self):
diff --git a/src/game/BoyHall.py b/src/game/BoyHall.py
index 5c178af..917dcaa 100644
--- a/src/game/BoyHall.py
+++ b/src/game/BoyHall.py
@@ -8,54 +8,40 @@ from api.Mouse import CMouse
 from api.Vector import CVector
 import api.Math as Math
 
+STATE_STALE = 0
+STATE_WALKING = 1
+STATE_TALKING = 2
 
 
 class CBoyHall(CSprite):
-
-    mState = None
-    mParent = None
-    MIN_DISTANCE = 40
-
-    TIME_RETURN = 15
-    TIME_ADJUST = 8
-
-    RADIUS_COLLISION = 40
-    
-    NUM_FRAMES_WALKING = 3
-    #a 30 fps
-    DELAY_FRAMES_WALKING = 5
-    
-    mAnim = None
-
-    STATE_STALE = 0
-    STATE_WALKING = 1
-    STATE_TALKING = 2
-        
-    
-    # Canvas size: 299x600.
-    
-    # Define registration point.
-    OFFSET_X = 150  
-    OFFSET_Y = 300
-    
-    STEP1 = None
-    STEP2 = None
-    STEP3 = None
-    STEP4 = None
-    STEP5 = None
-    STEP6 = None
-    
-    # Destination point of walking.
-    mDestX = 0
-    mDestY = 0
-    
-    mLastSense = 1
     
     mTimeState = 0
+    mAnim = None
+    mState = None
     
     def __init__(self, aCharacter='Juan'):
-        CSprite.__init__(self) 
+        CSprite.__init__(self)
         self.mCharacter = aCharacter
+                
+        self.mState = None
+        self.mParent = None
+        self.MIN_DISTANCE = 40
+    
+        self.TIME_RETURN = 15
+        self.TIME_ADJUST = 8
+    
+        self.RADIUS_COLLISION = 40
+        
+        self.NUM_FRAMES_WALKING = 3
+        #a 30 fps
+        self.DELAY_FRAMES_WALKING = 5
+
+        # Canvas size: 299x600
+        self.OFFSET_X = 150  
+        self.OFFSET_Y = 300
+       
+        self.mLastSense = 1
+        self.mTimeState = 0
         
         if self.mCharacter == 'Juan':
             self.STEP1 = Image.loadImage('assets/images/hall/Juan-chico-costado-izq.png')
@@ -85,19 +71,17 @@ class CBoyHall(CSprite):
         
         self.setRegistrationPointOffset(self.OFFSET_X, self.OFFSET_Y)
         self.setXY(200, 500)
-        #self.setMaxVel(100, 100)
-        
+                
         self.mDestX = 0
         self.mDestY = 500
         
-        self.setState(self.STATE_STALE)
+        self.setState(STATE_STALE)
         
     def set_parent(self, aParent):
         self.mParent = aParent
-        #image = ....
+
     def set_origin(self, aOrigin):
         self.mOrigin = aOrigin
-        #self.mPos = 
         self.setXY(aOrigin.getX(), aOrigin.getY())
 
     def set_destine(self, aDestine):
@@ -117,49 +101,40 @@ class CBoyHall(CSprite):
         if self.mAnim:
             self.mAnim.update()
         
-        if (self.mState == self.STATE_WALKING):
+        if (self.mState == STATE_WALKING):
             # Check if arrives to destination point.
             if (Math.dist(self.getX(), self.getY(), self.mDestX, self.mDestY) < 5):
                 self.setXY(self.mDestX, self.mDestY)
-                self.setState(self.STATE_STALE)
+                self.setState(STATE_STALE)
                 return
 
             # If a click is made, change the destination point.            
             if CMouse().firstPress():
-                self.setState(self.STATE_WALKING)
+                self.setState(STATE_WALKING)
                 return
             
             if (self.mAnim.frameHasChanged()):
                 self.setImage(self.mFrameImage[self.mAnim.getCurrentFrame()])          
 
-        elif (self.mState == self.STATE_STALE):
+        elif (self.mState == STATE_STALE):
             if CMouse().firstPress():
-                self.setState(self.STATE_WALKING)
+                self.setState(STATE_WALKING)
                 return
 
     def setState(self, aState):
-
         self.setTimeState(0)
-
-        if (aState == self.STATE_STALE):
-            
+        if (aState == STATE_STALE):
             self.setVelXY(0, 0)
             if self.mLastSense == 0:
                 self.setImage(self.mFrameImage[4])
             else:
                 self.setImage(self.mFrameImage[1])
             self.mAnim.init(1, self.DELAY_FRAMES_WALKING, False)
-            #print 'set stale'
                     
-        elif (aState == self.STATE_WALKING):
-            
+        elif (aState == STATE_WALKING):
             x = int(CMouse().getX())
-            #y = int(CMouse().getY())
-            
             self.mDestX = x
-            #self.mDestY = y
             x = self.mDestX - self.getX()
-            #y = self.mDestY - self.getY()
             vec = CVector(x, 0)
             vec.normalize()
             vec.mul(5)
@@ -172,8 +147,8 @@ class CBoyHall(CSprite):
                 self.setImage(self.mFrameImage[0])
                 self.mAnim.init(3, self.DELAY_FRAMES_WALKING, True, 0)
                 self.mLastSense = 1
-            #print 'set walk'
         self.mState = aState
 
     def getState(self):
-        return self.mState 
\ No newline at end of file
+        return self.mState
+    
\ No newline at end of file
diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py
index ac52cd2..758fa9d 100644
--- a/src/game/CreditsState.py
+++ b/src/game/CreditsState.py
@@ -12,12 +12,7 @@ from assets.data import credits_data
 
 
 class CCreditsState(CGameState):
-
-    mBackground = None    
-    mInstructions = None
-    #mX = 10
-    mButtonBack = None
-        
+    
     def init(self):
         CGameState.init(self)
         
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index da70651..4980db5 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -14,8 +14,7 @@ OVER_COLOR = (255, 0, 0)
 NORMAL_COLOR = (255, 125, 50)
 
 class CMenuState(CGameState):
-   
-        
+    
     def init(self):
         CGameState.__init__(self)
         
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index 23772a3..5f0a15b 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -9,13 +9,12 @@ from api.Mouse import CMouse
 
 class CPresentationState(CGameState):
     
-    mBackground = None
-    mCount = 0
-        
     def init(self):
         CGameState.__init__(self)
         self.mactive = False
         
+        self.mCount = 0
+        
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
         
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index e8a95ee..b92efe7 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -13,32 +13,16 @@ from HallState import CHallState
 
 from assets.data import selectArea_data
 
+AREA1_POLYGON = [(70, 233), (344, 208), (505, 246), (505, 400), (212, 536), (70, 440)]
+AREA2_POLYGON = [(558, 379), (1113, 665), (342, 834), (124, 579)]
+AREA3_POLYGON = [(838, 155), (1034, 143), (1150, 240), (1133, 397), (927, 436), (749, 372), (746, 222)]
 
-class CSelectAreaState(CGameState):
 
-    mBackground = None    
-    mInstructions = None
-    #mX = 10
-    mButtonBack = None
-    
-    #mCurrentSelectedArea = 0
-    
-    mArea1 = None
-    mArea2 = None
-    mArea3 = None
-    
-    mFrameImageArea1 = None
-    mFrameImageArea2 = None
-    mFrameImageArea3 = None
-    
-    AREA1_POLYGON = [(70, 233), (344, 208), (505, 246), (505, 400), (212, 536), (70, 440)]
-    AREA2_POLYGON = [(558, 379), (1113, 665), (342, 834), (124, 579)]
-    AREA3_POLYGON = [(838, 155), (1034, 143), (1150, 240), (1133, 397), (927, 436), (749, 372), (746, 222)]
+class CSelectAreaState(CGameState):
     
-        
     def init(self):
         CGameState.init(self)
-        
+       
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
         
@@ -103,9 +87,8 @@ class CSelectAreaState(CGameState):
         self.mLabelA3.set_size((280, 80))
         self.mLabelA3.set_text(self.mAreas_list[2])
 
-
     def update(self):
-        #print "menu update"
+
         CGameState.update(self)
        
         if self.mButtonBack.mouseOver():
@@ -129,7 +112,7 @@ class CSelectAreaState(CGameState):
         x = CMouse().getX()
         y = CMouse().getY()
 
-        if (CMath.pointInsidePolygon(x,y,self.AREA1_POLYGON)):
+        if (CMath.pointInsidePolygon(x, y, AREA1_POLYGON)):
             if not(self.mArea1Is):
                 CGame().addChild(self.mArea1)
                 CGame().addChild(self.mLabelA1)
@@ -145,7 +128,7 @@ class CSelectAreaState(CGameState):
                 CGame().removeChild(self.mLabelA1)
                 self.mArea1Is = False
 
-        if (CMath.pointInsidePolygon(x,y,self.AREA2_POLYGON)):
+        if (CMath.pointInsidePolygon(x, y, AREA2_POLYGON)):
             if not(self.mArea2Is):
                 CGame().addChild(self.mArea2)
                 CGame().addChild(self.mLabelA2)
@@ -160,7 +143,7 @@ class CSelectAreaState(CGameState):
                 CGame().removeChild(self.mLabelA2)
                 self.mArea2Is = False
 
-        if (CMath.pointInsidePolygon(x,y,self.AREA3_POLYGON)):
+        if (CMath.pointInsidePolygon(x, y, AREA3_POLYGON)):
             if not(self.mArea3Is):
                 CGame().addChild(self.mArea3)
                 CGame().addChild(self.mLabelA3)
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index daee4e2..4507bd9 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -12,8 +12,6 @@ from gettext import gettext as _
 
 
 class CSelectCharacterState(CGameState):
-    
-    mBackground = None
 
     def init(self):
         CGameState.__init__(self)
@@ -60,7 +58,6 @@ class CSelectCharacterState(CGameState):
         CGameState.update(self)
 
         if self.mJuan.clicked():
-            #print "clicked Juan"
             par = CGame().getCurrentPartida()
             CGame().setCharacter(par, 'Juan')
             ms = CSelectAreaState()
@@ -68,7 +65,6 @@ class CSelectCharacterState(CGameState):
             return
         
         elif self.mElisa.clicked():
-            #print "clicked Elisa"
             par = CGame().getCurrentPartida()
             CGame().setCharacter(par, 'Elisa')
             ms = CSelectAreaState()