Merge branch 'master' of git.sugarlabs.org:saludame/mainline

85 files changed, 112 insertions, 37 deletions

diff --git a/Saludame.activity/animation.py b/Saludame.activity/animation.py
index 1b206dc..a8aa841 100755
--- a/Saludame.activity/animation.py
+++ b/Saludame.activity/animation.py
@@ -64,11 +64,15 @@ class Kid(Window):
         self.set_animation()
     
     def set_animation(self):
+        
+        sex = self.character.sex
+        clothes = self.character.clothes
+        
         self.index = 0 # Sequence number of the current animation
         if self.action and self.action.kid_animation_path: # An action with animation is enabled
-            dirList = os.listdir(self.action.kid_animation_path)
+            dirList = os.listdir("%s/%s/%s" % (self.action.kid_animation_path, sex, clothes))
             dirList.sort()
-            self.file_list = [os.path.join(self.action.kid_animation_path, fname) for fname in dirList if '.png' in fname]
+            self.file_list = [os.path.join("%s/%s/%s" % (self.action.kid_animation_path, sex, clothes), fname) for fname in dirList if '.png' in fname]
         else:            
             dirList = os.listdir(self.mood.kid_animation_path)
             dirList.sort()
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0297.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0297.png
index a4ae99c..a4ae99c 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0297.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0297.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0298.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0298.png
index b12d566..b12d566 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0298.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0298.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0299.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0299.png
index d12084c..d12084c 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0299.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0299.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0300.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0300.png
index e2f668e..e2f668e 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0300.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0300.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0301.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0301.png
index 26ade26..26ade26 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0301.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0301.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0302.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0302.png
index cec7b82..cec7b82 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0302.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0302.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0303.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0303.png
index 4861b3b..4861b3b 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0303.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0303.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0304.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0304.png
index e387102..e387102 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0304.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0304.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0305.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0305.png
index 5811887..5811887 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0305.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0305.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0306.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0306.png
index 59043de..59043de 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0306.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0306.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0307.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0307.png
index 3644a69..3644a69 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0307.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0307.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0308.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0308.png
index a8e66e8..a8e66e8 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0308.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0308.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0309.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0309.png
index 36885ba..36885ba 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0309.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0309.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0310.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0310.png
index 1bdf8c8..1bdf8c8 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0310.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0310.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0311.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0311.png
index f8438ba..f8438ba 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0311.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0311.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0312.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0312.png
index fed9541..fed9541 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0312.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0312.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0313.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0313.png
index 18e255b..18e255b 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0313.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0313.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0314.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0314.png
index dcf17d6..dcf17d6 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0314.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0314.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0315.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0315.png
index 83f7a92..83f7a92 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0315.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0315.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0316.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0316.png
index 554a272..554a272 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0316.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0316.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0317.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0317.png
index 1655824..1655824 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0317.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0317.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0318.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0318.png
index def2b99..def2b99 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0318.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0318.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0319.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0319.png
index fa26099..fa26099 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0319.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0319.png
diff --git a/Saludame.activity/assets/kid/actions/eat/character1_0320.png b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0320.png
index e84df83..e84df83 100644
--- a/Saludame.activity/assets/kid/actions/eat/character1_0320.png
+++ b/Saludame.activity/assets/kid/actions/eat/boy/school/character1_0320.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0356.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0356.png
index c6e86b6..c6e86b6 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0356.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0356.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0357.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0357.png
index d039cba..d039cba 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0357.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0357.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0358.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0358.png
index b67ab60..b67ab60 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0358.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0358.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0359.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0359.png
index 8dd3868..8dd3868 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0359.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0359.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0360.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0360.png
index 6e59f0d..6e59f0d 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0360.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0360.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0361.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0361.png
index 172dad7..172dad7 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0361.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0361.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0362.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0362.png
index 5d2a528..5d2a528 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0362.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0362.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0363.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0363.png
index b4fd6d5..b4fd6d5 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0363.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0363.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0364.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0364.png
index 8c4981a..8c4981a 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0364.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0364.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0365.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0365.png
index 0aa943c..0aa943c 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0365.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0365.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0366.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0366.png
index 8164adc..8164adc 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0366.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0366.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0367.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0367.png
index 831214c..831214c 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0367.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0367.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0368.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0368.png
index e80b7c3..e80b7c3 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0368.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0368.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0369.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0369.png
index ba0a613..ba0a613 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0369.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0369.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0370.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0370.png
index 1d790cf..1d790cf 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0370.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0370.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0371.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0371.png
index 356ef45..356ef45 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0371.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0371.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0372.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0372.png
index 8ed908f..8ed908f 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0372.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0372.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0373.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0373.png
index a505b44..a505b44 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0373.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0373.png
diff --git a/Saludame.activity/assets/kid/actions/ropejump/character1_0374.png b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0374.png
index d35f9d2..d35f9d2 100644
--- a/Saludame.activity/assets/kid/actions/ropejump/character1_0374.png
+++ b/Saludame.activity/assets/kid/actions/ropejump/boy/school/character1_0374.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0321.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0321.png
index 18d61ec..18d61ec 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0321.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0321.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0322.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0322.png
index 6d7fe62..6d7fe62 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0322.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0322.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0323.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0323.png
index a33e9fb..a33e9fb 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0323.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0323.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0324.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0324.png
index 25cb7c0..25cb7c0 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0324.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0324.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0325.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0325.png
index a4b373d..a4b373d 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0325.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0325.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0326.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0326.png
index f385fe1..f385fe1 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0326.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0326.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0327.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0327.png
index e8681af..e8681af 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0327.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0327.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0328.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0328.png
index 10a622d..10a622d 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0328.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0328.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0329.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0329.png
index d4e3856..d4e3856 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0329.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0329.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0330.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0330.png
index 421540b..421540b 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0330.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0330.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0331.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0331.png
index 67636c2..67636c2 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0331.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0331.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0332.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0332.png
index 5bb399a..5bb399a 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0332.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0332.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0333.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0333.png
index 624d36e..624d36e 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0333.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0333.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0334.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0334.png
index 4025fa3..4025fa3 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0334.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0334.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0335.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0335.png
index ab0beb1..ab0beb1 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0335.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0335.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0336.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0336.png
index deef0ea..deef0ea 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0336.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0336.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0337.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0337.png
index c34e41e..c34e41e 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0337.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0337.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0338.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0338.png
index 2acdb9c..2acdb9c 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0338.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0338.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0339.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0339.png
index ed11547..ed11547 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0339.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0339.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0340.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0340.png
index 3211bd7..3211bd7 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0340.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0340.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0341.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0341.png
index c57312c..c57312c 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0341.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0341.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0342.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0342.png
index 044f4e9..044f4e9 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0342.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0342.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0343.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0343.png
index 1788e4f..1788e4f 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0343.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0343.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0344.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0344.png
index 18d61ec..18d61ec 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0344.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0344.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0345.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0345.png
index f4a4f7a..f4a4f7a 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0345.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0345.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0346.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0346.png
index 986cd35..986cd35 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0346.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0346.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0347.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0347.png
index 331d079..331d079 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0347.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0347.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0348.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0348.png
index b1d35eb..b1d35eb 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0348.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0348.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0349.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0349.png
index 262eda6..262eda6 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0349.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0349.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0350.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0350.png
index 8c62405..8c62405 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0350.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0350.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0351.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0351.png
index 26b3d21..26b3d21 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0351.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0351.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0352.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0352.png
index efbf409..efbf409 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0352.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0352.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0353.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0353.png
index 0af922f..0af922f 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0353.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0353.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0354.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0354.png
index b91889b..b91889b 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0354.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0354.png
diff --git a/Saludame.activity/assets/kid/actions/toilet/character1_0355.png b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0355.png
index b94fec8..b94fec8 100644
--- a/Saludame.activity/assets/kid/actions/toilet/character1_0355.png
+++ b/Saludame.activity/assets/kid/actions/toilet/boy/school/character1_0355.png
diff --git a/Saludame.activity/character.py b/Saludame.activity/character.py
index 428922e..54b200c 100755
--- a/Saludame.activity/character.py
+++ b/Saludame.activity/character.py
@@ -5,27 +5,58 @@ import pygame
         
 class Character:
     
-    def __init__(self, name, level, score, hair_color, socks_color, skin_color, shoes_color, clothes):
+    def __init__(self, sex, name, level, score, hair_color, socks_color, skin_color, shoes_color, clothes):
+        
+        self.sex = sex
         self.name = name
         self.level = level
-        self.score = score
         
         # visuals
         self.hair_color = hair_color
         self.socks_color = socks_color
         self.skin_color = skin_color
         self.shoes_color = shoes_color
-        self.clothes = clothes
-
-        self.actual_place = None
+        self.clothes = 'school'
+        self.grade = 5
 
+        self.current_place = 'schoolyard' #default place
     
     def set_clothes(self, clothes):
         self.clothes = clothes
         
     def set_place(self, place_id):
         self.actual_place = place_id
-        
+
+    def get_status(self):
+        """
+        Get the character current status, and returns
+        a dictionary.
+        """
+        status = {"hair_color" : self.hair_color,
+                  "socks_color" : self.socks_color,
+                  "skin_color" : self.skin_color,
+                  "shoes_color" : self.shoes_color,
+                  "current_place" : self.current_place,
+                  "name" : self.name,
+                  "level" : self.level,
+                  "grade" : self.grade,
+                  "clothes" : self.clothes
+                  }
+        return status
+    
+    def load_properties(self, game_status):
+        """
+        Load the character properties from previous data
+        """
+        self.hair_color = game_status["hair_color"]
+        self.socks_color = game_status["socks_color"]
+        self.skin_color = game_status["skin_color"]
+        self.shoes_color = game_status["shoes_color"]
+        self.name = game_status["name"]
+        self.clothes = game_status["clothes"]
+        self.grade = game_status["grade"]
+        self.current_place = game_status["current_place"]
+
 class Environment:
     
     def __init__(self, background_path, background_music):
@@ -72,12 +103,4 @@ class Clothes:
         self.clothes_id = clothes_id
         self.texture_path = texture_path
         self.weather_effects_list = weather_effects_list #list of tuples (id_weather, effect_indoor, effect_outdoor)
-        
-        
-        
-        
-        
-        
-
-
 
diff --git a/Saludame.activity/character_creator.py b/Saludame.activity/character_creator.py
index 255b488..7197cc1 100755
--- a/Saludame.activity/character_creator.py
+++ b/Saludame.activity/character_creator.py
@@ -11,6 +11,7 @@ SWEATER_TEXTURE = "  "
 
 # CHARACTER
 # estas constantes las definirná el usuario, y se cargaran en otro lado """
+SEX = "boy"
 NAME = "José"
 SCORE = 0
 LEVEL = 1
@@ -24,14 +25,12 @@ SHOES_COLOR = ("#eeea00", "#938200")
 import character
 import pygame
 
-
 class CharacterLoader:
     
     def __init__(self):
         self.clothes_list = self.__load_clothes()
-        self.character = self.__load_character(NAME, LEVEL, SCORE, self.clothes_list[0])
-        self.environments_dictionary = self.__load_environments()
-        
+        self.character = self.__load_character(SEX, NAME, LEVEL, SCORE, self.clothes_list[0])
+        self.environments_dictionary = self.__load_environments()        
         
     def get_character(self):
         return self.character
@@ -42,13 +41,13 @@ class CharacterLoader:
     def __load_clothes(self):
         return ["a clothes"]
     
-    def __load_character(self, name, level, score, clothes):
+    def __load_character(self, sex, name, level, score, clothes):
         hair_color = [pygame.Color(color) for color in HAIR_COLOR]
         skin_color = [pygame.Color(color) for color in SKIN_COLOR]
         socks_color = [pygame.Color(color) for color in SOCKS_COLOR]
         shoes_color = [pygame.Color(color) for color in SHOES_COLOR]
         
-        char = character.Character(name, level, score, hair_color, socks_color, skin_color, shoes_color, clothes)
+        char = character.Character(sex, name, level, score, hair_color, socks_color, skin_color, shoes_color, clothes)
         return char
     
     def __load_environments(self):
@@ -80,10 +79,3 @@ class CharacterLoader:
                         }
         
         return environments
-
-
-
-
-
-
-
diff --git a/Saludame.activity/game.py b/Saludame.activity/game.py
index 0523195..2fd85b2 100755
--- a/Saludame.activity/game.py
+++ b/Saludame.activity/game.py
@@ -87,6 +87,8 @@ class Main():
         
         self.windows_controller.game_man = game_man
         self.windows_controller.create_windows_and_activate_main(app_loader, clock, bars_loader)
+
+        game_man.load_game()
           
         frames = 0
         
@@ -111,8 +113,10 @@ class Main():
                     for event in events:
                         if event.type == pygame.QUIT:
                             running = False
+                            game_man.save_game()
                         elif event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE and not from_sugar:
                             running = False
+                            game_man.save_game()
                         elif event.type == pygame.MOUSEBUTTONDOWN:
                             self.windows_controller.handle_mouse_down(pygame.mouse.get_pos())
                         elif event.type == pygame.VIDEOEXPOSE:
diff --git a/Saludame.activity/game_manager.py b/Saludame.activity/game_manager.py
index 3992e2d..a724cb8 100755
--- a/Saludame.activity/game_manager.py
+++ b/Saludame.activity/game_manager.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+INSTANCE_FILE_PATH = "game.save"
+GAME_VERSION = "1.0"
+
 CONTROL_INTERVAL = 16   # Qty of signal calls until a new control is performed (actions, events, weather, etc.)
 EVENTS_OCCURRENCE_INTERVAL = 10 #per control interval after an event
 
@@ -56,7 +59,6 @@ class GameManager:
         #environment
         self.environments_dictionary = environments_dictionary
         self.current_weather = "sunny" # default weather
-        self.current_place = "schoolyard" # default place
         
         # time of day
         self.hour = 2 # value between 0 and 3
@@ -69,7 +71,6 @@ class GameManager:
         
         #for testing
         self.p_i = 0
-
         
 # management
 
@@ -102,7 +103,7 @@ class GameManager:
         Sets the character environment and send a message to the
         windows_controller
         """
-        environment_id = self.current_place + "_" + self.current_weather
+        environment_id = self.character.current_place + "_" + self.current_weather
         environment = self.environments_dictionary[environment_id]
         
         self.windows_controller.set_environment(environment)
@@ -159,7 +160,7 @@ class GameManager:
         Set the character location.
         """
         print "character went to: ", place_id
-        self.current_place = place_id
+        self.character.current_place = place_id
         
         self.update_environment()
 
@@ -415,9 +416,10 @@ class GameManager:
     def add_points(self, points):
         score_bar = self.bars_controller.score_bar
         score_bar.value += points
+        self.character.score = score_bar.value
         
     def __control_level(self):
-        score_bar = [bar for bar in self.bars_controller.bars if bar.id == "score_bar"][0]
+        score_bar = self.bars_controller.score_bar
         if score_bar.value == 100:
             # sets master challenge
             self.level += 1
@@ -438,5 +440,47 @@ class GameManager:
         self.challenges_creator.get_challenge()
         self.windows_controller.set_active_window("challenges_window")
         
+# Save and load game
+
+    def save_game(self):
+        """
+        Save the game instance
+        """
+        game_status = {}
+        ##save bars status
+        bars_status_dic = self.bars_controller.get_bars_status()
+        ##save character properties
+        char_properties = self.character.get_status()
+        ##
+        game_status.update(bars_status_dic)
+        game_status.update(char_properties)
+        game_status.update({"version" : GAME_VERSION})
+        
+        try:
+            f = open(INSTANCE_FILE_PATH, 'w')
+            f.write(game_status.__str__())
+            f.close()
+            
+            print "se guardo la partida con exito. Version ", GAME_VERSION
+        except:
+            print "no se pudo guardar la partida."
+            raise
 
+    def load_game(self):
+        try:
+            f = open(INSTANCE_FILE_PATH)
+            str = f.read()
+            game_status = eval(str)
+            f.close()
+            
+            #load bars status
+            self.bars_controller.load_bars_status(game_status)
+            #character properties
+            self.character.load_properties(game_status)
+
+            self.update_environment()
+            
+            print "se cargo la partida con exito. Version ", game_status["version"]
+        except:
+            print "no se pudo cargar la partida."
 
diff --git a/Saludame.activity/kid_window.py b/Saludame.activity/kid_window.py
index cda1ef0..fedab77 100644
--- a/Saludame.activity/kid_window.py
+++ b/Saludame.activity/kid_window.py
@@ -145,6 +145,7 @@ class ExternalCharacter(Window):
             changes += self.message_balloon.draw(screen, frames)
             return changes
         else:
+            
             screen.blit(self.bg1, self.rect)
             screen.blit(self.bg2, self.message_balloon.rect)
             return [self.rect, self.message_balloon.rect]
@@ -187,6 +188,4 @@ class MessageBalloon(Window):
             return Window.draw(self, screen, frames)
         else:
             screen.blit(self.bg, self.rect)
-            return [self.rect]
-
-
+            return [self.rect]
\ No newline at end of file
diff --git a/Saludame.activity/status_bars.py b/Saludame.activity/status_bars.py
index 6786ba7..99286d1 100755
--- a/Saludame.activity/status_bars.py
+++ b/Saludame.activity/status_bars.py
@@ -404,6 +404,14 @@ class BarsController:
             bars_state.update({ bar.id : bar.value })
         
         return bars_state
+    
+    def load_bars_status(self, bars_values):
+        """
+        Load a previous status for each bar
+        """
+        for bar in self.bars:
+            bar.value = bars_values[bar.id]
+            
         
 class StatusBar:
     """
@@ -480,3 +488,4 @@ class StatusBar:
                 self.value = self.max
             elif self.value < 0:
                 self.value = 0
+