diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index c87dc311..ce74f14c 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -86,7 +86,7 @@ say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de p - "Que haces?" say current_player "Que haces aqui?" say eneko_smoking "Fumar" - say eneko_smoking "no lo ves?" + say eneko_smoking "No lo ves?" - "Agur" say current_player "Agur yogur!" #turn_to eneko_smoking player @@ -114,3 +114,17 @@ say eneko_smoking "No quiero una caja vacía" [!caja_herramientas_with_wrench] stop say eneko_smoking "¿Estás loco? ¿No ves que estoy fumando?" set_global bombona2_offered 1 + +:action3 turno_cocina_frontal +> [!turno_cocina_frontal_debajo_sofa] + say eneko_smoking "No tengas prisa por devolvérmela, aun puede serte de utilidad." + say eneko_smoking "(guiño, guiño)" + stop +> [turno_cocina_frontal_debajo_sofa] + inventory_remove turno_cocina_frontal + say eneko_smoking "Menos mal, no tiene ni un rasguño." + say eneko_smoking "Le tengo mucho cariño. Te he contado que me la regaló mi abuelo?" + say eneko_smoking "Espera... fue el abuelo o la tía?" + say eneko_smoking "Bueno, no me acuerdo, fue hace mucho tiempo." + say eneko_smoking "Pero es mía, eso seguro." + say eneko_smoking "De toda la vida." diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index a58008ff..2313d738 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -43,9 +43,19 @@ script = ExtResource( 2 ) global_id = "eneko_smoking" esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" is_movable = true -combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = ExtResource( 1 ) +tooltips = { +"action1": "cocina_delante_eneko_smoking_action1", +"action2": "cocina_delante_eneko_smoking_action2" +} +action3_target_texts = { +"caja_herramientas": "Regalar", +"turno_cocina_frontal": "Ofrecer", +"turno_cocina_madera": "Ofrecerle leña", +} +target_when_selected_action_is_in = [ "action3" ] +selectable = true [node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( 32.625, -50.56 ) diff --git a/gymkhana/items/inventory/turno_cocina_frontal.esc b/gymkhana/items/inventory/turno_cocina_frontal.esc index 586bc15b..5d6abae8 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.esc +++ b/gymkhana/items/inventory/turno_cocina_frontal.esc @@ -1,3 +1,2 @@ :action3 -say player frontal_action3_say:"Es mi frontal de toda la vida, le tengo cariño" - +say player frontal_action3_say:"Me la ha dejado Eneko. Me ha dicho que la cuide, que se la regaló su abuelo." diff --git a/gymkhana/items/inventory/turno_cocina_madera.tscn b/gymkhana/items/inventory/turno_cocina_madera.tscn index add07725..6b19671f 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.tscn +++ b/gymkhana/items/inventory/turno_cocina_madera.tscn @@ -21,3 +21,4 @@ tooltips = { "action4": "cocina_delante_madera_action4" } animations = null +combine_when_selected_action_is_in = [ "action4" ] diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 68c5b46f..1a7801f6 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -109,16 +109,6 @@ global_id = "puerta_detras_start" [node name="EnekoSmoking" parent="." instance=ExtResource( 8 )] position = Vector2( 813, 440 ) dialog_color = Color( 0, 1, 0.462745, 1 ) -tooltips = { -"action1": "cocina_delante_eneko_smoking_action1", -"action2": "cocina_delante_eneko_smoking_action2" -} -action3_target_texts = { -"caja_herramientas": "Regalar", -"turno_cocina_frontal": "Ofrecer" -} -target_when_selected_action_is_in = [ "action3" ] -selectable = true [node name="ESCLocation" type="Position2D" parent="EnekoSmoking"] position = Vector2( -44, 82 ) @@ -161,7 +151,6 @@ script = ExtResource( 5 ) [node name="turno_cocina_madera" parent="." instance=ExtResource( 10 )] position = Vector2( 1505, 160 ) scale = Vector2( 0.880435, 0.88735 ) -combine_when_selected_action_is_in = [ ] [node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"] position = Vector2( 396.395, 87.9022 )