From d624bda258190e27225c12997ff312661a4be8b5 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Wed, 29 Jan 2025 23:31:58 +0100 Subject: [PATCH] feat(escoria4): ported fregadero der and izq --- .../assets/turno_cocina_bol_lentejas_agua.png | Bin 18012 -> 0 bytes gymkhana/items/inventory/turno_cocina_bol.esc | 6 --- .../items/inventory/turno_cocina_bol.tscn | 4 +- .../turno_cocina_bol_lentejas_agua.esc | 5 --- .../turno_cocina_bol_lentejas_agua.tscn | 38 ------------------ .../turno_cocina/cocina/esc/fregadero_der.esc | 22 +++++----- .../turno_cocina/cocina/esc/fregadero_izq.esc | 19 +++++---- .../turno_cocina/cocina/jarra_volcada.tscn | 24 +++++------ gymkhana/translations/turno_cocina.csv | 4 ++ 9 files changed, 41 insertions(+), 81 deletions(-) delete mode 100644 gymkhana/items/inventory/assets/turno_cocina_bol_lentejas_agua.png delete mode 100644 gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc delete mode 100644 gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn diff --git a/gymkhana/items/inventory/assets/turno_cocina_bol_lentejas_agua.png b/gymkhana/items/inventory/assets/turno_cocina_bol_lentejas_agua.png deleted file mode 100644 index 9afe44fd74137c51870d5cf860398e9687ca490d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18012 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 diff --git a/gymkhana/items/inventory/turno_cocina_bol.esc b/gymkhana/items/inventory/turno_cocina_bol.esc index 0915cd2c..f8ce98f4 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.esc +++ b/gymkhana/items/inventory/turno_cocina_bol.esc @@ -11,9 +11,3 @@ inventory_remove turno_cocina_bol inventory_add turno_cocina_peso_bol say current_player "Ya puedo pesar ingredientes!" - -:action3 cocina_fregadero_der - say current_player "Necesito algo más grande" - -:action3 cocina_fregadero_izq - say current_player "Necesito algo más grande" diff --git a/gymkhana/items/inventory/turno_cocina_bol.tscn b/gymkhana/items/inventory/turno_cocina_bol.tscn index 83b89700..e344edab 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol.tscn @@ -23,9 +23,7 @@ custom_data = { } } action3_target_texts = { -"turno_cocina_peso": "Poner el bol sobre el peso", -"cocina_fregadero_der": "Llenar", -"cocina_fregadero_izq": "Llenar" +"turno_cocina_peso": "Poner el bol sobre el peso" } target_when_selected_action_is_in = [ "action3" ] animations = null diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc deleted file mode 100644 index 8237a83e..00000000 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc +++ /dev/null @@ -1,5 +0,0 @@ -:action1 - say player "Que cosa tan curiosa" - -:action2 - say player "No lo quiero coger" diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn deleted file mode 100644 index 22da4da6..00000000 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn +++ /dev/null @@ -1,38 +0,0 @@ -[gd_scene load_steps=5 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_bol_lentejas_agua.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) - -[node name="turno_cocina_bol_lentejas_agua" type="Area2D"] -process_mode = 1 -script = ExtResource( 1 ) -global_id = "turno_cocina_bol_lentejas_agua" -esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) -custom_data = { - "tooltips": { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar dentro", - "action4": "Usar" - } -} -animations = null - -[node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) - -[node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc index 85420f70..d505020e 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc @@ -1,11 +1,15 @@ :action1 - say player "Parece que funciona." - play_lib_snd cocina_fregadero_der -:action2 - say player "No tengo donde meter el agua." + play_lib_snd($cocina_fregadero_der) + say($player, "Agua de manantial, que lujo.", "cocina_fregadero_action1_say") -:action3 turno_cocina_olla_vacia - play_lib_snd cocina_fregadero_der - say player "Agua a ojo... en su justa medida." - inventory_remove turno_cocina_olla_vacia - inventory_add turno_cocina_olla_llena \ No newline at end of file +:action2 + say($player, "No tengo donde meter el agua.", "cocina_fregadero_action2_say") + +:action3 $turno_cocina_olla_vacia + play_lib_snd($cocina_fregadero_der) + say($player, "Agua a ojo... en su justa medida.", "cocina_fregadero_action3_olla_vacia_say") + inventory_remove($turno_cocina_olla_vacia) + inventory_add($turno_cocina_olla_llena) + +:action3 turno_cocina_bol + say($player, "Debería poner el agua en lo que vaya a usar para cocinar.", "cocina_fregadero_action3_bol_say") diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc index e728df94..e459eff0 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc @@ -1,12 +1,15 @@ :action1 - play_lib_snd cocina_fregadero_izq - say player "Parece que funciona." + play_lib_snd($cocina_fregadero_izq) + say($player, "Agua de manantial, que lujo.", "cocina_fregadero_action1_say") :action2 - say player "No tengo donde meter el agua." + say($player, "No tengo donde meter el agua.", "cocina_fregadero_action2_say") -:action3 turno_cocina_olla_vacia - play_lib_snd cocina_fregadero_izq - say player "Agua a ojo... en su justa medida." - inventory_remove turno_cocina_olla_vacia - inventory_add turno_cocina_olla_llena \ No newline at end of file +:action3 $turno_cocina_olla_vacia + play_lib_snd($cocina_fregadero_izq) + say($player, "Agua a ojo... en su justa medida.", "cocina_fregadero_action3_olla_vacia_say") + inventory_remove($turno_cocina_olla_vacia) + inventory_add($turno_cocina_olla_llena) + +:action3 turno_cocina_bol + say($player, "Debería poner el agua en lo que vaya a usar para cocinar.", "cocina_fregadero_action3_bol_say") diff --git a/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn b/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn index f0e515b2..9e12a2ca 100644 --- a/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn @@ -1,24 +1,24 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=3 uid="uid://byfyg5p0h02br"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture2D" id=2] +[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="2"] [node name="turno_cocina_jarra_volcada" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_jarra_volcada" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra_volcada.esc" -dialog_color = Color( 1, 1, 1, 1 ) - +combine_when_selected_action_is_in = PackedStringArray() +inventory_texture = ExtResource("2") custom_data = { - "tooltips": { - "action1": "Mirar", - "action2": "Poner en su sitio", - } +"tooltips": { +"action1": "Mirar", +"action2": "Poner en su sitio" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] rotation = -0.0698132 -scale = Vector2( 0.18, 0.18 ) -texture = ExtResource( 2 ) +scale = Vector2(0.18, 0.18) +texture = ExtResource("2") diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv index 54813190..f977107a 100644 --- a/gymkhana/translations/turno_cocina.csv +++ b/gymkhana/translations/turno_cocina.csv @@ -68,9 +68,13 @@ cocina_puerta_detras_action1,,,Ir detrás cocina_pan_action1,,,Mirar cocina_pan_action2,,,Picotear cocina_fregadero_action1,,,Mirar fregadero +cocina_fregadero_action1_say,,,"Agua de manantial, que lujo." cocina_fregadero_action2,,,Usar +cocina_fregadero_action2_say,,,No tengo donde meter el agua. cocina_fregadero_action3_bol,,,Llenar de agua +cocina_fregadero_action3_bol_say,,,Debería poner el agua en lo que vaya a usar para cocinar. cocina_fregadero_action3_olla_vacia,,,Llenar la olla de agua +cocina_fregadero_action3_olla_vacia_say,,,Agua a ojo... en su justa medida. cocina_cuchillos_action1,,,Contar los cuchillos cocina_cuchillos_action1_say,,,"Uno, dos, tres, cuatro, cinco, seis, siete, ocho, nueve, diez y once." cocina_cuchillos_action1_say_cuchillo_in_inventory,,,"Que raro, sigue habiendo once cuchillos."