diff options
author | Alan Aguiar <alanjas@hotmail.com> | 2013-09-18 05:11:40 (GMT) |
---|---|---|
committer | Alan Aguiar <alanjas@hotmail.com> | 2013-09-18 05:11:40 (GMT) |
commit | c6d23ff175e607af00c57649e8b082aa81dd010d (patch) | |
tree | 9b31604401db1ffc9ccb1cb95f23dce1b6af09ab | |
parent | 2518a47a9830cb757f7bde1b7fd54d5388977c0d (diff) |
update pos of pieces in a161
-rw-r--r-- | .settings/org.eclipse.core.resources.prefs | 1 | ||||
-rw-r--r-- | src/api/Sprite2.py | 5 | ||||
-rw-r--r-- | src/game/Area1Game1.py | 21 |
3 files changed, 17 insertions, 10 deletions
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index c0323bd..f890111 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +encoding//EdSexual.activity/activity.py=utf-8 encoding//src/Main.py=utf-8 encoding//src/api/Button.py=utf-8 encoding//src/api/Game.py=utf-8 diff --git a/src/api/Sprite2.py b/src/api/Sprite2.py index ea35cfb..24f2ff1 100644 --- a/src/api/Sprite2.py +++ b/src/api/Sprite2.py @@ -14,11 +14,6 @@ class CSprite(pygame.sprite.Sprite): Use methods to change image, direction, speed
Will automatically travel in direction and speed indicated
"""
-
- mPos = None
-
- mOffsetX = 0
- mOffsetY = 0
def __init__(self):
pygame.sprite.Sprite.__init__(self)
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py index 90b1ae2..7bb994e 100644 --- a/src/game/Area1Game1.py +++ b/src/game/Area1Game1.py @@ -155,9 +155,18 @@ class CArea1Game1(CGameState): self.mBox = CSprite() self.mBox.setXY(420, 600) - self.mBox.loadImage('assets/images/a1g1/A1G1-caja.png', True) + self.mBox.loadImage('assets/images/a1g1/A1G1-caja.png') CGame().addChild(self.mBox) + self.mElisa = CSprite() + self.mElisa.setXY(12, 110) + self.mElisa.loadImage('assets/images/a1g1/A1G1-silueta-elisa.png') + CGame().addChild(self.mElisa) + + self.mJuan = CSprite() + self.mJuan.setXY(670, 75) + self.mJuan.loadImage('assets/images/a1g1/A1G1-silueta-juan.png') + CGame().addChild(self.mJuan) self.mButtonBackA1G1 = CButton() self.mButtonBackA1G1.set_bgColor((0x99, 0x99, 0x66)) @@ -170,19 +179,19 @@ class CArea1Game1(CGameState): # load the pieces # parameters: aParent, aNum, aOrigin, aDestine #mujer - piece = Piece(self, 0, (600.0, 655.0), (244.0, 441.0)) + piece = Piece(self, 0, (600.0, 655.0), (260.0, 460.0)) piece.loadImage('assets/images/a1g1/A1G1-mamas.png') self.mListPieces.append(piece) - piece = Piece(self, 1, (630.0, 655.0), (244.0, 534.0)) + piece = Piece(self, 1, (630.0, 655.0), (254.0, 549.0)) piece.loadImage('assets/images/a1g1/A1G1-ovarios.png') self.mListPieces.append(piece) - piece = Piece(self, 2, (600.0, 655.0), (244.0, 544.0)) + piece = Piece(self, 2, (600.0, 655.0), (254.0, 559.0)) piece.loadImage('assets/images/a1g1/A1G1-utero.png') self.mListPieces.append(piece) - piece = Piece(self, 3, (630.0, 655.0), (250.0, 614.0)) + piece = Piece(self, 3, (630.0, 655.0), (258.0, 630.0)) piece.loadImage('assets/images/a1g1/A1G1-vagina.png') self.mListPieces.append(piece) @@ -280,6 +289,8 @@ class CArea1Game1(CGameState): CGame().removeChild(self.mButtonBackA1G1) CGame().removeChild(self.mPoints) CGame().removeChild(self.mBox) + CGame().removeChild(self.mElisa) + CGame().removeChild(self.mJuan) self.mPoints = None for p in self.mListPieces: |