From f0c61093e373814258ab1b097102c4d79c8c3090 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sat, 27 Jan 2024 00:37:50 +0100 Subject: [PATCH] feat: encender la economica --- gymkhana/items/inventory/assets/hacha-inv.png | Bin 1256 -> 0 bytes .../assets/turno_cocina_carton_encendido.png | Bin 0 -> 16606 bytes .../items/inventory/turno_cocina_carton.esc | 11 +++++-- .../items/inventory/turno_cocina_carton.tscn | 30 ++++++++---------- .../turno_cocina_carton_encendido.esc | 2 ++ .../turno_cocina_carton_encendido.tscn | 27 ++++++++++++++++ .../rooms/turno_cocina/cocina/cocina.tscn | 25 ++++++++++++--- .../turno_cocina/cocina/esc/cocina_gas.esc | 7 ++++ .../turno_cocina/cocina/esc/economica.esc | 22 ++++++++++--- 9 files changed, 97 insertions(+), 27 deletions(-) delete mode 100644 gymkhana/items/inventory/assets/hacha-inv.png create mode 100644 gymkhana/items/inventory/assets/turno_cocina_carton_encendido.png create mode 100644 gymkhana/items/inventory/turno_cocina_carton_encendido.esc create mode 100644 gymkhana/items/inventory/turno_cocina_carton_encendido.tscn diff --git a/gymkhana/items/inventory/assets/hacha-inv.png b/gymkhana/items/inventory/assets/hacha-inv.png deleted file mode 100644 index c5f7fb7ed83c7d7f6166bf26b860f66787dfb13e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1256 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 F{|6u-Tp9oX literal 0 HcmV?d00001 diff --git a/gymkhana/items/inventory/turno_cocina_carton.esc b/gymkhana/items/inventory/turno_cocina_carton.esc index db47f32c..93e1d9ef 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.esc +++ b/gymkhana/items/inventory/turno_cocina_carton.esc @@ -1,6 +1,13 @@ :action1 -say player "Que cosa tan curiosa" +say player "Una caja de cartón vacía." :action2 -say player "No lo quiero coger" +say player "Cartón pa la saca!" +set_active turno_cocina_carton false +inventory_add turno_cocina_carton +:action3 +say player "Es una caja cartón de vacía. ¿Qué haría al lado de la económica?" + +:action3 turno_cocina_mechero +say player "El mechero no tiene gas, no puedo encender el cartón." diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn index a5a88780..0083439f 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton.tscn @@ -1,36 +1,34 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://gymkhana/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_carton.png" type="Texture" 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_carton" type="Area2D"] pause_mode = 1 +rotation = 1.11177 script = ExtResource( 1 ) global_id = "turno_cocina_carton" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc" +combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar dentro", - "action4": "Usar" +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" } animations = null +action3_target_texts = { +"turno_cocina_mechero": "Encender el cartón" +} +target_when_selected_action_is_in = [ "action3" ] + [node name="Sprite" type="Sprite" 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="Position2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) diff --git a/gymkhana/items/inventory/turno_cocina_carton_encendido.esc b/gymkhana/items/inventory/turno_cocina_carton_encendido.esc new file mode 100644 index 00000000..20b14891 --- /dev/null +++ b/gymkhana/items/inventory/turno_cocina_carton_encendido.esc @@ -0,0 +1,2 @@ +:action3 +say player "Con esto ya puedo encender lo que quiera." diff --git a/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn new file mode 100644 index 00000000..edd26ae9 --- /dev/null +++ b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://gymkhana/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_carton_encendido.png" type="Texture" id=2] + +[node name="turno_cocina_carton_encendido" type="Area2D"] +pause_mode = 1 +rotation = 1.11177 +script = ExtResource( 1 ) +global_id = "turno_cocina_carton_encendido" +esc_script = "res://gymkhana/items/inventory/turno_cocina_carton_encendido.esc" +combine_when_selected_action_is_in = [ "action4" ] +inventory_texture = ExtResource( 2 ) +dialog_color = Color( 1, 1, 1, 1 ) +tooltips = { +"action3": "Mirar", +"action4": "Usar" +} +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( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index a5e08d13..de556425 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] @@ -14,6 +14,7 @@ [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=13] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=15] [sub_resource type="NavigationPolygon" id=3] vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 ) @@ -283,8 +284,10 @@ tooltips = { } action3_target_texts = { "turno_cocina_madera": "Meter leña en la económica", +"turno_cocina_olla_llena": "Poner encima de la económica", "turno_cocina_olla_vacia": "Poner encima de la económica", -"turno_cocina_olla_llena": "Poner encima de la económica" +"turno_cocina_carton": "Meter cartón en la económica", +"turno_cocina_carton_encendido": "Encender la económica" } target_when_selected_action_is_in = [ "action3" ] animations = null @@ -326,9 +329,10 @@ tooltips = { "action2": "Encender" } action3_target_texts = { +"turno_cocina_carton": "Prender el cartón", "turno_cocina_mechero": "Encender el gas", -"turno_cocina_olla_vacia": "Cocinar al gas", -"turno_cocina_olla_llena": "Cocinar al gas" +"turno_cocina_olla_llena": "Cocinar al gas", +"turno_cocina_olla_vacia": "Cocinar al gas" } target_when_selected_action_is_in = [ "action3" ] animations = null @@ -349,3 +353,16 @@ scale = Vector2( 1.06318, 1.06318 ) position = Vector2( -160.838, 201.283 ) script = ExtResource( 5 ) interaction_direction = 3 + +[node name="turno_cocina_carton" parent="." instance=ExtResource( 15 )] +position = Vector2( 1586, 536 ) +rotation = 1.44513 +scale = Vector2( 0.8, 0.8 ) + +[node name="turno_cocina_carton_collision" type="CollisionPolygon2D" parent="turno_cocina_carton"] +position = Vector2( 15.9014, -11.2695 ) +polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.1329, -1.61511, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 ) + +[node name="turno_cocina_carton_location" type="Position2D" parent="turno_cocina_carton"] +position = Vector2( 93.7431, -73.8329 ) +script = ExtResource( 5 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc index 428890b9..11f757dc 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc @@ -9,6 +9,13 @@ say player "Ya tengo fuego, que listo soy!" [!turno_cocina_cocina_gas_encendida] say player "Ya está encendida." [turno_cocina_cocina_gas_encendida] set_global turno_cocina_cocina_gas_encendida true +:action3 turno_cocina_carton +say player "No puedo hacerlo con la cocina apagada." [!turno_cocina_cocina_gas_encendida] +say player "Muy bien, ya tengo una llama portable!" [turno_cocina_cocina_gas_encendida] +set_global turno_cocina_cocina_gas_encendida false +inventory_remove turno_cocina_carton +inventory_add turno_cocina_carton_encendido + :action3 turno_cocina_olla_vacia say player "Mejor uso la económica, sino seguro que Eneko me riñe." diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc index 871c1e91..dd0f13d8 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc @@ -1,19 +1,31 @@ :action1 -say player "Yo diria que sirve para cocinar." +say current_player "Yo diria que sirve para cocinar." :action2 -say player "No pienso poner la mano encima." +say current_player "No pienso poner la mano encima." :action3 turno_cocina_olla_vacia -say player "Debería llenar la olla de agua primero." +say current_player "Debería llenar la olla de agua primero." :action3 turno_cocina_olla_llena -say player "Me siento un cocinero de verdad." +say current_player "Me siento un cocinero de verdad." set_global turno_cocina_economica_con_olla true set_active turno_cocina_olla_llena true inventory_remove turno_cocina_olla_llena :action3 turno_cocina_madera -say player "Más madera que es la guerra!" +say current_player "Más madera que es la guerra!" set_global turno_cocina_economica_con_madera true inventory_remove turno_cocina_madera + +:action3 turno_cocina_carton +say current_player "Prefiero meter el cartón cuando esté encendido." + +:action3 turno_cocina_carton_encendido +> [!turno_cocina_economica_con_madera] + say current_player "Debería meter leña primero." + stop +> [turno_cocina_economica_con_madera] + say current_player "He encendido la cocina, a cocinar!" + set_global turno_cocina_economica_encendida true + inventory_remove turno_cocina_carton_encendido