Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.settings/org.eclipse.core.resources.prefs1
-rw-r--r--src/assets/images/selectPartida/T-elisa.pngbin0 -> 61560 bytes
-rw-r--r--src/assets/images/selectPartida/T-juan.pngbin0 -> 60382 bytes
-rw-r--r--src/assets/images/selectPartida/background.pngbin0 -> 1785879 bytes
-rw-r--r--src/assets/images/selectPartida/border.pngbin0 -> 15042 bytes
-rw-r--r--src/game/MenuState.py19
-rw-r--r--src/game/PresentationState.py13
-rw-r--r--src/game/SelectPartidaState.py118
8 files changed, 144 insertions, 7 deletions
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 02bf9fb..3b2c613 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -23,3 +23,4 @@ encoding//src/game/HallState.py=utf-8
encoding//src/game/MenuState.py=utf-8
encoding//src/game/PresentationState.py=utf-8
encoding//src/game/SelectAreaState.py=utf-8
+encoding//src/game/SelectPartidaState.py=utf-8
diff --git a/src/assets/images/selectPartida/T-elisa.png b/src/assets/images/selectPartida/T-elisa.png
new file mode 100644
index 0000000..855a9e3
--- /dev/null
+++ b/src/assets/images/selectPartida/T-elisa.png
Binary files differ
diff --git a/src/assets/images/selectPartida/T-juan.png b/src/assets/images/selectPartida/T-juan.png
new file mode 100644
index 0000000..6e550e2
--- /dev/null
+++ b/src/assets/images/selectPartida/T-juan.png
Binary files differ
diff --git a/src/assets/images/selectPartida/background.png b/src/assets/images/selectPartida/background.png
new file mode 100644
index 0000000..61135b6
--- /dev/null
+++ b/src/assets/images/selectPartida/background.png
Binary files differ
diff --git a/src/assets/images/selectPartida/border.png b/src/assets/images/selectPartida/border.png
new file mode 100644
index 0000000..6e06eae
--- /dev/null
+++ b/src/assets/images/selectPartida/border.png
Binary files differ
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index 603670d..c591f8b 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -19,6 +19,7 @@ from SelectAreaState import *
import api.Image as Image
from game.PresentationState import CPresentationState
+from game.SelectPartidaState import CSelectPartidaState
import game.Area1Game1
from game.Area1Game1 import CArea1Game1
@@ -72,6 +73,15 @@ class CMenuState(CGameState):
self.mButtonPresentation.set_text('Presentacion')
CGame().addChild(self.mButtonPresentation)
+ self.mButtonPartida = CButton()
+ self.mButtonPartida.bgColor = (0x99, 0x99, 0x66)
+ self.mButtonPartida.fgColor = (0xFF, 0xFF, 0xFF)
+ self.mButtonPartida.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+ self.mButtonPartida.set_center((200, 250))
+ self.mButtonPartida.set_size((200, 40))
+ self.mButtonPartida.set_text('Partida')
+ CGame().addChild(self.mButtonPartida)
+
self.mButtonCredits = CButton()
self.mButtonCredits.bgColor = (0x99, 0x99, 0x66)
self.mButtonCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
@@ -167,10 +177,16 @@ class CMenuState(CGameState):
return
elif self.mButtonPresentation.clicked():
- print "clicked play"
+ print "clicked presentation"
presentation = CPresentationState()
CGame().setState(presentation)
return
+
+ elif self.mButtonPartida.clicked():
+ print "clicked partida"
+ partida = CSelectPartidaState()
+ CGame().setState(partida)
+ return
elif self.mButtonHelp.clicked():
print "clicked help"
@@ -230,6 +246,7 @@ class CMenuState(CGameState):
CGame().removeChild(self.mButtonCredits)
CGame().removeChild(self.mButtonPlay)
CGame().removeChild(self.mButtonPresentation)
+ CGame().removeChild(self.mButtonPartida)
CGame().removeChild(self.mButtonHelp)
CGame().removeChild(self.mButtonExit)
CGame().removeChild(self.mButtonA1G1)
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index bef58fd..040e689 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -12,9 +12,10 @@ import api.Button
from api.Button import CButton
import game.CreditsState
from CreditsState import *
+from api.Sprite import CSprite
-import game.SelectAreaState
-from SelectAreaState import *
+#import game.SelectAreaState
+#from SelectAreaState import *
import api.Image as Image
@@ -28,26 +29,26 @@ class CPresentationState(CGameState):
def init(self):
CGameState.__init__(self)
- self.mBackground = Image.loadImage('assets/images/map/background.png', False)
+ self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
CGame().setBackground(self.mBackground)
self.mElisa = CSprite()
#ancho = 216 -> 1200 - 216 - juan.X = 834
self.mElisa.setXY(834, 300)
- elisa = Image.loadImage('assets/images/map/T-elisa.png')
+ elisa = Image.loadImage('assets/images/selectArea/T-elisa.png')
self.mElisa.setImage(elisa)
CGame().addChild(self.mElisa)
self.mJuan = CSprite()
self.mJuan.setXY(150, 300)
- juan = Image.loadImage('assets/images/map/T-juan.png')
+ juan = Image.loadImage('assets/images/selectArea/T-juan.png')
self.mJuan.setImage(juan)
CGame().addChild(self.mJuan)
self.mTitle = CSprite()
#ancho = 447 -> (1200 - 447 ) / 2 = 376
self.mTitle.setXY(376, 193)
- self.mImageTitle = Image.loadImage('assets/images/map/T-rotulo.png')
+ self.mImageTitle = Image.loadImage('assets/images/selectArea/T-rotulo.png')
self.mTitle.setImage(self.mImageTitle)
CGame().addChild(self.mTitle)
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
new file mode 100644
index 0000000..31bdf73
--- /dev/null
+++ b/src/game/SelectPartidaState.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+import pygame
+import MenuState
+import api.GameState
+from api.GameState import CGameState
+from api.MultiLabel import CMultiLabel
+from api.Label import CLabel
+import api.Game
+from api.Game import CGame
+from api.Button import CButton
+from api.Sprite import CSprite
+
+import api.Image as Image
+
+from gettext import gettext as _
+
+class CSelectPartidaState(CGameState):
+
+ mBackground = None
+
+ def init(self):
+ CGameState.__init__(self)
+
+ self.mBackground = Image.loadImage('assets/images/selectPartida/background.png', False)
+ CGame().setBackground(self.mBackground)
+
+ border = Image.loadImage('assets/images/selectPartida/border.png')
+
+ self.mElisa = CSprite()
+ #ancho = 216 -> 1200 - 216 - juan.X = 834
+ self.mElisa.setXY(684, 250)
+ elisa = Image.loadImage('assets/images/selectPartida/T-elisa.png')
+ self.mElisa.setImage(elisa)
+ CGame().addChild(self.mElisa)
+
+ self.mBorderElisa = CSprite()
+ self.mBorderElisa.setXY(674, 240)
+ self.mBorderElisa.setImage(border)
+ self.mElisaIs = False
+
+ self.mJuan = CSprite()
+ self.mJuan.setXY(300, 250)
+ juan = Image.loadImage('assets/images/selectPartida/T-juan.png')
+ self.mJuan.setImage(juan)
+ CGame().addChild(self.mJuan)
+
+ self.mBorderJuan = CSprite()
+ self.mBorderJuan.setXY(290, 240)
+ self.mBorderJuan.setImage(border)
+ self.mJuanIs = False
+
+ mes = _('Selecciona tu personaje')
+ self.mMessage = CLabel()
+ self.mMessage.bgColor = (255, 125, 50)
+ self.mMessage.fgColor = (0xFF, 0xFF, 0xFF)
+ self.mMessage.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+ self.mMessage.set_center((600, 150))
+ self.mMessage.set_size((400, 40))
+ self.mMessage.set_text(unicode(mes, 'UTF-8'))
+ CGame().addChild(self.mMessage)
+
+
+ def update(self):
+ #print "menu update"
+ CGameState.update(self)
+
+ if self.mJuan.clicked():
+ print "clicked Juan"
+ CGame().setCharacter('Juan')
+ ms = MenuState.CMenuState()
+ CGame().setState(ms)
+ return
+
+ elif self.mElisa.clicked():
+ print "clicked Elisa"
+ CGame().setCharacter('Elisa')
+ ms = MenuState.CMenuState()
+ CGame().setState(ms)
+ return
+
+ if self.mJuan.mouseOver():
+ if not(self.mJuanIs):
+ self.mJuanIs = True
+ CGame().addChild(self.mBorderJuan)
+ return
+ else:
+ if self.mJuanIs:
+ self.mJuanIs = False
+ CGame().removeChild(self.mBorderJuan)
+ return
+
+ if self.mElisa.mouseOver():
+ if not(self.mElisaIs):
+ self.mElisaIs = True
+ CGame().addChild(self.mBorderElisa)
+ return
+ else:
+ if self.mElisaIs:
+ self.mElisaIs = False
+ CGame().removeChild(self.mBorderElisa)
+ return
+
+
+ def destroy(self):
+ CGameState.destroy(self)
+ CGame().removeChild(self.mElisa)
+ CGame().removeChild(self.mBorderElisa)
+ self.mElisa.destroy()
+ self.mElisa = None
+ CGame().removeChild(self.mJuan)
+ CGame().removeChild(self.mBorderJuan)
+ self.mJuan.destroy()
+ self.mJuan = None
+ CGame().removeChild(self.mMessage)
+ self.mMessage = None
+ self.mBackground = None
+ print "CMenuState destroy"
generated by cgit v0.9.1 at 2024-05-08 10:32:38 (GMT)