diff options
| author | Pablo Moleri <pmoleri@gmail.com> | 2011-04-24 20:23:21 (GMT) |
|---|---|---|
| committer | Pablo Moleri <pmoleri@gmail.com> | 2011-04-24 20:23:21 (GMT) |
| commit | ca3cbc0a91b9d1e1560eae3890f4c2707e774f26 (patch) | |
| tree | ce0b1b789fbf58ea14c493ea093cf9d9dac31f74 | |
| parent | 9edf9e0cfd81d5021deb75022a58d6db1249c263 (diff) | |
Now change place and change clothes show twister animation.
Sleep action advances time so the character wakes up in the morning.
| -rw-r--r-- | Saludame.activity/actions_creator.py | 275 | ||||
| -rw-r--r-- | Saludame.activity/app_init.py | 95 | ||||
| -rw-r--r-- | Saludame.activity/effects.py | 60 | ||||
| -rw-r--r-- | Saludame.activity/game_manager.py | 84 |
4 files changed, 257 insertions, 257 deletions
diff --git a/Saludame.activity/actions_creator.py b/Saludame.activity/actions_creator.py index 807dbf3..cf5e2af 100644 --- a/Saludame.activity/actions_creator.py +++ b/Saludame.activity/actions_creator.py @@ -32,7 +32,7 @@ HOT_DRINK_PATH = os.path.normpath("assets/action-icons/hotdrink") factor = float(16) / (60 * 14) #bars_rate_per_minute = [("energy",-20), ("defenses",-10), ("weight",0), ("c_leguminosas",-15), ("v_frutas",-15), ("c_huevos",-5), ("dulces",-1), ("g_aceites",-5), ("l_quesos",-5), ("agua",-20), ("shower",-10), ("w_hands",-10), ("b_teeth",-10), ("toilet",-20), ("sports",-10), ("fun",-10), ("relaxing",-10), ("housekeeping",-20), ("homework",-20), ("h_check",-0.2), ("farm",0)] bars_rate_per_minute = [("energy",-5), ("defenses",-1), ("weight",0), ("nutrition",-float(100)/16), ("shower",-5), ("w_hands",-5), ("b_teeth",-5), ("toilet",-5), ("sports",-10), ("fun",-10), ("relaxing",-10), ("housekeeping",-20), ("homework",-20), ("h_check",-0.2), ("farm",0)] -bar_dec_effect = effects.Effect(None, [(bar, rate*factor) for bar, rate in bars_rate_per_minute]) +bar_dec_effect = effects.Effect([(bar, rate*factor) for bar, rate in bars_rate_per_minute]) # Consequences of food actions (triggered events after eating) CONS_FOOD = ["nauseas", "cepillar_dientes"] @@ -57,351 +57,351 @@ actions_list = [ # Atention, default action when idle for long time ("attention", 0.3, 40, 0, "assets/kid/actions/atention", 3, 1, None, 4, "assets/sound/atention.ogg", - effects.Effect(None, []), None, None, None + effects.Effect([]), None, None, None ), # Drinks ("agua_c_gas", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("agua",25), ("defenses",10), ("toilet",-10)]), None, None, None, 1, L_AGUA + effects.Effect([("agua",25), ("defenses",10), ("toilet",-10)]), None, None, None, 1, L_AGUA ), ("agua", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("agua",25), ("defenses",10), ("toilet",-10)]), None, None, None, 1, L_AGUA + effects.Effect([("agua",25), ("defenses",10), ("toilet",-10)]), None, None, None, 1, L_AGUA ), ("jugo_natural", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("agua",25), ("energy",5), ("defenses",10), ("b_teeth",-10), ("toilet",-10)]), None, None, None + effects.Effect([("v_frutas",40), ("agua",25), ("energy",5), ("defenses",10), ("b_teeth",-10), ("toilet",-10)]), None, None, None ), ("jugo_compota", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("agua",25), ("defenses",10), ("b_teeth",-10), ("toilet",-10)]), None, None, None + effects.Effect([("agua",25), ("defenses",10), ("b_teeth",-10), ("toilet",-10)]), None, None, None ), ("jugo_artificial", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("agua",25), ("energy",10), ("weight",0.5), ("b_teeth",-10), ("toilet",-10)]), None, None, None + effects.Effect([("dulces",25), ("agua",25), ("energy",10), ("weight",0.5), ("b_teeth",-10), ("toilet",-10)]), None, None, None ), ("refresco", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("agua",25), ("energy",10), ("weight",0.5), ("b_teeth",-20), ("toilet",-10)]), None, None, None + effects.Effect([("dulces",25), ("agua",25), ("energy",10), ("weight",0.5), ("b_teeth",-20), ("toilet",-10)]), None, None, None ), ("mate", 0.3, 70, 0, DRINK_PATH, 3, 1, "assets/action-icons/mate", 4, BLIP_PATH, - effects.Effect(None, [("b_teeth",-10), ("toilet",-10)]), None, [], None + effects.Effect([("b_teeth",-10), ("toilet",-10)]), None, [], None ), ("cafe", 0.3, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("b_teeth",-10), ("toilet",-10)]), None, [], None + effects.Effect([("b_teeth",-10), ("toilet",-10)]), None, [], None ), # Milk ("leche", 0.3, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("l_quesos",50), ("agua",12.5), ("energy",20), ("defenses",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO3 + effects.Effect([("l_quesos",50), ("agua",12.5), ("energy",20), ("defenses",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO3 ), ("leche_chocolatada", 0.3, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",12.5), ("l_quesos",50), ("agua",12.5), ("energy",10), ("b_teeth",-15), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("dulces",12.5), ("l_quesos",50), ("agua",12.5), ("energy",10), ("b_teeth",-15), ("toilet",-10)], CONS_FOOD), None, [], None ), ("yogur", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("l_quesos",50), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO3 + effects.Effect([("l_quesos",50), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO3 ), ("licuado", 0.3, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("dulces",25), ("l_quesos",50), ("agua",25), ("energy",20), ("defenses",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("v_frutas",40), ("dulces",25), ("l_quesos",50), ("agua",25), ("energy",20), ("defenses",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None ), # Meals - breakfast, tea ("pan_queso", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("l_quesos",50), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO3 + effects.Effect([("c_leguminosas",20), ("l_quesos",50), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO3 ), ("pan_manteca", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 + effects.Effect([("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 ), ("galletas_dulce", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("dulces",25), ("energy",10), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None ), ("refuerzo_fiambre", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("c_huevos",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("c_huevos",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None ), ("bizcochos", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("dulces",25), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None ), ("torta_frita", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 + effects.Effect([("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 ), ("torta_dulce", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO5 + effects.Effect([("c_leguminosas",20), ("dulces",25), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO5 ), ("rosca_chicharrones", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 + effects.Effect([("c_leguminosas",20), ("g_aceites",50), ("energy",10), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, [], None, 1, L_GRUPO6 ), # Meals - Launch, Dinner ("sopa_verduras", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), + effects.Effect([("v_frutas",20), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), ("e_carne_verduras", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("g_arroz_carne_lenteja_verdura", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), + effects.Effect([("c_leguminosas",40), ("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), ("puchero", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",20), ("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("milanesa_papas_fritas", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("c_huevos",50), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO6), + effects.Effect([("c_leguminosas",20), ("c_huevos",50), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO6), ("costilla_cordero_huevo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_huevos",100), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), + effects.Effect([("c_huevos",100), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), ("cordero_arroz_choclo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("churrasco_pure_zapallo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("v_frutas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("pollo_horno_ensalada", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("lengua_polenta", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("hamburguesa_papas_fritas", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("c_huevos",50), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO6), + effects.Effect([("c_leguminosas",40), ("c_huevos",50), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO6), ("albondiga_fideo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("carne_papas", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), + effects.Effect([("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), ("carne_vaca_ensalada", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("carne_cordero_pure", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), + effects.Effect([("c_leguminosas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), ("tarta_jamon_queso", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("panchos_huevo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_huevos",100), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), + effects.Effect([("c_huevos",100), ("g_aceites",100), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO4), ("choripan", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",20), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("polenta", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), ("tallarines", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), ("ñoquis", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), ("ravioles_verdura", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",30), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), + effects.Effect([("c_leguminosas",20), ("v_frutas",30), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO1), ("tortilla_papa", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",40), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, L_GRUPO2), + effects.Effect([("c_leguminosas",40), ("v_frutas",40), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, L_GRUPO2), ("pizza", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",10), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",40), ("v_frutas",10), ("g_aceites",50), ("energy",20), ("weight",2), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("tarta_zapallo", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), + effects.Effect([("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), ("pascualina", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), + effects.Effect([("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None, 1, L_GRUPO2), ("canelones_verdura", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("c_leguminosas",20), ("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), ("zapallitos_rellenos", 0.3, 70, 0, CHEW_PATH, 3, 1, DISH_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), + effects.Effect([("v_frutas",20), ("g_aceites",50), ("energy",20), ("b_teeth",-30), ("toilet",-30)], CONS_MEAL), None, None, None), # Farm ("pasta_primavera", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/06-Pasta primavera.html"), + effects.Effect([("c_leguminosas",40), ("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/06-Pasta primavera.html"), ("pastel_lentajas", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",60), ("g_aceites",50), ("energy",15), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/08-Pastel de lentejas y espinaca.html"), + effects.Effect([("c_leguminosas",40), ("v_frutas",60), ("g_aceites",50), ("energy",15), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/08-Pastel de lentejas y espinaca.html"), ("tarta_zapallitos", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",30), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/03-Tarta de zapallitos.html"), + effects.Effect([("c_leguminosas",20), ("v_frutas",30), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/03-Tarta de zapallitos.html"), ("tarta_puerros", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",30), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/05-Tarta de puerros.html"), + effects.Effect([("c_leguminosas",20), ("v_frutas",30), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/05-Tarta de puerros.html"), ("polenta_acelga", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/09-Polenta con acelga.html"), + effects.Effect([("c_leguminosas",40), ("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/03-Cereales y leguminosas/09-Polenta con acelga.html"), ("budin_chauchas", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",30), ("dulces",12.5), ("g_aceites",50), ("l_quesos",25), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/08-Budín de chauchas.html"), + effects.Effect([("c_leguminosas",40), ("v_frutas",30), ("dulces",12.5), ("g_aceites",50), ("l_quesos",25), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/08-Budín de chauchas.html"), ("guiso_berenjenas", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",40), ("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/10-Guiso de berenjenas.html"), + effects.Effect([("c_leguminosas",40), ("v_frutas",40), ("c_huevos",50), ("g_aceites",50), ("agua",12.5), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/04-Verduras/10-Guiso de berenjenas.html"), ("ensalada_lechuga", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/02-De lechuga y zanahoria.html"), + effects.Effect([("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/02-De lechuga y zanahoria.html"), ("ensalada_remolacha", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/08-De remolacha y huevo duro.html"), + effects.Effect([("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/08-De remolacha y huevo duro.html"), ("ensalada_holanesa", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/10-Holandesa.html"), + effects.Effect([("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/10-Holandesa.html"), ("ensalada_pepinos", 0.3, 70, 0, CHEW_PATH, 3, 1, ORCHARD_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/11-De tomates y pepinos.html"), + effects.Effect([("v_frutas",40), ("g_aceites",50), ("energy",20), ("defenses",5), ("b_teeth",-30), ("toilet",-30)], CONS_FOOD), None, None, None, 1, u"70-Recetas/05-Ensaladas/11-De tomates y pepinos.html"), # Fruit ("manzana", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("naranja", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("banana", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("ciruelas", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("pelon", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("frutillas", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("durazno", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), ("mandarina", 0.3, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO2 ), # Sweets & Snacks ("papas_chips", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("energy",20), ("weight",1), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("c_leguminosas",20), ("energy",20), ("weight",1), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, None, None ), ("ticholos", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("dulces",25), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None ), ("rapadura", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("dulces",25), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None ), ("caramelo", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None ), ("galletitas_dulces", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 + effects.Effect([("dulces",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 ), ("alfajor", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",10), ("dulces",50), ("g_aceites",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 + effects.Effect([("c_leguminosas",10), ("dulces",50), ("g_aceites",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 ), ("chicle", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None ), ("chocolate", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",50), ("g_aceites",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 + effects.Effect([("dulces",50), ("g_aceites",50), ("energy",20), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None, 1, L_GRUPO5 ), ("chupetin", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None + effects.Effect([("dulces",25), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, None, None ), # Deserts ("arroz_leche", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None ), ("ensalada_frutas", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("dulces",25), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO2 + effects.Effect([("v_frutas",20), ("dulces",25), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO2 ), ("crema", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None ), ("torta_manzana", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("v_frutas",10), ("dulces",25), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("v_frutas",10), ("dulces",25), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None ), ("flan", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None ), ("compota", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("v_frutas",20), ("dulces",25), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("v_frutas",20), ("dulces",25), ("energy",10), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None ), ("helado", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("l_quesos",50), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO5 + effects.Effect([("dulces",25), ("l_quesos",50), ("energy",10), ("weight",1), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO5 ), # Others ("avena_leche", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None + effects.Effect([("c_leguminosas",20), ("dulces",25), ("l_quesos",50), ("energy",10), ("b_teeth",-10), ("toilet",-10)], CONS_FOOD), None, [], None ), ("martin_fierro", 0.3, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH, - effects.Effect(None, [("dulces",25), ("l_quesos",50), ("energy",10), ("weight",2), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO5 + effects.Effect([("dulces",25), ("l_quesos",50), ("energy",10), ("weight",2), ("b_teeth",-20), ("toilet",-10)], CONS_FOOD), None, [], None, 1, L_GRUPO5 ), # Sports ("sport_football", 0.3, 70, 0, "assets/kid/actions/football", 3, 1, None, 1, "assets/sound/jump_rope.ogg", - effects.Effect(None, [("energy",-10), ("defenses",5), ("weight",-1.5), ("agua",-15), ("shower",-15), ("w_hands",-10), ("sports",40), ("fun",60), ("relaxing",-15)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" + effects.Effect([("energy",-10), ("defenses",5), ("weight",-1.5), ("agua",-15), ("shower",-15), ("w_hands",-10), ("sports",40), ("fun",60), ("relaxing",-15)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" ), ("sport_jump", 0.3, 70, 0, "assets/kid/actions/ropejump", 3, 1, None, 1, "assets/sound/saltar_cuerda.ogg", - effects.Effect(None, [("energy",-5), ("defenses",2), ("weight",-0.5), ("agua",-5), ("shower",-10), ("w_hands",-5), ("sports",20), ("fun",30), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" + effects.Effect([("energy",-5), ("defenses",2), ("weight",-0.5), ("agua",-5), ("shower",-10), ("w_hands",-5), ("sports",20), ("fun",30), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" ), ("sport_run", 0.3, 70, 0, "assets/kid/actions/run", 3, 1, None, 1, None, - effects.Effect(None, [("energy",-10), ("defenses",5), ("weight",-1.5), ("agua",-15), ("shower",-15), ("w_hands",-5), ("sports",50), ("fun",20), ("relaxing",-15)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" + effects.Effect([("energy",-10), ("defenses",5), ("weight",-1.5), ("agua",-15), ("shower",-15), ("w_hands",-5), ("sports",50), ("fun",20), ("relaxing",-15)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" ), # Do ("housekeeping", 0.3, 70, 1, TWISTER_PATH, 3, 2, "assets/action-icons/clean", 1, [TWISTER_SOUND, "assets/sound/work.ogg"], - effects.Effect(None, [("energy",-5), ("shower",-5), ("w_hands",-5), ("sports",10), ("fun",-20), ("relaxing",-5), ("housekeeping",60)]), None, None, None + effects.Effect([("energy",-5), ("shower",-5), ("w_hands",-5), ("sports",10), ("fun",-20), ("relaxing",-5), ("housekeeping",60)]), None, None, None ), ("homework", 0.3, 70, 0, "assets/kid/actions/read", 3, 1, None, 1, "assets/sound/work.ogg", - effects.Effect(None, [("energy",-5), ("weight",-0.5), ("fun",-20), ("relaxing",-5), ("homework",80)], ["contento_deberes"]), None, None, None + effects.Effect([("energy",-5), ("weight",-0.5), ("fun",-20), ("relaxing",-5), ("homework",80)], ["contento_deberes"]), None, None, None ), ("study_xo", 0.3, 70, 0, "assets/kid/actions/studyXO", 3, 1, None, 1, "assets/sound/play_xo.ogg", - effects.Effect(None, [("energy",-5), ("weight",-0.5), ("sports",-5), ("fun",-10), ("relaxing",-5), ("homework",60)]), None, None, None + effects.Effect([("energy",-5), ("weight",-0.5), ("sports",-5), ("fun",-10), ("relaxing",-5), ("homework",60)]), None, None, None ), ("help_field", 0.3, 70, 1, TWISTER_PATH, 3, 2, None, 1, [TWISTER_SOUND, "assets/sound/work.ogg"], - effects.Effect(None, [("energy",-10), ("weight",-1), ("agua",-5), ("shower",-10), ("w_hands",-20), ("sports",20), ("fun",-20), ("relaxing",-10), ("housekeeping",60)]), None, None, None + effects.Effect([("energy",-10), ("weight",-1), ("agua",-5), ("shower",-10), ("w_hands",-20), ("sports",20), ("fun",-20), ("relaxing",-10), ("housekeeping",60)]), None, None, None ), ("help_cook", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/cook", 1, [TWISTER_SOUND, "assets/sound/work.ogg"], - effects.Effect(None, [("energy",-5), ("w_hands",-10), ("relaxing",-5), ("housekeeping",40)], ["contento_cocinar"]), None, None, None, 1, u"70-Recetas/01-Recetas-avanzado.html" + effects.Effect([("energy",-5), ("w_hands",-10), ("relaxing",-5), ("housekeeping",40)], ["contento_cocinar"]), None, None, None, 1, u"70-Recetas/01-Recetas-avanzado.html" ), ("relax", 0.3, 70, 0, "assets/kid/actions/rest", 3, 1, None, 1, ["assets/sound/relax.ogg"], - effects.Effect(None, [("energy",30), ("defenses",10), ("fun",10), ("relaxing",40)]), None, None, None, 1, u"04-Más hábitos saludables/06-Ocio y descanso-avanzado.html" + effects.Effect([("energy",30), ("defenses",10), ("fun",10), ("relaxing",40)]), None, None, None, 1, u"04-Más hábitos saludables/06-Ocio y descanso-avanzado.html" ), ("talk", 0.3, 70, 0, None, 3, 1, "assets/action-icons/talktofriend", 1, "assets/sound/talk.ogg", - effects.Effect(None, [("fun",30)]), None, None, None + effects.Effect([("fun",30)]), None, None, None ), ("clean", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/clean", 2, [TWISTER_SOUND, "assets/sound/work.ogg"], - effects.Effect(None, [("energy",-5), ("w_hands",-5), ("sports",10), ("fun",-20), ("relaxing",-5), ("housekeeping",40)]), None, None, None + effects.Effect([("energy",-5), ("w_hands",-5), ("sports",10), ("fun",-20), ("relaxing",-5), ("housekeeping",40)]), None, None, None ), ("sleep", 0.3, 150, 1, "assets/kid/actions/sleep", 3, 1, None, 2, [None, "assets/sound/sleep.ogg"], - effects.Effect(None, [("energy",90), ("defenses",20), ("shower",-25), ("w_hands",-5), ("b_teeth",-15), ("toilet",-10), ("sports",-20), ("relaxing",90), ("housekeeping",-30), ("homework",-30)]), None, None, None, 1, u"04-Más hábitos saludables/06-Ocio y descanso-avanzado.html", "sleep" + effects.Effect([("energy",90), ("defenses",20), ("shower",-25), ("w_hands",-5), ("b_teeth",-15), ("toilet",-10), ("sports",-20), ("relaxing",90), ("housekeeping",-30), ("homework",-30)], change_time=True), None, None, None, 1, u"04-Más hábitos saludables/06-Ocio y descanso-avanzado.html", "sleep" ), ("wash_hands", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/washhands", 2, [TWISTER_SOUND, "assets/sound/wash_hands.ogg"], - effects.Effect(None, [("defenses",5), ("w_hands",90), ("fun",-10)]), None, None, None, 1, u"04-Más hábitos saludables/05-Higiene corporal-avanzado.html#id.1zz1x6vcpupm" + effects.Effect([("defenses",5), ("w_hands",90), ("fun",-10)]), None, None, None, 1, u"04-Más hábitos saludables/05-Higiene corporal-avanzado.html#id.1zz1x6vcpupm" ), ("brush_teeth", 0.3, 70, 0, "assets/kid/actions/brushteeth", 3, 1, None, 1, "assets/sound/brush_teeth.ogg", - effects.Effect(None, [("defenses",5), ("b_teeth",90), ("fun",-10)]), None, None, None, 1, u"04-Más hábitos saludables/07-Salud bucal-avanzado.html" + effects.Effect([("defenses",5), ("b_teeth",90), ("fun",-10)]), None, None, None, 1, u"04-Más hábitos saludables/07-Salud bucal-avanzado.html" ), ("shower", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/shower", 2, [TWISTER_SOUND, "assets/sound/shower.ogg"], - effects.Effect(None, [("energy",-5), ("defenses",5), ("shower",90), ("w_hands",90), ("fun",-20), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/05-Higiene corporal-avanzado.html#id.1zz1x6vcpupm" + effects.Effect([("energy",-5), ("defenses",5), ("shower",90), ("w_hands",90), ("fun",-20), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/05-Higiene corporal-avanzado.html#id.1zz1x6vcpupm" ), ("toilet", 0.3, 100, 1, "assets/kid/actions/toilet", 3, 1, None, 2, [TWISTER_SOUND, "assets/sound/toilet.ogg"], - effects.Effect(None, [("w_hands",-30), ("toilet",90), ("fun",-10)]), None, None, None + effects.Effect([("w_hands",-30), ("toilet",90), ("fun",-10)]), None, None, None ), # Farm ("farm_plow", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/trident", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("shower",-5), ("w_hands",-30), ("sports",10), ("fun",40), ("weight",-1), ("agua",-5), ("shower",-30), ("w_hands",-70), ("sports",30), ("fun",30), ("relaxing",-10), ("farm",25)]), None, None, None, 1, u"50-Huerta/03-Preparación del suelo/01-Preparación del suelo-avanzado.html" + effects.Effect([("energy",-5), ("shower",-5), ("w_hands",-30), ("sports",10), ("fun",40), ("weight",-1), ("agua",-5), ("shower",-30), ("w_hands",-70), ("sports",30), ("fun",30), ("relaxing",-10), ("farm",25)]), None, None, None, 1, u"50-Huerta/03-Preparación del suelo/01-Preparación del suelo-avanzado.html" ), ("farm_sow", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/sow", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("w_hands",-10), ("fun",10), ("farm",25)]), None, None, None, 1, u"50-Huerta/04-Sembrar/01-Sembrar-avanzado.html" + effects.Effect([("energy",-5), ("w_hands",-10), ("fun",10), ("farm",25)]), None, None, None, 1, u"50-Huerta/04-Sembrar/01-Sembrar-avanzado.html" ), ("farm_irrigate", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/irrigate", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("weight",-0.5), ("w_hands",-5), ("fun",10), ("farm",10)]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/04-Regar-avanzado.html" + effects.Effect([("energy",-5), ("weight",-0.5), ("w_hands",-5), ("fun",10), ("farm",10)]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/04-Regar-avanzado.html" ), ("farm_fumigate", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/fumigate", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("shower",-40), ("w_hands",-40), ("fun",10), ("farm",10)], ["intoxicacion"]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/03-Cómo combatirlas-avanzado.html" + effects.Effect([("energy",-5), ("shower",-40), ("w_hands",-40), ("fun",10), ("farm",10)], ["intoxicacion"]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/03-Cómo combatirlas-avanzado.html" ), ("farm_clean", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/sow", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("weight",-0.5), ("shower",-5), ("w_hands",-20), ("sports",10), ("fun",10), ("farm",10)]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/05-Remover yuyos-avanzado.html" + effects.Effect([("energy",-5), ("weight",-0.5), ("shower",-5), ("w_hands",-20), ("sports",10), ("fun",10), ("farm",10)]), None, None, None, 1, u"50-Huerta/05-Mantenimiento/05-Remover yuyos-avanzado.html" ), ("farm_harvest", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/harvest", 2, [TWISTER_SOUND, "assets/sound/farm.ogg"], - effects.Effect(None, [("energy",-5), ("w_hands",-1), ("sports",10), ("fun",40), ("farm",-100)]), None, None, None, 1, u"50-Huerta/07-Cosechar-avanzado.html" + effects.Effect([("energy",-5), ("w_hands",-1), ("sports",10), ("fun",40), ("farm",-100)]), None, None, None, 1, u"50-Huerta/07-Cosechar-avanzado.html" ), # Fun ("playXO", 0.3, 70, 0, "assets/kid/actions/playXO", 3, 1, None, 1, "assets/sound/play_xo.ogg", - effects.Effect(None, [("energy",-5), ("w_hands",-5), ("sports",-5), ("fun",60), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/03-Sedentarismo-avanzado.html" + effects.Effect([("energy",-5), ("w_hands",-5), ("sports",-5), ("fun",60), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/03-Sedentarismo-avanzado.html" ), ("hidenseek", 0.3, 70, 0, "assets/kid/actions/hidenseek", 3, 1, None, 1, "assets/sound/hidenseek.ogg", - effects.Effect(None, [("energy",-5), ("weight",-1), ("shower",-10), ("w_hands",-5), ("sports",10), ("fun",60), ("relaxing",-5)]), None, None, None + effects.Effect([("energy",-5), ("weight",-1), ("shower",-10), ("w_hands",-5), ("sports",10), ("fun",60), ("relaxing",-5)]), None, None, None ), ("hopscotch", 0.3, 92, 2, "assets/kid/actions/hopscotch", 3, 1, None, 1, "assets/sound/hopscotch.ogg", - effects.Effect(None, [("energy",-5), ("weight",-1), ("shower",-10), ("w_hands",-5), ("sports",10), ("fun",60), ("relaxing",-5)]), None, None, None + effects.Effect([("energy",-5), ("weight",-1), ("shower",-10), ("w_hands",-5), ("sports",10), ("fun",60), ("relaxing",-5)]), None, None, None ), ("tv", 0.3, 70, 0, "assets/kid/actions/tv", 3, 1, None, 1, None, - effects.Effect(None, [("energy",5), ("sports",-5), ("fun",40), ("relaxing",5)]), None, None, None, 1, u"04-Más hábitos saludables/03-Sedentarismo-avanzado.html" + effects.Effect([("energy",5), ("sports",-5), ("fun",40), ("relaxing",5)]), None, None, None, 1, u"04-Más hábitos saludables/03-Sedentarismo-avanzado.html" ), ("read", 0.3, 70, 0, "assets/kid/actions/read", 3, 1, None, 1, None, - effects.Effect(None, [("energy",5), ("fun",50), ("relaxing",5)]), None, None, None, 1, "un link" + effects.Effect([("energy",5), ("fun",50), ("relaxing",5)]), None, None, None, 1, "un link" ), ("music", 0.3, 70, 0, "assets/kid/actions/dance", 3, 1, None, 1, "assets/sound/music.ogg", - effects.Effect(None, [("fun",50), ("relaxing",5)]), None, None, None, 1, "un link" + effects.Effect([("fun",50), ("relaxing",5)]), None, None, None, 1, "un link" ), #("sing", 0.3, 70, 1, "assets/kid/actions/sing", 3, 1, None, 4, None, - #effects.Effect(None, [("fun", 4.0)]), None, None, None, 1, "un link" + #effects.Effect([("fun", 4.0)]), None, None, None, 1, "un link" #), ("crazy", 0.3, 70, 0, "assets/kid/actions/crazy", 3, 1, None, 1, "assets/sound/crazy.ogg", - effects.Effect(None, [("energy",-5), ("fun",40)]), None, None, None + effects.Effect([("energy",-5), ("fun",40)]), None, None, None ), ("dance", 0.3, 70, 0, "assets/kid/actions/dance", 3, 1, None, 1, "assets/sound/music.ogg", - effects.Effect(None, [("energy",-5), ("weight",-1), ("agua",-5), ("shower",-10), ("sports",30), ("fun",60), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" + effects.Effect([("energy",-5), ("weight",-1), ("agua",-5), ("shower",-10), ("sports",30), ("fun",60), ("relaxing",-5)]), None, None, None, 1, u"04-Más hábitos saludables/02-Actividad física-avanzado.html" ), # Go to ("dentist", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/dentist", 1, TWISTER_SOUND, - effects.Effect(None, [("h_check",80)]), None, None, None, 1, u"04-Más hábitos saludables/07-Salud bucal-avanzado.html" + effects.Effect([("h_check",80)]), None, None, None, 1, u"04-Más hábitos saludables/07-Salud bucal-avanzado.html" ), ("doctor", 0.3, 70, 1, TWISTER_PATH, 3, 1, "assets/action-icons/doctor", 1, TWISTER_SOUND, - effects.Effect(None, [("h_check",80)]), None, None, None, 1, u"04-Más hábitos saludables/09-Controles en salud-avanzado.html" + effects.Effect([("h_check",80)]), None, None, None, 1, u"04-Más hábitos saludables/09-Controles en salud-avanzado.html" ), # Default action - affects the bars continuously @@ -410,17 +410,17 @@ actions_list = [ ### ACTIONS THAT SET CHARACTER LOCATION -locations_ac_list = [("goto_schoolyard", None, 28, None, None, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect(None, "schoolyard"), None, None, None), - ("goto_classroom", None, 28, None, None, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect(None, "classroom"), None, None, None), - ("goto_square", None, 28, None, None, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect(None, "square"), None, None, None), - ("goto_bedroom", None, 28, None, None, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect(None, "bedroom"), None, None, None), - ("goto_livingroom", None, 28, None, None, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect(None, "livingroom"), None, None, None), +locations_ac_list = [("goto_schoolyard", None, 28, None, TWISTER_PATH, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect("schoolyard"), None, None, None), + ("goto_classroom", None, 28, None, TWISTER_PATH, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect("classroom"), None, None, None), + ("goto_square", None, 28, None, TWISTER_PATH, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect("square"), None, None, None), + ("goto_bedroom", None, 28, None, TWISTER_PATH, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect("bedroom"), None, None, None), + ("goto_livingroom", None, 28, None, TWISTER_PATH, None, None, None, None, CHANGE_PLACE_PATH, effects.LocationEffect("livingroom"), None, None, None), ] ### ACTIONS THAT SET CHARACTER CLOTHES -clothes_ac_list = [("change_school_clothes", None, 28, None, CHANGE_CLOTHES_ANIMATION_PATH, None, None, None, None, CHANGE_CLOTHES_PATH, effects.ClothesEffect(None, "school"), None, None, None), - ("change_regular_clothes", None, 28, None, CHANGE_CLOTHES_ANIMATION_PATH, None, None, None, None, CHANGE_CLOTHES_PATH, effects.ClothesEffect(None, "regular"), None, None, None), +clothes_ac_list = [("change_school_clothes", None, 28, None, CHANGE_CLOTHES_ANIMATION_PATH, None, None, None, None, CHANGE_CLOTHES_PATH, effects.ClothesEffect("school"), None, None, None), + ("change_regular_clothes", None, 28, None, CHANGE_CLOTHES_ANIMATION_PATH, None, None, None, None, CHANGE_CLOTHES_PATH, effects.ClothesEffect("regular"), None, None, None), ] class ActionsLoader: @@ -441,24 +441,19 @@ class ActionsLoader: for action in actions_list: if len(action) == 17: # Action changes background - status_actions.append(actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], self.__set_bar_controller(action[10]), action[11], action[12], action[13], self.get_level(action), self.get_link(action), action[16])) + status_actions.append(actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], action[10], action[11], action[12], action[13], self.get_level(action), self.get_link(action), action[16])) else: - status_actions.append(actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], self.__set_bar_controller(action[10]), action[11], action[12], action[13], self.get_level(action), self.get_link(action))) + status_actions.append(actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], action[10], action[11], action[12], action[13], self.get_level(action), self.get_link(action))) - location_actions = [actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], self.__set_game_manager(action[10]), action[11], action[12], action[13], self.get_level(action), self.get_link(action)) for action in locations_ac_list] + location_actions = [actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], action[10], action[11], action[12], action[13], self.get_level(action), self.get_link(action)) for action in locations_ac_list] - clothes_actions = [actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], self.__set_game_manager(action[10]), action[11], action[12], action[13], self.get_level(action), self.get_link(action)) for action in clothes_ac_list] + clothes_actions = [actions.Action(action[0], action[1], action[2], action[3], action[4], action[5], action[6], action[7], action[8], action[9], action[10], action[11], action[12], action[13], self.get_level(action), self.get_link(action)) for action in clothes_ac_list] - return status_actions + location_actions + clothes_actions + all_actions = status_actions + location_actions + clothes_actions + for action in all_actions: + action.effect.set_bar_controller(self.bar_controller) - def __set_bar_controller(self, effect): - if effect: - effect.set_bar_controller(self.bar_controller) - return effect - - def __set_game_manager(self, effect): - effect.set_game_manager(self.game_manager) - return effect + return all_actions def get_level(self, action): """ diff --git a/Saludame.activity/app_init.py b/Saludame.activity/app_init.py index 5fbc32b..9322fbd 100644 --- a/Saludame.activity/app_init.py +++ b/Saludame.activity/app_init.py @@ -228,104 +228,104 @@ class AppLoader: # probabiliy configuration: (bar, type, threshold, probability_percentaje) probability = ("all", [("v_frutas", "indirect", 20, 60)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("fun", -5), ("h_check", -5)]) + effect = effects.Effect([("energy", -10), ("fun", -5), ("h_check", -5)]) event = events.PersonalEvent("assets/events/personal/stomach_ache", None, "constipation", u"Estreñimiento", "neg", None, None, probability, effect, u"Me duele la panza y no\npuedo ir al baño", "id.5fyq0oytfruc", 1, sick_2) _events.append(event) probability = ("all", [("w_hands", "indirect", 10, 60), ("defenses", "indirect", 10, 60)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("fun", -5), ("agua", -10), ("defenses", -5), ("toilet", -25), ("h_check", -5)]) + effect = effects.Effect([("energy", -10), ("fun", -5), ("agua", -10), ("defenses", -5), ("toilet", -25), ("h_check", -5)]) event = events.PersonalEvent("assets/events/personal/stomach_ache", None, "diarrhea", u"Diarrea", "neg", None, None, probability, effect, u"Tengo diarrea", "id.dbnmu9igerdx", 1, sick_2) _events.append(event) probability = ("any", [("nutrition", "indirect", 40, 40), ("relaxing", "indirect", 40, 40)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("fun", -5), ("relaxing", -5), ("h_check", -5)]) + effect = effects.Effect([("energy", -10), ("fun", -5), ("relaxing", -5), ("h_check", -5)]) event = events.PersonalEvent("assets/events/personal/headache", None, "headache", u"Dolor de cabeza", "neg", None, None, probability, effect, u"Me duele la cabeza", "id.2g0bjuai8neo", 1, sick_1) _events.append(event) probability = ("all", [("nutrition", "indirect", 15, 75), ("energy", "indirect", 15, 75)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -5), ("weight", -2)]) + effect = effects.Effect([("energy", -10), ("defenses", -5), ("weight", -2)]) event = events.PersonalEvent("assets/events/personal/stomach_ache", None, "hunger", u"Hambre", "neg", None, None, probability, effect, u"¡Tengo hambre!", "id.62xnnrmqecu9", 1, angry_2) _events.append(event) probability = ("all", [("agua", "indirect", 15, 75)]) - effect = effects.Effect(bars_controller, [("energy", -10)]) + effect = effects.Effect([("energy", -10)]) event = events.PersonalEvent("assets/events/personal/stomach_ache", None, "thirsty", u"Sed", "neg", None, None, probability, effect, u"¡Tengo sed!", "id.xxt52ebrysva", 1, angry_2) _events.append(event) probability = ("all", [("relaxing", "indirect", 30, 70), ("nutrition", "indirect", 30, 70), ("defenses", "indirect", 30, 70)]) - effect = effects.Effect(bars_controller, [("defenses", -10), ("fun", -15)]) + effect = effects.Effect([("defenses", -10), ("fun", -15)]) event = events.PersonalEvent("assets/events/personal/tired", None, "tired", u"Muy Cansado", "neg", None, None, probability, effect, u"Ufff, que cansancio\nque tengo", "id.eqc221j1lpwb", 1, sad_2) _events.append(event) probability = ("all", [("w_hands", "indirect", 30, 70)]) - effect = effects.Effect(bars_controller, [("defenses", -10)]) + effect = effects.Effect([("defenses", -10)]) event = events.PersonalEvent("assets/events/personal/dirty_hands", None, "dirty_hands", u"Manos sucias", "neg", None, None, probability, effect, u"Puaj, mis manos\nestán sucias", "id.i65x9lfgkdh", 1, sad_1) _events.append(event) probability = ("all", [("b_teeth", "indirect", 40.0, 60), ("dulces", "direct", 75, 60.0), ("nutrition", "indirect", 50, 60.0)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10), ("fun", -10), ("relaxing", -10), ("h_check", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10), ("fun", -10), ("relaxing", -10), ("h_check", -10)]) event = events.PersonalEvent("assets/events/personal/toothache", None, "dolor_dientes", u"Dolor de dientes", "neg", None, None, probability, effect, u"¡Ayyyy, mis dientes!", "id.55bloxrmmb9h", 1, sad_3) _events.append(event) probability = ("all", [("fun", "indirect", 90, 50)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("fun", -15), ("relaxing", -10)]) + effect = effects.Effect([("energy", -10), ("fun", -15), ("relaxing", -10)]) event = events.PersonalEvent("assets/events/personal/bored", None, "bored", u"Aburrido", "neg", None, m(5), probability, effect, u"Que aburrimiento tengo", "id.rj4a3l5xh6jr", 1, sad_1) _events.append(event) probability = ("all", [("fun", "constant", 90, 50), ("defenses", "constant", 90, 50), ("relaxing", "constant", 90, 50)]) - effect = effects.Effect(bars_controller, [("energy", +10), ("defenses", +10)]) + effect = effects.Effect([("energy", +10), ("defenses", +10)]) event = events.PersonalEvent("assets/events/personal/happy", None, "happy", u"Feliz", "pos", None, m(2), probability, effect, u"Estoy de muy bien humor", "id.l4dkflvt1jlf", 1, happy_3) _events.append(event) probability = ("all", [("nutrition", "constant", 90, 50), ("defenses", "constant", 90, 50), ("relaxing", "constant", 90, 50), ("energy", "constant", 90, 50)]) - effect = effects.Effect(bars_controller, [("defenses", +10)]) + effect = effects.Effect([("defenses", +10)]) event = events.PersonalEvent("assets/events/personal/energetic", None, "energetic", u"Mucha energía", "pos", None, m(2), probability, effect, u"¡Guauuu, que energía tengo!", "id.1qjxykbd4ira", 1, happy_2) _events.append(event) probability = ("all", [("physica", "direct", 90, 50), ("hygiene", "direct", 90, 50), ("nutrition", "direct", 90, 50)]) - effect = effects.Effect(bars_controller, [("fun", +10), ("defenses", +10)]) + effect = effects.Effect([("fun", +10), ("defenses", +10)]) event = events.PersonalEvent("assets/events/social/friend1_pos", None, "me_veo_bien", u"Me veo bien", "pos", None, m(2), probability, effect, u"Yupiiii, que bien me veo", "id.nny40i7jwdy8", 1, happy_3) _events.append(event) probability = ("all", [("sports", "indirect", 10, 80), ("energy", "constant", 10, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -5), ("fun", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -5), ("fun", -10)]) event = events.PersonalEvent("assets/events/personal/tired", None, "sedentarismo", u"Sedentarismo", "neg", None, m(5), probability, effect, u"Me agito mucho.\n¿Qué me pasa?", "id.grn7m6ehjqck", 1, angry_1) _events.append(event) probability = ("all", [("overall_bar", "constant", 50, 30)]) - effect = effects.Effect(bars_controller, [("energy", -5), ("defenses", -10), ("agua", -5)]) + effect = effects.Effect([("energy", -5), ("defenses", -10), ("agua", -5)]) event = events.PersonalEvent("assets/events/personal/sunburn", None, "quemaduras_sol", u"Quemaduras por el sol", "neg", None, m(5), probability, effect, u"¡Me arde todo el cuerpo\npor el sol!", "id.jupzdcewf6v2", 1, sick_2) event.add_restriction("place", ["schoolyard", "square"]) event.add_restriction("weather", ["hot"]) _events.append(event) probability = ("all", [("w_hands", "indirect", 20, 60)]) - effect = effects.Effect(bars_controller, [("defenses", -15), ("toilet", -20), ("energy", -15), ("fun", -5), ("h_check", -5), ("relaxing", -10)]) + effect = effects.Effect([("defenses", -15), ("toilet", -20), ("energy", -15), ("fun", -5), ("h_check", -5), ("relaxing", -10)]) event = events.PersonalEvent("assets/events/personal/nausea", None, "nausea", u"Nauseas y vómitos", "neg", None, None, probability, effect, u"Me parece que voy a vomitar", "id.b905vudodsyj", 1, sick_2) _events.append(event) probability = ("all", [("nutrition", "direct", 90, 90)]) - effect = effects.Effect(bars_controller, [("defenses", -10), ("energy", -10), ("fun", -5), ("h_check", -5), ("relaxing", -10)]) + effect = effects.Effect([("defenses", -10), ("energy", -10), ("fun", -5), ("h_check", -5), ("relaxing", -10)]) event = events.PersonalEvent("assets/events/personal/stomach_ache", None, "stomach_ache", u"Dolor de panza", "neg", None, m(5), probability, effect, u"Comí demasiado,\nme duele la panza", "id.3lsidk9rtp7m", 1, sick_1) _events.append(event) probability = ("all", [("w_hands", "indirect", 30, 90), ("shower", "indirect", 30, 90), ("defenses", "indirect", 30, 90), ("energy", "indirect", 30, 90)]) - effect = effects.Effect(bars_controller, [("defenses", -15), ("energy", -15), ("fun", -10), ("weight", -1), ("h_check", -5), ("relaxing", -10)]) + effect = effects.Effect([("defenses", -15), ("energy", -15), ("fun", -10), ("weight", -1), ("h_check", -5), ("relaxing", -10)]) event = events.PersonalEvent("assets/events/personal/sick", None, "flu", u"Gripe", "neg", None, None, probability, effect, u"Qué mal me siento,\ncreo que me engripé", "id.spl2hjco8uic", 1, sick_3) _events.append(event) #probability = ("all", [("overall_bar", "constant", 100.0, 15.0)]) - #effect = effects.Effect(bars_controller, [("defenses", -20), ("energy", -10), ("fun", -5), ("h_check", -20), ("relaxing", -10)]) + #effect = effects.Effect([("defenses", -20), ("energy", -10), ("fun", -5), ("h_check", -20), ("relaxing", -10)]) #event = events.PersonalEvent("assets/events/personal/nausea", None, "intoxicacion", u"Intoxicacion", "neg", None, None, probability, effect, "Me duele la cabeza y me pican las manos. Debe ser por la fumigación.", "id.irlzb3wkwmi2", 1, sick_2) #_events.append(event) probability = ("all", [("homework", "direct", 75, 70)]) - effect = effects.Effect(bars_controller, [("fun", +10), ("energy", +10), ("defenses", +10)]) + effect = effects.Effect([("fun", +10), ("energy", +10), ("defenses", +10)]) event = events.PersonalEvent("assets/events/social/friend1_pos", None, "contento_deberes", u"Muy contento", "pos", None, m(2), probability, effect, u"¡Qué bien que hice\nmis deberes!", "", 1, happy_2) _events.append(event) probability = ("all", [("housekeeping", "direct", 75, 70)]) - effect = effects.Effect(bars_controller, [("fun", +10), ("energy", +10), ("defenses", +10)]) + effect = effects.Effect([("fun", +10), ("energy", +10), ("defenses", +10)]) event = events.PersonalEvent("assets/events/social/friend1_pos", None, "contento_cocinar", u"Muy contento", "pos", None, m(2), probability, effect, u"¡Qué rico que cocinamos!", "", 1, happy_2) _events.append(event) @@ -345,25 +345,25 @@ class AppLoader: # Parents probability = ("any", [("housekeeping", "indirect", 30, 30)]) - effect = effects.Effect(bars_controller, [("housekeeping", -10)]) + effect = effects.Effect([("housekeeping", -10)]) event = events.SocialEvent(father_neg, father, "ayuda_cocinar", u"Ayudar a cocinar", "neg", None, m(5), probability, effect, u"¿Vamos a cocinar algo juntos?", "", 1, normal) event.add_restriction("place", ["livingroom", "bedroom"]) _events.append(event) probability = ("any", [("housekeeping", "indirect", 30, 30)]) - effect = effects.Effect(bars_controller, [("housekeeping", -10)]) + effect = effects.Effect([("housekeeping", -10)]) event = events.SocialEvent(mother_neg, mother, "ayuda_limpiar", u"Ayudar con la limpieza", "neg", None, m(5), probability, effect, u"Recuerda ordenar y\nlimpiar tu cuarto.", "", 1, normal) event.add_restriction("place", ["livingroom", "bedroom"]) _events.append(event) probability = ("any", [("housekeeping", "indirect", 30, 30)]) - effect = effects.Effect(bars_controller, [("housekeeping", -10)]) + effect = effects.Effect([("housekeeping", -10)]) event = events.SocialEvent(mother_neg, mother, "ayuda_campo", u"Ayuda en el campo", "neg", None, m(5), probability, effect, u"¿Me puedes ayudar\ncon las tareas\ndel campo?", "", 1, normal) event.add_restriction("place", ["livingroom", "bedroom"]) _events.append(event) probability = ("any", [("v_frutas", "indirect", 30, 50)]) - effect = effects.Effect(bars_controller, [("defenses", -10), ("energy", -10)]) + effect = effects.Effect([("defenses", -10), ("energy", -10)]) event = events.SocialEvent(father_neg, father, "falta_verduras", u"Falta frutas y verduras", "neg", None, m(5), probability, effect, u"No comiste suficientes\nfrutas y verduras.", "id.tjyof1vhdtvp", 1, normal) event.add_restriction("place", ["livingroom", "bedroom", "square"]) _events.append(event) @@ -381,14 +381,14 @@ class AppLoader: _events.append(event) probability = ("all", [("relaxing", "indirect", 15, 90.0)]) - effect = effects.Effect(bars_controller, [("defenses", -5), ("energy", -5)]) + effect = effects.Effect([("defenses", -5), ("energy", -5)]) event = events.SocialEvent(father_neg, father, "ir_a_dormir", u"Ir a dormir", "neg", None, m(5), probability, effect, u"Llegó la hora\nde ir dormir", "id.mm0q0bwd72vv", 1, normal) event.add_restriction("place", ["livingroom", "bedroom", "square"]) event.add_restriction("time", ["night"]) _events.append(event) probability = ("all", [("overall_bar", "range", (0, 100), (80, 80))]) - effect = effects.Effect(bars_controller, [("responsability", -15)]) + effect = effects.Effect([("responsability", -15)]) event = events.SocialEvent(father_neg, father, "volver_a_casa", u"Volver a casa", "neg", None, m(2), probability, effect, u"Es tarde,\ndebes volver a casa", None, 1, normal) event.add_restriction("place", ["schoolyard", "classroom", "square"]) event.add_restriction("time", ["night"]) @@ -396,25 +396,25 @@ class AppLoader: # Teacher probability = ("all", [("farm", "indirect", 1, 75)]) - effect = effects.Effect(bars_controller, [("defenses", -5), ("energy", -5)]) + effect = effects.Effect([("defenses", -5), ("energy", -5)]) event = events.SocialEvent(teacher_pos, teacher, "huerta_preparar", u"Preparar tierra", "pos", None, None, probability, effect, u"Vamos a preparar la\ntierra para empezar\nla huerta", "id.nz1g0op683cl", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) _events.append(event) probability = ("all", [("farm", "range", (2, 25), (100, 100))]) - effect = effects.Effect(bars_controller, [("farm", -5)]) + effect = effects.Effect([("farm", -5)]) event = events.SocialEvent(teacher_pos, teacher, "huerta_sembrar", u"Sembrar", "pos", None, None, probability, effect, u"La tierra de la\nhuerta esta lista para\nsembrar algo.", "id.lq84xe5zxl1c", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) _events.append(event) probability = ("all", [("farm", "range", (26, 50), (100, 100))]) - effect = effects.Effect(bars_controller, [("farm", -5)]) + effect = effects.Effect([("farm", -5)]) event = events.SocialEvent(teacher_pos, teacher, "huerta_mantener", u"Mantener huerta", "pos", None, None, probability, effect, u"La huerta necesita\nmantenimiento.", "id.lb7rtj5o423g", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) _events.append(event) probability = ("all", [("farm", "range", (51, 75), (100, 100))]) - effect = effects.Effect(bars_controller, [("farm", -5)]) + effect = effects.Effect([("farm", -5)]) event = events.SocialEvent(teacher_pos, teacher, "huerta_cosechar", u"Cosechar", "pos", None, None, probability, effect, u"¡Juupi! En la huerta\nhay vegetales listos\npara cosechar.", "id.8qqtv41o4kam", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) _events.append(event) @@ -426,112 +426,113 @@ class AppLoader: _events.append(event) probability = ("all", [("farm", "range", (1, 25), (10, 10))]) - effect = effects.Effect(bars_controller, [("farm", -20)]) + effect = effects.Effect([("farm", -20)]) event = events.SocialEvent(teacher_neg, teacher, "huerta_erosion", u"Erosión en la huerta", "neg", None, None, probability, effect, u"¡Uf! La lluvia dañó\nnuestra huerta.", "", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) event.add_restriction("weather", ["rainy"]) _events.append(event) probability = ("all", [("farm", "range", (51, 75), (10, 10))]) - effect = effects.Effect(bars_controller, [("farm", -5)]) + effect = effects.Effect([("farm", -5)]) event = events.SocialEvent(teacher_neg, teacher, "huerta_seca", u"La huerta se secó", "neg", None, None, probability, effect, u"¡Uf! Los plantines se\nsecaron con el calor.", 1, 150) event.add_restriction("place", ["classroom", "schoolyard"]) event.add_restriction("weather", ["hot"]) _events.append(event) probability = ("all", [("farm", "range", (75, 100), (10, 10))]) - effect = effects.Effect(bars_controller, [("farm", -5)]) + effect = effects.Effect([("farm", -5)]) event = events.SocialEvent(teacher_neg, teacher, "huerta_tormenta", u"Tormenta daña huerta", "neg", None, None, probability, effect, u"¡Dios mio, una\ntormenta destrozó\nnuestra huerta!", "", 1, normal) event.add_restriction("place", ["classroom", "schoolyard"]) event.add_restriction("weather", ["rainy"]) _events.append(event) probability = ("all", [("homework", "direct", 75, 80)]) - effect = effects.Effect(bars_controller, [("homework", 5)]) + effect = effects.Effect([("homework", 5)]) event = events.SocialEvent(teacher_pos, teacher, "sote", u"Un sote", "pos", None, m(2), probability, effect, u"¡Muy bien, tienes un SOTE!", "", 1, normal) event.add_restriction("place", ["classroom", "schoolyard", "livingroom", "bedroom"]) _events.append(event) probability = ("all", [("overall_bar", "range", (0, 100), (100, 100))]) - effect = effects.Effect(bars_controller, [("homework", -10)]) + effect = effects.Effect([("homework", -10)]) event = events.SocialEvent(teacher_neg, teacher, "tunica", u"Sin túnica", "neg", None, m(5), probability, effect, u"¡Debes usar tu túnica\nen el aula!", "", 1, normal) event.add_restriction("place", ["classroom"]) event.add_restriction("clothes", ["regular"]) _events.append(event) probability = ("all", [("b_teeth", "indirect", 50, 100)]) - effect = effects.Effect(bars_controller, [("h_check", -10), ("b_teeth", -10)]) + effect = effects.Effect([("h_check", -10), ("b_teeth", -10)]) event = events.SocialEvent(teacher_neg, teacher, "cepillar_dientes", u"Cepillar dientes", "neg", None, None, probability, effect, u"Tienes que cepillarte\nlos dientes después\nde comer", "id.kb5hjowcg47d", 1, normal) event.add_restriction("place", ["classroom"]) _events.append(event) # Doctor probability = ("all", [("h_check", "indirect", 10, 90)]) - effect = effects.Effect(bars_controller, [("h_check", -5)]) + effect = effects.Effect([("h_check", -5)]) event = events.SocialEvent(doctor_neg, doctor, "control_salud", u"Control de salud", "neg", None, m(5), probability, effect, u"Hace tiempo que\nno te veo para un\ncontrol de salud.", "id.ng2amhr4x7gm", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) probability = ("all", [("v_frutas", "indirect", 15, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10)]) event = events.SocialEvent(doctor_neg, doctor, "falta_vitaminas", u"Falta vitaminas", "neg", None, m(5), probability, effect, u"Debes consumir suficientes\nvitaminas para estar\nsaludable.", "id.yigvxy2572ym", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) probability = ("all", [("l_quesos", "indirect", 15, 80), ("c_huevos", "indirect", 15, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10)]) event = events.SocialEvent(doctor_neg, doctor, "falta_proteinas", u"Falta proteínas", "neg", None, m(5), probability, effect, u"Necesitas proteínas.\nSon nutritientes básicos\npara nuestra vida.", "id.s39z55w4679l", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) probability = ("all", [("v_frutas", "indirect", 15, 80), ("c_leguminosas", "indirect", 15, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10)]) event = events.SocialEvent(doctor_neg, doctor, "falta_fibras", u"Falta fibras", "neg", None, m(5), probability, effect, u"Acuérdate de consumir\ntodos los días alimentos\nricos en fibras.", "id.cqmvj24se15y", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) probability = ("all", [("agua", "indirect", 15, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10)]) event = events.SocialEvent(doctor_neg, doctor, "falta_agua", u"Falta agua", "neg", None, m(5), probability, effect, u"Recuerda tomar suficiente\nagua con este calor.", "id.8xy2r5xi8xgw", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) event.add_restriction("weather", ["hot"]) _events.append(event) probability = ("all", [("c_leguminosas", "indirect", 15, 80), ("energy", "indirect", 15, 80)]) - effect = effects.Effect(bars_controller, [("energy", -10), ("defenses", -10)]) + effect = effects.Effect([("energy", -10), ("defenses", -10)]) event = events.SocialEvent(doctor_neg, doctor, "falta_carbohidratos", u"Falta carbohidratos", "neg", None, m(5), probability, effect, u"Recuerda que los carbohidratos\nson una importante fuente\nde energía.", "id.ugyv9gkcna2i", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) probability = ("all", [("physica", "direct", 80, 90), ("hygiene", "direct", 80, 90), ("h_check", "direct", 80, 90)]) - effect = effects.Effect(bars_controller, [("h_check", +10)]) + effect = effects.Effect([("h_check", +10)]) event = events.SocialEvent(doctor_pos, doctor, "estas_saludable", u"Estás saludable", "pos", None, m(2), probability, effect, u"Bien, tu control de\nsalud indica que estás\nsaludable.", "id.ctawbbooru2u", 1, normal) event.add_restriction("place", ["square", "schoolyard"]) _events.append(event) # AMIG@ probability = ("all", [("sports", "direct", 70, 80)]) - effect = effects.Effect(bars_controller, [("energy", +5), ("fun", +10)]) + effect = effects.Effect([("energy", +5), ("fun", +10)]) event = events.SocialEvent(friend_pos, self.get_friend(), "nuevos_amigos", u"Me hice nuevos amigos", "pos", None, m(2), probability, effect, u"¿Quieres participar conmigo\nen el campeonato?", "", 1, normal) _events.append(event) probability = ("all", [("sports", "direct", 80, 80)]) - effect = effects.Effect(bars_controller, [("energy", +5), ("fun", +15)]) + effect = effects.Effect([("energy", +5), ("fun", +15)]) event = events.SocialEvent(friend_pos, self.get_friend(), "amigo_alienta", u"Un amigo me alienta", "pos", None, m(2), probability, effect, u"¡Muy bien!\nHiciste muchos goles.", "", 1, normal) _events.append(event) probability = ("all", [("hygiene", "direct", 70, 80)]) - effect = effects.Effect(bars_controller, [("energy", +5), ("fun", +15)]) + effect = effects.Effect([("energy", +5), ("fun", +15)]) event = events.SocialEvent(friend_pos, self.get_friend(), "amigo_cumplido", u"Un amigo me da un cumplido", "pos", None, m(2), probability, effect, u"¡Te ves bien!", "", 1, normal) _events.append(event) probability = ("all", [("sports", "indirect", 25, 80)]) - effect = effects.Effect(bars_controller, [("energy", -5), ("weight", +1)]) + effect = effects.Effect([("energy", -5), ("weight", +1)]) event = events.SocialEvent(friend_neg, self.get_friend(), "amigo_deportes", u"Amigo invita a hacer deportes", "neg", None, m(2), probability, effect, u"¿Vamos a hacer deporte\npara el campeonato?", "id.cfzkxmujas29", 1, normal) _events.append(event) for event in _events: if event.effect: + event.effect.set_bar_controller(bars_controller) event.effect.effect_status_list = map(per_minute, event.effect.effect_status_list) # Convert to values per control interval return _events diff --git a/Saludame.activity/effects.py b/Saludame.activity/effects.py index 1147cb4..26da261 100644 --- a/Saludame.activity/effects.py +++ b/Saludame.activity/effects.py @@ -5,13 +5,13 @@ class Effect: Represents effects that affect directly on the status bars. """ - def __init__(self, bars_controller, effect_satatus_list, consequences=[]): + def __init__(self, effect_satatus_list, consequences=[], change_time=False): """ Los effect_status son tuplas (id_barra, increase_rate) """ - self.bars_controller = bars_controller self.effect_status_list = effect_satatus_list # list of tuples (bar_id, increase_rate) self.consequences = consequences # list of event_id that can trigger, only one with probability > 0 will be triggered + self.change_time = change_time def activate(self, factor): for bar_id, increase_rate in self.effect_status_list: @@ -20,6 +20,12 @@ class Effect: def set_bar_controller(self, bars_controller): self.bars_controller = bars_controller + def set_change_time(self, change): + self.change_time = change + + def get_change_time(self): + return self.change_time + def get_consequence(self, events_dict, bars_value_dic, restrictions): """ Iterates between the possible consequences and returns the first one with probability > 0 """ for c in self.consequences: @@ -28,45 +34,35 @@ class Effect: event.update_probability(bars_value_dic, restrictions, True) if event.get_probability() > 0: return event - -class LocationEffect: + + def get_new_place(self): + return None + + def get_new_clothes(self): + return None + + +class LocationEffect(Effect): """ Represents effects that set the character location. """ - def __init__(self, game_manager, place_id): - self.game_manager = game_manager + def __init__(self, place_id): + Effect.__init__(self, []) self.place_id = place_id - def activate(self, factor): - self.game_manager.set_character_location(self.place_id) - - def set_game_manager(self, game_manager): - self.game_manager = game_manager - - def get_consequence(self): - return - - def get_effect_list(self): - return [] - -class ClothesEffect: + def get_new_place(self): + return self.place_id + + +class ClothesEffect(Effect): """ Represents effects that set the character clothes. """ - def __init__(self, game_manager, clothes_id): - self.game_manager = game_manager + def __init__(self, clothes_id): + Effect.__init__(self, []) self.clothes_id = clothes_id - - def activate(self, factor): - self.game_manager.set_character_clothes(self.clothes_id) - - def set_game_manager(self, game_manager): - self.game_manager = game_manager - - def get_consequence(self): - return - def get_effect_list(self): - return [] + def get_new_clothes(self): + return self.clothes_id diff --git a/Saludame.activity/game_manager.py b/Saludame.activity/game_manager.py index 094f305..b46f0a4 100644 --- a/Saludame.activity/game_manager.py +++ b/Saludame.activity/game_manager.py @@ -190,7 +190,8 @@ class GameManager: """ outdoor = self.places_dictionary[self.character.current_place]["outdoor"] affected_bars = self.weather_effects[(self.character.clothes, self.current_weather[0], outdoor)] - effect = effects.Effect(self.bars_controller, affected_bars) + effect = effects.Effect(affected_bars) + effect.set_bar_controller(self.bars_controller) self.environment_effect = effect print "environment effect updated: ", affected_bars @@ -309,21 +310,10 @@ class GameManager: def execute_action(self, action_id, action_label=None): action = self.get_action(action_id) - if action: - if isinstance(action.effect, effects.Effect): #this action affects status bars - self.set_active_action(action_id) - self.check_forbidden_action(action, action_label) - elif isinstance(action.effect, effects.LocationEffect): #this action affects character location - if self.active_char_action: - self.interrupt_active_action(None) - action.perform(1) - action.reset() - elif isinstance(action.effect, effects.ClothesEffect): #this action affects character clothes - if self.active_char_action: - self.interrupt_active_action(None) - action.perform(1) - action.reset() - + if action and action.effect: + self.set_active_action(action_id) + self.check_forbidden_action(action, action_label) + def check_forbidden_action(self, action, action_label): for evt in self.active_events + self.active_social_events: forbidden_actions = self.events_forbidden_actions.get(evt.name) @@ -369,7 +359,7 @@ class GameManager: def set_active_action(self, action_id): """ - Set the active char actions + Sets the active char action, and asks the gui to show it """ if not self.active_char_action: #if there is not an active character action action = self.get_action(action_id) @@ -379,8 +369,7 @@ class GameManager: action.perform(0) self.windows_controller.show_action_animation(action) self.active_char_action = action - - + def get_action(self, action_id): """ Returns the action asociated to the id_action @@ -388,10 +377,7 @@ class GameManager: for action in self.actions_list: if action.id == action_id: return action - - def get_lowest_bar(self): - return self.bars_controller.get_lowest_bar() - + def __try_solve_events(self, action_id): """Try to solve an active event with the active character action""" @@ -415,7 +401,7 @@ class GameManager: prob = self.events_actions_res.get( (evt.name, action_id) ) if prob: rand = random.randint(0, 100) - print "TRYING SOLVE: %s perfroming: %s with probability: %s" % (evt.name, action_id, prob) + print "TRYING SOLVE: %s performing: %s with probability: %s" % (evt.name, action_id, prob) if rand <= prob: print "EVENT SOLVED" return True @@ -453,22 +439,41 @@ class GameManager: # check if the action ended if self.active_char_action.time_left == 0: - # perform missed cicles - self.active_char_action.perform(self.count) - - # restore background + self.finish_action() + + def finish_action(self): + # perform missed cicles + self.active_char_action.perform(self.count) + + if self.active_char_action.effect: + effect = self.active_char_action.effect + + new_place = effect.get_new_place() + if new_place: + # The action changed character's place + self.set_character_location(new_place) + else: + # Restore background if self.active_char_action.background: - self.set_character_location(self.old_place) - - # reset the action - self.active_char_action.reset() + self.set_character_location(self.old_place) + + new_clothes = effect.get_new_clothes() + if new_clothes: + self.set_character_clothes(new_clothes) - # check consequences should be triggered - cons = self.active_char_action.effect.get_consequence(self.events_dict, self.bars_controller.get_bars_status(), self.get_restrictions()) - self.active_char_action = None - if cons: - self.check_consequence_event(cons) - + change_time = effect.get_change_time() + if change_time: + self.change_time() + + # reset the action + self.active_char_action.reset() + + # check consequences should be triggered + cons = self.active_char_action.effect.get_consequence(self.events_dict, self.bars_controller.get_bars_status(), self.get_restrictions()) + self.active_char_action = None + if cons: + self.check_consequence_event(cons) + def __control_background_actions(self): """ Controls active background actions. @@ -806,6 +811,9 @@ class GameManager: # Challenges + def get_lowest_bar(self): + return self.bars_controller.get_lowest_bar() + def __control_challenges(self): if self.challenge_cicles == 0: self.challenge_cicles = CHALLENGES_INTERVAL |