diff --git a/gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png b/gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png deleted file mode 100644 index d6b5178a..00000000 Binary files a/gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png and /dev/null differ diff --git a/gymkhana/characters/talking-heads/assets/oier-avatar-talking.png b/gymkhana/characters/talking-heads/assets/oier-avatar-talking.png deleted file mode 100644 index c55df558..00000000 Binary files a/gymkhana/characters/talking-heads/assets/oier-avatar-talking.png and /dev/null differ diff --git a/gymkhana/characters/talking-heads/eneko.tscn b/gymkhana/characters/talking-heads/eneko.tscn deleted file mode 100644 index 15ec6f8f..00000000 --- a/gymkhana/characters/talking-heads/eneko.tscn +++ /dev/null @@ -1,79 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://cnpjc4783bqsj"] - -[ext_resource type="Resource" uid="uid://c4lhcwvjqx5ty" path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" id="1"] -[ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://c5g44ifbgf5fo" path="res://gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png" id="3"] - -[sub_resource type="AtlasTexture" id="2"] -atlas = ExtResource("3") -region = Rect2(0, 0, 72, 72) - -[sub_resource type="AtlasTexture" id="3"] -atlas = ExtResource("3") -region = Rect2(0, 0, 72, 72) - -[sub_resource type="AtlasTexture" id="4"] -atlas = ExtResource("3") -region = Rect2(72, 0, 72, 72) - -[sub_resource type="SpriteFrames" id="1"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("2") -}], -"loop": true, -"name": &"idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("3") -}, { -"duration": 1.0, -"texture": SubResource("4") -}], -"loop": true, -"name": &"speak", -"speed": 5.0 -}] - -[sub_resource type="CircleShape2D" id="5"] -radius = 40.1123 - -[node name="ESCPlayerWithTooltip2" type="Area2D"] -process_mode = 1 -script = ExtResource("2") -global_id = "eneko_head" -is_interactive = false -is_movable = true -player_orients_on_arrival = false -combine_when_selected_action_is_in = [] -dialog_color = Color(0, 0.560784, 0.0470588, 1) -custom_data = { -"tooltips": { -"action1": "cocina_delante_eneko_smoking_action1", -"action2": "cocina_delante_eneko_smoking_action2" -} -} -action3_target_texts = { -"turno_cocina_frontal": "Ofrecer", -"turno_cocina_madera": "Ofrecerle leña" -} -target_when_selected_action_is_in = ["action3"] -selectable = true -animations = ExtResource("1") - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(-1, 0) -scale = Vector2(1.67778, 1.67778) -frames = SubResource("1") -animation = "speak" -flip_h = true - -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(-1, -153) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(0, 1) -shape = SubResource("5") diff --git a/gymkhana/characters/talking-heads/oier.tscn b/gymkhana/characters/talking-heads/oier.tscn deleted file mode 100644 index 96308361..00000000 --- a/gymkhana/characters/talking-heads/oier.tscn +++ /dev/null @@ -1,80 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://cepk612gi1akw"] - -[ext_resource type="Resource" uid="uid://c4lhcwvjqx5ty" path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" id="1"] -[ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://c7y54yhu3kxh5" path="res://gymkhana/characters/talking-heads/assets/oier-avatar-talking.png" id="3"] - -[sub_resource type="AtlasTexture" id="2"] -atlas = ExtResource("3") -region = Rect2(0, 0, 72, 72) - -[sub_resource type="AtlasTexture" id="3"] -atlas = ExtResource("3") -region = Rect2(0, 0, 72, 72) - -[sub_resource type="AtlasTexture" id="4"] -atlas = ExtResource("3") -region = Rect2(72, 0, 72, 72) - -[sub_resource type="SpriteFrames" id="1"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("2") -}], -"loop": true, -"name": &"idle", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("3") -}, { -"duration": 1.0, -"texture": SubResource("4") -}], -"loop": true, -"name": &"speak", -"speed": 5.0 -}] - -[sub_resource type="CircleShape2D" id="5"] -radius = 40.1123 - -[node name="ESCPlayerWithTooltip2" type="Area2D"] -process_mode = 1 -script = ExtResource("2") -global_id = "oier_head" -is_interactive = false -is_movable = true -player_orients_on_arrival = false -combine_when_selected_action_is_in = [] -dialog_color = Color(0.584314, 0.490196, 0.270588, 1) -custom_data = { -"tooltips": { -"action1": "cocina_delante_eneko_smoking_action1", -"action2": "cocina_delante_eneko_smoking_action2" -} -} -action3_target_texts = { -"turno_cocina_frontal": "Ofrecer", -"turno_cocina_madera": "Ofrecerle leña" -} -target_when_selected_action_is_in = ["action3"] -selectable = true -animations = ExtResource("1") - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(-1, 0) -scale = Vector2(1.67778, 1.67778) -frames = SubResource("1") -animation = "speak" -flip_h = true - -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(-1, -153) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -visible = false -position = Vector2(0, 1) -shape = SubResource("5") diff --git a/gymkhana/items/inventory/assets/turno_cocina_patata.png b/gymkhana/items/inventory/assets/turno_cocina_patata.png index 64814acf..64fb31fe 100644 Binary files a/gymkhana/items/inventory/assets/turno_cocina_patata.png and b/gymkhana/items/inventory/assets/turno_cocina_patata.png differ diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc b/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc index 98f22cac..e3696918 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.esc @@ -1,2 +1,2 @@ :action3 - say($player, "Parece la cantidad exacta de lentejas") + say($player, "Parece un kilo exacto de lentejas.", "turno_cocina_bol_action1_say") diff --git a/gymkhana/items/inventory/turno_cocina_carton.esc b/gymkhana/items/inventory/turno_cocina_carton.esc index 73010dc2..a8448986 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.esc +++ b/gymkhana/items/inventory/turno_cocina_carton.esc @@ -1,13 +1,13 @@ :action1 - say($player, "Una caja de cartón vacía.", "TODO_I18N") + say($player, "Una caja de cartón vacía.", "cocina_delante_carton_action1_say") :action2 - say($player, "Cartón pa la saca!", "TODO_I18N") + say($player, "Cartón pa la saca!", "cocina_delante_carton_action2_say") set_active($turno_cocina_carton, false) inventory_add($turno_cocina_carton) :action3 - say($player, "Es una caja de cartón vacía.", "TODO_I18N") + say($player, "Es una caja de cartón vacía.", "cocina_delante_carton_action3_say") :action3 "turno_cocina_mechero" - say($player, "El mechero no tiene gas, no puedo encender el cartón.", "TODO_I18N") + say($player, "El mechero no tiene gas, no puedo encender el cartón.", "cocina_delante_carton_action4_say") diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 9e054d25..59a5d251 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -293,7 +293,7 @@ process_mode = 1 z_index = 1001 position = Vector2(2202, 343) rotation = -0.270526 -scale = Vector2(0.65, 0.65) +scale = Vector2(0.5, 0.5) script = ExtResource("6") global_id = "cocina_patata" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc" @@ -301,19 +301,6 @@ combine_when_selected_action_is_in = PackedStringArray() inventory_texture = ExtResource("13") inventory_texture_hovered = ExtResource("13") 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": "tooltip_cocina_patata_action1", "action2": "tooltip_cocina_patata_action2" @@ -328,7 +315,7 @@ texture = ExtResource("13") [node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"] z_index = 1001 position = Vector2(9.0867, -13.5233) -polygon = PackedVector2Array(1.61475, 3.71887, 8.86548, 12.1157, 5.32715, 19.1171, -2.24731, 23.4026, -16.8235, 24.1499, -29.7551, 18.9672, -29.593, 12.626, -23.5007, 7.92932, -14.0325, 2.57251) +polygon = PackedVector2Array(4.29102, 2.70483, 14.7856, 9.76636, 12.1133, 19.4026, 2.26636, 24.9736, -21.0713, 26.8035, -35.9553, 20.6005, -35.7446, 12.3569, -30.2866, 7.64404, -23.436, 5.39294, -16.0503, 1.2146, -5.34521, 0.0324707) [node name="turno_cocina_patata_location" type="Marker2D" parent="cocina_patata"] position = Vector2(93.1357, 65.3632) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc index f4f2684b..325cb070 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc @@ -1,8 +1,17 @@ +:setup + global turno_cocina_economica_encendida + :action1 - say($player, "Yo diría que sirve para cocinar.", "cocina_economica_action1_say") + if turno_cocina_economica_encendida: + say($player, "Está calentita, lista para cocinar.", "cocina_economica_action1_say_encendida") + else: + say($player, "Yo diría que sirve para cocinar.", "cocina_economica_action1_say") :action2 - say($player, "No encuentro el interruptor.", "cocina_economica_action2_say") + if turno_cocina_economica_encendida: + say($player, "Ya está encendida. Al final no había interruptor.", "cocina_economica_action2_say_encendida") + else: + say($player, "No encuentro el interruptor.", "cocina_economica_action2_say") :action3 "turno_cocina_olla_vacia" say($player, "Debería llenar la olla de agua primero.", "cocina_economica_action3_olla_vacia_say") @@ -23,7 +32,7 @@ :action3 "turno_cocina_carton_encendido" if turno_cocina_economica_con_madera: - global turno_cocina_economica_encendida = true + turno_cocina_economica_encendida = true inventory_remove($turno_cocina_carton_encendido) say($player, "He encendido la cocina, a cocinar!", "cocina_economica_action3_carton_encendido_say_madera_used") else: diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv index 040cbe4b..6621f93b 100644 --- a/gymkhana/translations/turno_cocina.csv +++ b/gymkhana/translations/turno_cocina.csv @@ -109,6 +109,10 @@ cocina_delante_eneko_madera_option4_3,,,"Varias veces." tooltip_cocina_delante_pegatinas_action1,,,"Observar pegatinas" tooltip_cocina_delante_pegatinas_action2,,,"Coger una pegatina" cocina_delante_pegatinas_action2_done,,,"Soy más listo que el hambre." +cocina_delante_carton_action1_say,,,"Una caja de cartón vacía." +cocina_delante_carton_action2_say,,,"Cartón pa la saca!" +cocina_delante_carton_action3_say,,,"Es una caja de cartón vacía." +cocina_delante_carton_action4_say,,,"El mechero no tiene gas, no puedo encender el cartón." turno_cocina_eneko_action3_mechero,,,"Enserio!?!? Me das un mechero sin gas? No lo quiero." pegatinas_action2_eneko_smoking_say,,,"Eh! las pegatinas no se tocan" cocina_delante_eneko_smoking_action1,,,"Observar sujeto" @@ -177,7 +181,7 @@ cocina_libro_de_cocina_intro_action3_9,,,"Voy a contárselo a Eneko." cocina_libro_de_cocina_action3_1,,,"A ver...." cocina_libro_de_cocina_action3_2,,,"Lentejas con patatas:" cocina_libro_de_cocina_action3_3,,,"4 patatas medianas" -cocina_libro_de_cocina_action3_4,,,"1 kg de lentejas" +cocina_libro_de_cocina_action3_4,,,"1 kg exacto de lentejas" cocina_libro_de_cocina_action3_romero,,,"Tambien hay un dibujo de una hierba con la palabra ROMERO." tooltip_cocina_debajo_sofa_action1,,,"Mirar debajo del sofa" cocina_debajo_sofa_action1_say,,,"No se ve nada." @@ -196,8 +200,10 @@ cocina_patata_action2_say,,,"Bien! La primera patata!" cocina_patata_action2_say_patata_grande_in_inventory,,,"La patata gigante no cuenta, es demasiado grande." cocina_patata_action2_say_patata_in_inventory,,,"Otra patata!" cocina_economica_action1_say,,,"Yo diría que sirve para cocinar." +cocina_economica_action1_say_encendida,,,"Está calentita, lista para cocinar." cocina_economica_action2,,,"Encender la económica" cocina_economica_action2_say,,,"No encuentro el interruptor." +cocina_economica_action2_say_encendida,,,"Ya está encendida. Al final no había interruptor." tooltip_cocina_economica_action3_carton,,,"Meter cartón en la económica" cocina_economica_action3_carton_say,,,"Debería encender el cartón antes de meterlo." tooltip_cocina_economica_action3_carton_encendido,,,"Encender la económica" @@ -298,6 +304,7 @@ tooltip_turno_cocina_libro_de_cocina_action3,,,"Leer" tooltip_turno_cocina_patata_action3,,,"Contar las patatas" tooltip_turno_cocina_ajo_action1,,,"Coger ajo" tooltip_turno_cocina_bol_action1,,,"Coger un bol" +turno_cocina_bol_action1_say,,,"Parece un kilo exacto de lentejas." tooltip_common_whats_this,,,"¿Que es esto?" tooltip_common_pick,,,"Coger" tooltip_common_look,,,"Mirar"