Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 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]
@@ -7,6 +7,7 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" type="Texture" id=7]
+[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8]
 
 [sub_resource type="NavigationPolygon" id=1]
 vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 36, 211, 193, 193, 175, 286, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 )
@@ -96,3 +97,21 @@ polygon = PoolVector2Array( 5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506
 position = Vector2( 1131, 460 )
 script = ExtResource( 5 )
 global_id = "puerta_detras_start"
+
+[node name="EnekoSmoking" parent="." instance=ExtResource( 8 )]
+position = Vector2( 813, 440 )
+tooltip_name = "Objervar sujeto"
+dialog_color = Color( 0, 1, 0.462745, 1 )
+action1_text = "Objervar sujeto"
+action2_text = "Hablar"
+action3_target_texts = {
+"bombona2": "Toma, un regalo",
+"caja_herramientas": "Regalar"
+}
+target_when_selected_action_is_in = [ "action3" ]
+selectable = true
+
+[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"]
+position = Vector2( -44, 82 )
+script = ExtResource( 5 )
+global_id = "eneko_smoking"

gymkhana/rooms/turno_cocina/despensa/despensa.tscn

@@ -178,6 +178,7 @@ dialog_color = Color( 1, 1, 1, 1 )
 action1_text = "Mirar dentro"
 action2_text = "Coger"
 action3_target_texts = {
+"turno_cocina_bol": "Coger lentejas a ojo",
 "turno_cocina_peso_bol": "Coger las lentejas exactas"
 }
 target_when_selected_action_is_in = [ "action3" ]

gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc

@@ -4,8 +4,11 @@
 :action2
     say player "Necesito cogerlas con algo."
 
+:action3 turno_cocina_bol
+    say player "No quiero hacer lentejas para un ejercito, debería coger la cantidad justa."
+
 :action3 turno_cocina_peso_bol
-    say player "Con esto suficiente"
+    say player "Con esto suficiente."
     inventory_remove turno_cocina_peso_bol
     inventory_add turno_cocina_bol_lentejas
     inventory_add turno_cocina_peso