Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Aguiar <alanjas@hotmail.com>2013-07-21 04:10:58 (GMT)
committer Alan Aguiar <alanjas@hotmail.com>2013-07-21 04:10:58 (GMT)
commitf568061cdc4ac6ffe7addcd11ec9185ce95f24f3 (patch)
tree77db758ea0517ce1dbfbcfe806e040a1b2646e11
parentc570b295ad9e74064d1adce52655ac7286ff3b27 (diff)
add house rectangle
-rw-r--r--.pydevproject2
-rw-r--r--src/assets/images/map/rectangulo.pngbin0 -> 2621 bytes
-rw-r--r--src/game/SelectAreaState.py22
3 files changed, 13 insertions, 11 deletions
diff --git a/.pydevproject b/.pydevproject
index 4e5811b..1dd63fa 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/CeibalJamEducacionSexual/src</path>
+<path>/EducacionSexual/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python</pydev_property>
diff --git a/src/assets/images/map/rectangulo.png b/src/assets/images/map/rectangulo.png
new file mode 100644
index 0000000..3d3e44a
--- /dev/null
+++ b/src/assets/images/map/rectangulo.png
Binary files differ
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index 80859fa..a8b9c45 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -37,9 +37,9 @@ class CSelectAreaState(CGameState):
mArea1 = None
- mFrameImageArea1 = []
+ mFrameImageArea1 = None
- AREA1_POLYGON = [(139,330), (299,265), (422,324), (267,400)]
+ AREA1_POLYGON = [(311, 181), (489, 221), (492, 400), (165, 544), (36, 400), (12, 280), (9, 208)]
def init(self):
CGameState.init(self)
@@ -57,15 +57,15 @@ class CSelectAreaState(CGameState):
self.mButtonBack.set_text("Volver") #_('BACK Credits')
CGame().addChild(self.mButtonBack)
- self.mBackground = CImage.loadImage('assets/images/selectArea/backgroundSelectArea.png', False)
+ self.mBackground = CImage.loadImage('assets/images/map/backgroundGeneralMap.png', False)
CGame().setBackground(self.mBackground)
self.mArea1 = CSprite()
- self.mArea1.setXY(105,222)
- self.mFrameImageArea1.append(Image.loadImage('assets/images/selectArea/area1Normal.png', True))
- self.mFrameImageArea1.append(Image.loadImage('assets/images/selectArea/area1Selected.png', True))
- self.mArea1.setImage(self.mFrameImageArea1[0])
- CGame().addChild(self.mArea1)
+ self.mArea1.setXY(0, 135)
+ self.mFrameImageArea1 = Image.loadImage('assets/images/map/rectangulo.png', True)
+ #self.mFrameImageArea1.append(Image.loadImage('assets/images/selectArea/area1Selected.png', True))
+ self.mArea1.setImage(self.mFrameImageArea1)
+ #CGame().addChild(self.mArea1)
def update(self):
#print "menu update"
@@ -79,12 +79,14 @@ class CSelectAreaState(CGameState):
#if (self.mArea1 <> None):
if (CMath.pointInsidePolygon(CMouse().getX(), CMouse().getY(), self.AREA1_POLYGON)):
- self.mArea1.setImage(self.mFrameImageArea1[1])
+ #self.mArea1.setImage(self.mFrameImageArea1[1])
+ CGame().addChild(self.mArea1)
if (CMouse().release()):
hs = CHallState()
CGame().setState(hs)
else:
- self.mArea1.setImage(self.mFrameImageArea1[0])
+ CGame().removeChild(self.mArea1)
+ #self.mArea1.setImage(self.mFrameImageArea1[0])
#def render(self):
# CGameState.render(self)