New music

14 files changed, 189 insertions, 109 deletions

diff --git a/Saludame.activity/actions.py b/Saludame.activity/actions.py
index 9acb008..def2400 100755
--- a/Saludame.activity/actions.py
+++ b/Saludame.activity/actions.py
@@ -50,11 +50,10 @@ class Action:
         
 class Mood:
     
-    def __init__(self, name, rank, kid_animation_path, frame_rate=11):
+    def __init__(self, name, rank, kid_animation_path, music, frame_rate=11):
         self.name = name
         self.rank = rank #hierarchy of moods
+        self.music = music
         
         self.kid_animation_path = kid_animation_path
         self.kid_frame_rate = frame_rate
-
-
diff --git a/Saludame.activity/app_init.py b/Saludame.activity/app_init.py
index c8620e7..8f62630 100755
--- a/Saludame.activity/app_init.py
+++ b/Saludame.activity/app_init.py
@@ -121,31 +121,30 @@ class AppLoader:
     def __load_moods(self):
         
         #SICK
-        m_sick3 = actions.Mood("sick_3", 0, "assets/kid/moods/sick3")
-        m_sick2 = actions.Mood("sick_2", 1, "assets/kid/moods/sick2")
-        m_sick1 = actions.Mood("sick_1", 2, "assets/kid/moods/sick1")
+        m_sick3 = actions.Mood("sick_3", 0, "assets/kid/moods/sick3", "sick")
+        m_sick2 = actions.Mood("sick_2", 1, "assets/kid/moods/sick2", "sick")
+        m_sick1 = actions.Mood("sick_1", 2, "assets/kid/moods/sick1", "sick")
         
         #SAD
-        m_sad3 = actions.Mood("sad_3", 3, "assets/kid/moods/sad3")
-        m_sad2 = actions.Mood("sad_2", 4, "assets/kid/moods/sad2")
-        m_sad1 = actions.Mood("sad_1", 5, "assets/kid/moods/sad1")
+        m_sad3 = actions.Mood("sad_3", 3, "assets/kid/moods/sad3", "sad")
+        m_sad2 = actions.Mood("sad_2", 4, "assets/kid/moods/sad2", "sad")
+        m_sad1 = actions.Mood("sad_1", 5, "assets/kid/moods/sad1", "sad")
         
         #ANGRY
-        m_angry3 = actions.Mood("angry_3", 6, "assets/kid/moods/angry3")
-        m_angry2 = actions.Mood("angry_2", 7, "assets/kid/moods/angry2")
-        m_angry1 = actions.Mood("angry_1", 8, "assets/kid/moods/angry1")
+        m_angry3 = actions.Mood("angry_3", 6, "assets/kid/moods/angry3", "angry")
+        m_angry2 = actions.Mood("angry_2", 7, "assets/kid/moods/angry2", "angry")
+        m_angry1 = actions.Mood("angry_1", 8, "assets/kid/moods/angry1", "angry")
         
         #NORMAL
-        m_normal = actions.Mood("normal", 9, "assets/kid/moods/normal")
+        m_normal = actions.Mood("normal", 9, "assets/kid/moods/normal", "normal")
         
         #HAPPY
-        m_happy3 = actions.Mood("happy_3", 10, "assets/kid/moods/happy3")
-        m_happy2 = actions.Mood("happy_2", 11, "assets/kid/moods/happy2")
-        m_happy1 = actions.Mood("happy_1", 12, "assets/kid/moods/happy1")
+        m_happy3 = actions.Mood("happy_3", 10, "assets/kid/moods/happy3", "happy")
+        m_happy2 = actions.Mood("happy_2", 11, "assets/kid/moods/happy2", "happy")
+        m_happy1 = actions.Mood("happy_1", 12, "assets/kid/moods/happy1", "happy")
         
         #Los moods están ordenados en la lista segun su rank
         moods_list = [m_sick3, m_sick2, m_sick1, m_sad3, m_sad2, m_sad1, m_angry3, m_angry2, m_angry1,
                       m_normal, m_happy3, m_happy2, m_happy1]
         
         return moods_list
-
diff --git a/Saludame.activity/assets/music/angry.ogg b/Saludame.activity/assets/music/angry.ogg
new file mode 100644
index 0000000..42e30b9
--- /dev/null
+++ b/Saludame.activity/assets/music/angry.ogg
diff --git a/Saludame.activity/assets/music/happy.ogg b/Saludame.activity/assets/music/happy.ogg
new file mode 100644
index 0000000..c1c7b77
--- /dev/null
+++ b/Saludame.activity/assets/music/happy.ogg
diff --git a/Saludame.activity/assets/music/normal.ogg b/Saludame.activity/assets/music/normal.ogg
new file mode 100644
index 0000000..8f2eb67
--- /dev/null
+++ b/Saludame.activity/assets/music/normal.ogg
diff --git a/Saludame.activity/assets/music/sad.ogg b/Saludame.activity/assets/music/sad.ogg
new file mode 100644
index 0000000..4a8b9c9
--- /dev/null
+++ b/Saludame.activity/assets/music/sad.ogg
diff --git a/Saludame.activity/assets/music/sick.ogg b/Saludame.activity/assets/music/sick.ogg
index 86a8821..c1c3a4f 100644
--- a/Saludame.activity/assets/music/sick.ogg
+++ b/Saludame.activity/assets/music/sick.ogg
diff --git a/Saludame.activity/game.py b/Saludame.activity/game.py
index 2db2e6d..665e95e 100755
--- a/Saludame.activity/game.py
+++ b/Saludame.activity/game.py
@@ -84,7 +84,9 @@ class Main():
         # windows_controller asociado al screen
         self.windows_controller = WindowsController(screen, None)   
         
-        # Initialize game_manager, character, actions and menu.        
+        # Initialize sound_manager, game_manager, character, actions and menu.    
+        sound_manager.SoundManager()
+        
         app_loader = app_init.AppLoader(self.windows_controller)
         bars_loader = app_loader.get_status_bars_loader()
         game_man = app_loader.get_game_manager()
@@ -99,9 +101,6 @@ class Main():
         # Main loop
         update = True # The first time the screen need to be updated
         
-        sound_manager.SoundManager()
-        sound_manager.instance.set_music("sick")
-        
         while running:
             
             if from_sugar:
diff --git a/Saludame.activity/game_manager.py b/Saludame.activity/game_manager.py
index 87c9a51..4e78d46 100755
--- a/Saludame.activity/game_manager.py
+++ b/Saludame.activity/game_manager.py
@@ -12,6 +12,7 @@ import random
 import effects
 import character
 import events
+import sound_manager
 
 instance = None
 
@@ -304,7 +305,8 @@ class GameManager:
             self.windows_controller.set_mood(mood)
             self.character.mood = mood
             print "cambio estado de animo a: ", self.active_mood.name
-        
+            sound_manager.instance.set_music(mood.music)
+
 ## Events handling
 
     def __control_active_events(self):
diff --git a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
index 3d46651..6e4dacc 100644
--- a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
+++ b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
diff --git a/Saludame.activity/menu.py b/Saludame.activity/menu.py
index ff17c90..faee5b4 100755
--- a/Saludame.activity/menu.py
+++ b/Saludame.activity/menu.py
@@ -14,6 +14,7 @@ from window import Window
 import utilities
 import effects
 import random
+from gettext import gettext as _
 
 SIZE = 600, 280
 EXP_SPEED = 15.0 #expansion speed, in pixels per frame
@@ -49,11 +50,11 @@ class Menu(Window):
         self.item_list = item_list # item's list that going to be displayed, root items
         self.previous_items = []
         
-        self.exit = Item(container, frame_rate, "salir", "assets/icons/icon_quit.png", CLOSE_MENU, [], self, font, True)
+        self.exit = Item(container, frame_rate, _("exit"), "assets/icons/icon_quit.png", CLOSE_MENU, [], self, font, True)
         self.exit.rect_in_container.center = center
         self.exit.set_rect_in_container(self.exit.rect_in_container)
 
-        self.back = Item(container, frame_rate, "back", "assets/icons/icon_quit.png", BACK_MENU, [], self, font, True)
+        self.back = Item(container, frame_rate, _("back"), "assets/icons/icon_quit.png", BACK_MENU, [], self, font, True)
         self.back.rect_in_container.center = center
         self.back.set_rect_in_container(self.back.rect_in_container)
         
diff --git a/Saludame.activity/po/Saludame.pot b/Saludame.activity/po/Saludame.pot
index 876267c..59a206c 100644
--- a/Saludame.activity/po/Saludame.pot
+++ b/Saludame.activity/po/Saludame.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-07 18:49-0200\n"
+"POT-Creation-Date: 2010-12-17 19:17-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,199 +144,283 @@ msgstr ""
 msgid "Leche con cereales"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:49
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:48
 msgid "Líquidos..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:51
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:50
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Agua"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:52
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:51
 msgid "Limonada"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:53
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:52
 msgid "Jugo de naranja"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:54
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:53
 msgid "Jugo de peras"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:55
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:54
 msgid "Jugo de zanahorias"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:61
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:60
 msgid "Deportes..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:62
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:61
 msgid "Run"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:62
 msgid "Jump the rope"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:64
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
 msgid "Play footbal"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:65
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:64
 msgid "Hide and Seek"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:67
 msgid "Tiempo libre..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
 msgid "Go to sleep"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
 msgid "Talk with a friend"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
 msgid "Do homework"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:72
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
 msgid "Clean up the bedroom"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:75
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:74
 msgid "Ir a..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:76
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:75
 msgid "Schoolyard"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:77
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:76
 msgid "Country"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:77
 msgid "Classroom"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
 msgid "Square"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
 msgid "Home..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
 msgid "Living room"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
 msgid "Bedroom"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:83
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
 msgid "Kitchen"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:86
 msgid "Cambiar de ropa"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
 msgid "School"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
 msgid "Sunny"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
 msgid "Rainy"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:92
 msgid "Higiene..."
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
 msgid "Bañarse"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
 msgid "Lavarse los dientes"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
 msgid "Lavarse las manos"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:97
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
 msgid "Ir al baño"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/challenges.py:243
+#: /home/pmoleri/saludame/Saludame.activity/customization.py:63
+msgid "Continue"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/main_window.py:39
+msgid "Multiple choice"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/main_window.py:43
+msgid "True or false"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/main_window.py:47
+msgid "Reset"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:40
 msgid "Which foods do we need to eat every day?"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:40
 msgid "Some food from each group every day"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:40
 msgid "Some fruits and vegetables only"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:40
 msgid "Some food from all the groups but not fats and sugar"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:41
 msgid "What is the most important meal of the day?"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:41
 msgid "Breakfast"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:41
 msgid "Lunch"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:41
 msgid "Tea"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:41
 msgid "Dinner"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
 msgid "How regularly should children exercise?"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
 msgid "Once a month"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
 msgid "Once a week"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
 msgid "Once a day"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:30
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:43
 msgid "What percentage of the body is made up of water?"
 msgstr ""
 
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:49
+msgid ""
+"La alimentación adecuada previene muchas enfermedades \n"
+"importantes"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:50
+msgid ""
+"Si no nos vacunamos con las vacunas obligatorias podemos \n"
+"enfermarnos"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:51
+msgid ""
+"Cuando estamos ingiriendo alimentos en menor proporción \n"
+"a lo que necesitamos, podemos volvernos más \n"
+"susceptibles a las infecciones "
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:54
+msgid ""
+"Muchos alimentos pueden estar contaminados con agroquímicos, \n"
+"y pesticidas porque son frecuentemente usados"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:55
+msgid "Si no voy a comer no necesito lavarme las manos "
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:56
+msgid ""
+"Lo primero que hay que hay que hacer cuando vamos a lavarnos \n"
+"las manos es ponernos jabón"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:59
+msgid ""
+"Cuando aprendemos hábitos saludables estamos cuidando nuestra \n"
+"salud"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:60
+msgid ""
+"Tomar mucha agua, hacer ejercicio y comer frutas y verduras \n"
+"ayuda a mover el intestino sin dificultad"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:61
+msgid "El desayuno no es importante en nuestra alimentación"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:64
+msgid "La actividad física mejora nuestra imagen"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:65
+msgid ""
+"La actividad física  no nos ayuda prevenir enfermedades \n"
+"como el sobrepeso y la obesidad "
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:66
+msgid ""
+"Ser sedentarios no tiene importancia y no afecta nuestra \n"
+"salud"
+msgstr ""
+
 #: /home/pmoleri/saludame/Saludame.activity/startup_window.py:52
 msgid "New game"
 msgstr ""
@@ -373,10 +457,6 @@ msgstr ""
 msgid "Customization module"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/customization.py:63
-msgid "Continue"
-msgstr ""
-
 #: /home/pmoleri/saludame/Saludame.activity/customization.py:66
 msgid "Hair"
 msgstr ""
@@ -409,27 +489,27 @@ msgstr ""
 msgid "Library"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:56
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:58
 msgid "TOTAL"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:59
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:61
 msgid "ESTADO FÍSICO"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:62
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:64
 msgid "HIGIENE"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:65
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:67
 msgid "ALIMENTACIÓN"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:68
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:70
 msgid "TIEMPO LIBRE"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:342
+#: /home/pmoleri/saludame/Saludame.activity/status_bars.py:349
 msgid "LEVEL"
 msgstr ""
 
@@ -449,70 +529,70 @@ msgstr ""
 msgid "Defenses"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:21
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:24
 msgid "Peso"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:29
 msgid "Ducha"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:29
 msgid "Manos"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:29
 msgid "Dientes"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:27
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:29
 msgid "Baño"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Cereales y leguminosas"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Verduras y frutas"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Carnes y huevos"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Dulces"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Grasas y aceites"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
 msgid "Leches y quesos"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:34
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:36
 msgid "Alimentation"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:39
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:41
 msgid "Deportes"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:39
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:41
 msgid "Diversión"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:39
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:41
 msgid "Descanso"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:39
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:41
 msgid "Responsabilidad"
 msgstr ""
 
-#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:40
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:42
 msgid "Tiempo Libre"
 msgstr ""
diff --git a/Saludame.activity/po/es.po b/Saludame.activity/po/es.po
index 74e078a..c270bf5 100755
--- a/Saludame.activity/po/es.po
+++ b/Saludame.activity/po/es.po
@@ -248,7 +248,7 @@ msgstr "Cocina"
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
 msgid "Cambiar de ropa"
-msgstr ""
+msgstr "Cambiar de ropa"
 
 #: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
 msgid "School"
diff --git a/Saludame.activity/sound_manager.py b/Saludame.activity/sound_manager.py
index a07ec54..479fe42 100644
--- a/Saludame.activity/sound_manager.py
+++ b/Saludame.activity/sound_manager.py
@@ -3,10 +3,10 @@
 import pygame
 
 music = {
-    "happy": "assets/music/sick.ogg",
-    "normal": "assets/music/sick.ogg",
-    "sad": "assets/music/sick.ogg",
-    "angry": "assets/music/sick.ogg",
+    "happy": "assets/music/happy.ogg",
+    "normal": "assets/music/normal.ogg",
+    "sad": "assets/music/sad.ogg",
+    "angry": "assets/music/angry.ogg",
     "sick": "assets/music/sick.ogg",
 }
 
@@ -35,19 +35,19 @@ class SoundManager:
             
         if self.state == SoundManager.PLAYING:
             if name <> self.current_music_name:
-                self.state = FADE_OUT
+                self.state = SoundManager.FADE_OUT
                 self.next_music_name = name
             
         elif self.state == SoundManager.FADE_OUT:
             if name == self.current_music_name:
-                self.state = FADE_IN
+                self.state = SoundManager.FADE_IN
                 self.next_music_name = ""
             else:
                 self.next_music_name = name
             
         elif self.state == SoundManager.FADE_IN:
             if name <> self.current_music_name:
-                self.state = FADE_OUT
+                self.state = SoundManager.FADE_OUT
                 self.next_music_name = name
 
     def start_playing(self):