diff options
| author | Pablo Moleri <pmoleri@gmail.com> | 2011-03-29 21:49:43 (GMT) |
|---|---|---|
| committer | Pablo Moleri <pmoleri@gmail.com> | 2011-03-29 21:49:43 (GMT) |
| commit | 3874feb6c5fde6417eeb01633071a317898890f5 (patch) | |
| tree | 8569e8ca5012a3791145f7585e58025abd887533 | |
| parent | c84b646bc946807cb211c0a7a05f0aa7c8337bb4 (diff) | |
| parent | 7eda9caa4a4cf9e0b3408a23b37e0ddc4a20b60b (diff) | |
Merge branch 'master' of git.sugarlabs.org:saludame/mainline
| -rw-r--r-- | Saludame.activity/challenges.py | 4 | ||||
| -rw-r--r-- | Saludame.activity/challenges_creator.py | 2 | ||||
| -rw-r--r-- | Saludame.activity/game_manager.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Saludame.activity/challenges.py b/Saludame.activity/challenges.py index 98d77cb..58dad5d 100644 --- a/Saludame.activity/challenges.py +++ b/Saludame.activity/challenges.py @@ -174,7 +174,8 @@ class TrueOrFalse(MultipleChoice): self.kind = "normal" # normal or master # master challenge is like a TrueOrFalse challenge with mutlitple choice questions - self.limit = 3 + self.limit = game_manager.instance.get_current_level_conf()["min_qty_correct_ans"] + self.perdio = False def pre_draw(self, screen): @@ -276,6 +277,7 @@ class TrueOrFalse(MultipleChoice): if self.kind == "master": if self.perdio: self.windows_controller.windows["info_challenge_window"].update_content(u"Perdiste", u"Quedaste en este nivel. \n¡Hay que aprender más!") + self.windows_controller.set_active_window("info_challenge_window") else: if not game_manager.instance.get_current_level_conf()["master_challenge_text"]: diff --git a/Saludame.activity/challenges_creator.py b/Saludame.activity/challenges_creator.py index 6e04cb7..cc3196d 100644 --- a/Saludame.activity/challenges_creator.py +++ b/Saludame.activity/challenges_creator.py @@ -74,7 +74,7 @@ class ChallengesCreator: self._create_tf_challenge(_("Ser sedentarios no tiene importancia y no afecta nuestra \nsalud"), 0, 10, 10), ] - # Spare time + # Responsability self.tf_challenges["responsability"] = [ self._create_tf_challenge(_("Hay que hacer los deberes en la escuela"), 1, 10, 10), self._create_tf_challenge(_("Es bueno ayudar en las tareas domésticas"), 0, 10, 10), diff --git a/Saludame.activity/game_manager.py b/Saludame.activity/game_manager.py index 72756c4..a837fb8 100644 --- a/Saludame.activity/game_manager.py +++ b/Saludame.activity/game_manager.py @@ -30,6 +30,8 @@ class GameManager: """ Constructor de la clase """ + + #Singleton global instance instance = self |