Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateu Batle <mateu.batle@collabora.co.uk>2010-11-18 15:06:53 (GMT)
committer Mateu Batle <mateu.batle@collabora.co.uk>2010-11-18 15:06:53 (GMT)
commiteba1989cfa57df275cd6c74825f21eda9cfa6a24 (patch)
tree522177e3090730aaf4d6e9c78477407f2748d77c
parent499020b896af2e84041f943e9b5600735cb56660 (diff)
Fixed fonts, colors, texts, times
-rwxr-xr-xgame1/collectgame.py8
-rwxr-xr-xgame1/score.py2
-rwxr-xr-xgame2/game2.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/game1/collectgame.py b/game1/collectgame.py
index 76cdaff..50ba314 100755
--- a/game1/collectgame.py
+++ b/game1/collectgame.py
@@ -14,7 +14,7 @@ class CollectGame(usmpgames.ApplicationState):
def __init__(self, game_mode, next_state = None, background = None):
usmpgames.ApplicationState.__init__(self, next_state, background)
self.game_mode = game_mode
- self.font = pygame.font.SysFont("Arial", 50)
+ self.font = pygame.font.SysFont(None, 80)
def entering_state(self, fromStack):
usmpgames.ApplicationState.entering_state(self, fromStack)
@@ -31,7 +31,7 @@ class CollectGame(usmpgames.ApplicationState):
self.next_state().add_text2(
_(""" %s\n\nHas conseguido %d puntos.\n\nHas acertado %d veces.\n\nHas realizado %d errores.""") %
(self.game_over_message(), self.player.score, self.player.num_ok, self.player.num_error),
- color = (0, 255, 0, 0),
+ color = (0, 0, 0, 0),
pos = (660, 260),
rectsize = (380, 390));
usmpgames.ApplicationState.exiting_state(self, fromStack)
@@ -73,9 +73,9 @@ class CollectGame(usmpgames.ApplicationState):
self.player.draw(self.screen())
self.score.draw(self.screen())
if self.game_mode == "pares":
- self.drawText("A POR LOS PARES!", screen_size[0] / 2, 0, (0,0,0))
+ self.drawText("NUMEROS PARES", screen_size[0] / 2, 0, (0,0,0))
else:
- self.drawText("A POR LOS IMPARES!", screen_size[0] / 2, 0, (0,0,0))
+ self.drawText("NUMEROS IMPARES", screen_size[0] / 2, 0, (0,0,0))
def drawText(self, text, x, y, color):
text = self.font.render(text, 1, color)
diff --git a/game1/score.py b/game1/score.py
index 1c2580b..7432612 100755
--- a/game1/score.py
+++ b/game1/score.py
@@ -14,7 +14,7 @@ class Score():
def __init__(self, player):
self.player = player
- self.font = pygame.font.SysFont("Arial", 50)
+ self.font = pygame.font.SysFont(None, 80)
def draw(self, screen):
score = _("PUNTAJE: %05d") % self.player.score
diff --git a/game2/game2.py b/game2/game2.py
index e575b5e..d1089dc 100755
--- a/game2/game2.py
+++ b/game2/game2.py
@@ -151,7 +151,7 @@ class Game2(usmpgames.ApplicationState):
self.next_state().clear_all()
self.next_state().add_text2(
_(""" Felicidades\n\nHas conseguido %d puntos""") % score,
- color = (0, 255, 0, 0),
+ color = (0, 0, 0, 0),
pos = (660, 260),
rectsize = (380, 390) );
global musicSound
@@ -441,8 +441,8 @@ class Game2(usmpgames.ApplicationState):
######################################## methods
#Time Limit
-#TIMELIMIT=240.0
-TIMELIMIT=30.0
+TIMELIMIT=240.0
+#TIMELIMIT=30.0
#print ('time: '+str(TIMESTART))
def compareTime(playTime, gamestate):