From a938b5d38caf336c65eaa141a87547b699b6f288 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Fri, 26 Jan 2024 23:15:20 +0100 Subject: [PATCH] feat: encender cocina de gas --- .../items/inventory/turno_cocina_mechero.tscn | 17 +++-------- .../rooms/turno_cocina/cocina/cocina.tscn | 29 +++++++++++++++++++ .../turno_cocina/cocina/esc/cocina_gas.esc | 16 ++++++++++ .../turno_cocina/cocina/esc/economica.esc | 3 ++ 4 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index f8d0bfe3..d93a5394 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -1,17 +1,14 @@ -[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_mechero.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_mechero" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) global_id = "turno_cocina_mechero" esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" +combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { @@ -20,7 +17,6 @@ tooltips = { "action3": "Mirar", "action4": "Usar" } -combine_when_selected_action_is_in = [ "action4" ] animations = null [node name="Sprite" type="Sprite" parent="."] @@ -28,10 +24,5 @@ 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 ) +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 8d2926e4..a5e08d13 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -283,6 +283,7 @@ tooltips = { } action3_target_texts = { "turno_cocina_madera": "Meter leña en la económica", +"turno_cocina_olla_vacia": "Poner encima de la económica", "turno_cocina_olla_llena": "Poner encima de la económica" } target_when_selected_action_is_in = [ "action3" ] @@ -312,6 +313,34 @@ script = ExtResource( 5 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"] polygon = PoolVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 ) +[node name="turno_cocina_cocina_gas" type="Area2D" parent="."] +pause_mode = 1 +position = Vector2( 2219, 272 ) +script = ExtResource( 6 ) +global_id = "turno_cocina_cocina_gas" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc" +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +tooltips = { +"action1": "Mirar", +"action2": "Encender" +} +action3_target_texts = { +"turno_cocina_mechero": "Encender el gas", +"turno_cocina_olla_vacia": "Cocinar al gas", +"turno_cocina_olla_llena": "Cocinar al gas" +} +target_when_selected_action_is_in = [ "action3" ] +animations = null + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] +position = Vector2( 2, -33 ) +polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 ) + +[node name="ESCLocation" type="Position2D" parent="turno_cocina_cocina_gas"] +position = Vector2( -9, 95 ) +script = ExtResource( 5 ) + [node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )] position = Vector2( 1281, 491 ) scale = Vector2( 1.06318, 1.06318 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc new file mode 100644 index 00000000..428890b9 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc @@ -0,0 +1,16 @@ +:action1 +say player "Rápido y sencillo. El gas mola." + +:action2 +say player "Necesito usar un mechero para encenderla." + +:action3 turno_cocina_mechero +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_olla_vacia +say player "Mejor uso la económica, sino seguro que Eneko me riñe." + +:action3 turno_cocina_olla_llena +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 483693ad..871c1e91 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc @@ -4,6 +4,9 @@ say player "Yo diria que sirve para cocinar." :action2 say player "No pienso poner la mano encima." +:action3 turno_cocina_olla_vacia +say player "Debería llenar la olla de agua primero." + :action3 turno_cocina_olla_llena say player "Me siento un cocinero de verdad." set_global turno_cocina_economica_con_olla true