diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index e0a9760e..e9b4b2b0 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -75,6 +75,7 @@ say player "Espero que disfrutes el juego y buena suerte!" set_active cocina_delante_puerta_cocina true set_active cocina_delante_puerta_despensa true set_active cocina_delante_puerta_detras true +set_global cocina_delante_catando false > [turno_cocina_ingrediente_patatas,turno_cocina_ingrediente_ajo_en_lentejas,turno_cocina_ingrediente_romero] play_video res://gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv set_active eneko_smoking true @@ -105,6 +106,7 @@ set_active cocina_delante_puerta_detras true - cocina_delante_intro_dialog_catar:"Ya he hecho las lentejas!" [turno_cocina_ingrediente_lentejas,turno_cocina_economica_encendida] stop_snd play_video res://gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv + set_global cocina_delante_catando true set_active eneko_smoking false set_active turno_cocina_ajo true [!turno_cocina_ingrediente_ajo_cogido] set_active cocina_delante_puerta_cocina false diff --git a/gymkhana/items/inventory/assets/bombona.png b/gymkhana/items/inventory/assets/bombona.png deleted file mode 100644 index a333363c..00000000 Binary files a/gymkhana/items/inventory/assets/bombona.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/hacha.png b/gymkhana/items/inventory/assets/hacha.png deleted file mode 100644 index d30fda7d..00000000 Binary files a/gymkhana/items/inventory/assets/hacha.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/turno_cocina_pegatina.png b/gymkhana/items/inventory/assets/turno_cocina_pegatina.png new file mode 100644 index 00000000..106826ba Binary files /dev/null and b/gymkhana/items/inventory/assets/turno_cocina_pegatina.png differ diff --git a/gymkhana/items/inventory/turno_cocina_pegatina.esc b/gymkhana/items/inventory/turno_cocina_pegatina.esc new file mode 100644 index 00000000..bd422340 --- /dev/null +++ b/gymkhana/items/inventory/turno_cocina_pegatina.esc @@ -0,0 +1,3 @@ +:action3 +say player "'Solo el pueblo salva al pueblo'" +say player "Ha valido la pena correr el riesgo de que Eneko me pillara." diff --git a/gymkhana/items/inventory/turno_cocina_pegatina.tscn b/gymkhana/items/inventory/turno_cocina_pegatina.tscn new file mode 100644 index 00000000..f8d55418 --- /dev/null +++ b/gymkhana/items/inventory/turno_cocina_pegatina.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] +[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_pegatina.png" type="Texture" id=2] + +[node name="turno_cocina_pegatina" type="Area2D"] +pause_mode = 1 +script = ExtResource( 1 ) +global_id = "turno_cocina_pegatina" +esc_script = "res://gymkhana/items/inventory/turno_cocina_pegatina.esc" +combine_when_selected_action_is_in = [ "action4" ] +inventory_texture = ExtResource( 2 ) +dialog_color = Color( 1, 1, 1, 1 ) +custom_data = { + "tooltips": { + "action3": "Mirar", + } +} +animations = null + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( -2, 0 ) +scale = Vector2( 0.5, 0.5 ) +texture = ExtResource( 2 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc index d4eb1a24..3b51bdf4 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc @@ -1,9 +1,18 @@ :action1 - say_sequence current_player turno_cocina_pegatinas 5 true +say_sequence current_player turno_cocina_pegatinas 5 true :action2 - say_random eneko_smoking turno_cocina_pegatinas_eneko_smoking 4 - say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 2] - say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 10] - say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 20] - \ No newline at end of file +> [cocina_delante_catando, !i/turno_cocina_pegatina] + inventory_add turno_cocina_pegatina + say player "Soy más listo que el hambre." + stop +> [cocina_delante_catando, i/turno_cocina_pegatina] + say player "Mejor no pasarse." + stop +> [!cocina_delante_catando] + say_random eneko_smoking turno_cocina_pegatinas_eneko_smoking 4 + say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 2] + say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 5] + say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 10] + say eneko_smoking "Deja de intentarlo! Llevas ya {turno_cocina_pegatinas_eneko_smoking_count} veces!" [eq turno_cocina_pegatinas_eneko_smoking_count 20] + stop diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv index beadd906..10d68d08 100644 --- a/gymkhana/translations/turno_cocina.csv +++ b/gymkhana/translations/turno_cocina.csv @@ -35,7 +35,7 @@ cocina_delante_intro_dialog_end_res,,, cocina_delante_intro_dialog_end_res_player,,, cocina_delante_pegatinas_action1,,,"Observar pegatinas" cocina_delante_pegatinas_action2,,,"Coger una pegatina" -pegatinas_action2_eneko_smoking_say,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan +pegatinas_action2_eneko_smoking_say,"Eh! las pegatinas no se tocan","Eh! las pegatinas no se tocan","Eh! las pegatinas no se tocan" cocina_delante_eneko_smoking_action1,,,"Observar sujeto" cocina_delante_eneko_smoking_action2,,,"Hablar" cocina_delante_puerta_detras_action1,,,"Ir detrás" diff --git a/saves/save_003.tres b/saves/save_003.tres new file mode 100644 index 00000000..1daad8e5 --- /dev/null +++ b/saves/save_003.tres @@ -0,0 +1,455 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] + +[resource] +script = ExtResource( 1 ) +escoria_version = "1.0.0" +game_version = "0.1.0" +name = "cocina encendida con lentejas" +date = { +"day": 25, +"dst": true, +"hour": 19, +"minute": 33, +"month": 10, +"second": 12, +"weekday": 5, +"year": 2024 +} +main = { +"current_scene_filename": "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn", +"last_scene_global_id": "cocina" +} +globals = { +"ESC_CURRENT_SCENE": "cocina", +"ESC_DIALOG_CHOSEN_OPTION": "Agur", +"ESC_LAST_SCENE": "cocina_delante", +"FORCE_LAST_SCENE_NULL": false, +"cocina_delante_intro_played": true, +"cocina_intro_played": true, +"intro_dialog2_playing": false, +"new_game": true, +"turno_cocina_cocina_gas_encendida": false, +"turno_cocina_economica_con_madera": true, +"turno_cocina_economica_con_olla": true, +"turno_cocina_economica_encendida": true, +"turno_cocina_eneko_catando": false, +"turno_cocina_ingrediente_ajo_en_lentejas": false, +"turno_cocina_ingrediente_lentejas": true, +"turno_cocina_ingrediente_patatas": false, +"turno_cocina_ingrediente_romero": false, +"turno_cocina_libro_leido_count": 0 +} +inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_mechero" ] +objects = { +"_music": { +"active": true, +"interactive": true, +"playback_position": 18.4065, +"state": "res://gymkhana/sounds/music_loop.ogg" +}, +"_sound": { +"active": true, +"interactive": true, +"playback_position": 4.62113, +"state": "default" +}, +"_speech": { +"active": true, +"interactive": true, +"state": "default" +}, +"cocina": { +"_camera": { +"active": true, +"interactive": true, +"state": "default", +"target": "player" +}, +"cocina_cuchillos": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Contar los cuchillos", +"action2": "Coger un buen cuchillo" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_debajo_sofa": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar debajo del sofa", +"action2": "Meter la mano" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_der": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar fregadero", +"action2": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_fregadero_izq": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar el fregadero", +"action2": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_patata": { +"active": true, +"custom_data": { +"count_textures": [ { +"start": 1, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" +}, { +"start": 2, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" +}, { +"start": 3, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" +}, { +"start": 4, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" +} ], +"tooltips": { +"action1": "Admirar la patata", +"action2": "Cogerla" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_delante": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Salir de la cocina" +} +}, +"interactive": true, +"state": "default" +}, +"cocina_puerta_detras": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Ir detrás" +} +}, +"interactive": true, +"state": "default" +}, +"player": { +"active": true, +"custom_data": { +}, +"global_transform": Transform2D( 1.1498, 0, 0, 1.1498, 2546, 547 ), +"interactive": false, +"last_deg": 71, +"last_dir": 4, +"state": "speak_down" +}, +"puerta_delante_start": { +"active": true, +"interactive": true, +"state": "default" +}, +"puerta_detras_start": { +"active": true, +"interactive": true, +"state": "default" +}, +"turno_cocina_bol": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Coger un bol", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_cocina_gas": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Encender" +} +}, +"interactive": true, +"state": "apagado" +}, +"turno_cocina_cuerno": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar el cuerno", +"action2": "Coger el cuerno", +"action3": "Mirar el cuerno", +"action4": "Tocar el cuerno" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_economica": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Leer" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_mechero": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_olla_llena": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar dentro", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_peso": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "¿Que es esto?", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +} +}, +"cocina_delante": { +"turno_cocina_bol": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Coger un bol", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_frontal": { +"active": true, +"custom_data": { +"tooltips": { +"action3": "frontal_action3", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Leer" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_olla_llena": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "Mirar dentro", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_peso": { +"active": true, +"custom_data": { +"tooltips": { +"action1": "¿Que es esto?", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": false, +"state": "default" +} +}, +"cocina_detras": { +"turno_cocina_carton": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_libro_de_cocina": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Leer" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_madera": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "cocina_delante_madera_action1", +"action2": "cocina_delante_madera_action2", +"action3": "cocina_delante_madera_action3", +"action4": "cocina_delante_madera_action4" +} +}, +"interactive": true, +"state": "default" +} +}, +"despensa": { +"turno_cocina_bol_lentejas": { +"active": true, +"custom_data": { +"tooltips": { +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_carton": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_madera": { +"active": false, +"custom_data": { +"tooltips": { +"action1": "cocina_delante_madera_action1", +"action2": "cocina_delante_madera_action2", +"action3": "cocina_delante_madera_action3", +"action4": "cocina_delante_madera_action4" +} +}, +"interactive": true, +"state": "default" +}, +"turno_cocina_peso_usado": { +"active": true, +"custom_data": { +"tooltips": { +"action3": "Mirar" +} +}, +"interactive": true, +"state": "default" +} +} +} +events = { +"events_queue": { +"_front": [ ] +}, +"sched_events": [ ] +} +terrain_navpolys = { +"cocina": { +"NavigationPolygonInstance": true +} +} +settings = { +"custom_settings": { +"a_custom_setting": 100 +}, +"escoria_version": "1.0.0", +"fullscreen": false, +"master_volume": 0.391, +"music_volume": 0.649, +"sfx_volume": 1.0, +"speech_enabled": true, +"speech_volume": 1.0, +"text_lang": "es", +"voice_lang": "fr_FR" +} +custom_data = { +"ui_type": "rtmi-ui" +}