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

gymkhana/items/inventory/turno_cocina_bol_lentejas.esc

@@ -1,6 +1,2 @@
-:action1
-say player "Que cosa tan curiosa"
-
-:action2
-say player "No lo quiero coger"
-
+:action3
+say player "Parece la cantidad exacta de lentejas"

gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn

@@ -15,12 +15,10 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc"
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
+    "action3": "Mirar",
     "action4": "Usar"
 }
-
+combine_when_selected_action_is_in = [ "action4" ]
 animations = null
 
 [node name="Sprite" type="Sprite" parent="."]

gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc

@@ -1,6 +1,24 @@
 :action1
-say player "Que cosa tan curiosa"
+say player "Hay varios libros de recetas"
 
 :action2
-say player "No lo quiero coger"
+say player "Este libro de recetas tiene buena pinta"
+inventory_add turno_cocina_libro_de_cocina
+set_active turno_cocina_libro_de_cocina false
+
+:action3
+say player "a ver...."
+say player "Lentejas con patatas:"
+say player "4 patatas medianas"
+say player "1 kg de lentejas"
+say player "1 diente de ajo"
+set_global turno_cocina_hint_romero true [eq turno_cocina_libro_leido_count 4]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 4]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 8]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 12]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 16]
+say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 20]
+
+
+inc_global turno_cocina_libro_leido_count
 

gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn

@@ -1,36 +1,20 @@
-[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_libro_de_cocina.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_libro_de_cocina" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_libro_de_cocina"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc"
+combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
-    "action4": "Usar"
+"action1": "¿Que es esto?",
+"action2": "Coger",
+"action3": "Mirar dentro",
+"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="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 )

gymkhana/items/inventory/turno_cocina_olla_llena.esc

@@ -1,2 +1,33 @@
+:action1
+    say player "Está llena de agua"
+    say player "lentejas" [turno_cocina_ingrediente_lentejas]
+    say player "patatas" [turno_cocina_ingrediente_patatas]
+    say player "ajo" [turno_cocina_ingrediente_ajo]
+    say player "romero" [turno_cocina_ingrediente_romero]
+    
+
+:action2
+    say player "Ya la estoy usando."
+
 :action3
     say player "Está llena de agua." 
+
+
+:action3 turno_cocina_bol_lentejas
+    say player "Lentejas pa'entro"
+    inventory_remove turno_cocina_bol_lentejas
+    inventory_add turno_cocina_bol_inventario
+    set_global turno_cocina_ingrediente_lentejas true
+
+
+
+:action3 turno_cocina_patata
+    say player "Tienen que ser 4 patatas" [!eq count/turno_cocina_patata 4]
+    say player "Patatas pa'entro" [eq count/turno_cocina_patata 4]
+    inventory_remove turno_cocina_patata [eq count/turno_cocina_patata 4]
+    set_global turno_cocina_ingrediente_patatas true [eq count/turno_cocina_patata 4]
+
+:action3 turno_cocina_romero
+    say player "Romero pa'entro"
+    set_global turno_cocina_ingrediente_romero true
+    inventory_remove turno_cocina_romero

gymkhana/items/inventory/turno_cocina_olla_llena.tscn

@@ -1,29 +1,34 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 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_olla_inv_con_agua.png" type="Texture" id=2]
+[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture" id=3]
 
 [node name="turno_cocina_olla_llena" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_olla_llena"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc"
+interaction_direction = 3
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
 "action1": "Mirar dentro",
 "action3": "Mirar",
-"action4": "Poner encima de la económica"
+"action4": "Usar"
 }
-action4_target_texts = {
+action3_target_texts = {
 "turno_cocina_ajo": "Echar en la olla.",
 "turno_cocina_bol_lentejas": "Echar en la olla.",
 "turno_cocina_patata": "Echar en la olla.",
 "turno_cocina_romero": "Echar en la olla."
 }
-target_when_selected_action_is_in = [ "action4" ]
+target_when_selected_action_is_in = [ "action3" ]
 animations = null
 
+[node name="Sprite" type="Sprite" parent="."]
+texture = ExtResource( 3 )
+
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-polygon = PoolVector2Array( -18, -4, -5, 18, 17, 4, 20, -13, -12, -29 )
+polygon = PoolVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 )

gymkhana/items/inventory/turno_cocina_olla_vacia.tscn

@@ -16,7 +16,7 @@ tooltips = {
 "action1": "Mirar",
 "action2": "Coger",
 "action3": "Mirar",
-"action4": "Llenar de agua"
+"action4": "Usar"
 }
 animations = null
 

gymkhana/items/inventory/turno_cocina_patata.tscn

@@ -16,6 +16,7 @@ inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
 "action3": "Contar las patatas",
+"action4": "Usar",
 }
 action3_target_texts = {
 "turno_cocina_cuchillo": "Pelar patatas"

gymkhana/items/inventory/turno_cocina_romero.esc

@@ -1,2 +1,17 @@
+#
+#  ToDO: una posible idea seria que eneko o el libro de recetas te puedan dar la pista.
+#        - Si es en el libro de recetas... podria ser que haga falta leerlo.
+#        - Si es eneko... podria ser que le puedas preguntar como le gustan las lentejas.
+#
+
+:action1
+say player "Hay muchas llervas"
+
+:action2
+say player "No sabria cual coger." [!turno_cocina_hint_romero]
+say player "¡Esta parece romero!" [turno_cocina_hint_romero]
+inventory_add turno_cocina_romero [turno_cocina_hint_romero]
+set_active turno_cocina_romero false [turno_cocina_hint_romero]
+
 :action3
-    say player "Creo que es romero"
+say player "Casi seguro que es romero"

gymkhana/items/inventory/turno_cocina_romero.tscn

@@ -3,16 +3,19 @@
 [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_romero.png" type="Texture" id=2]
 
-[node name="turno_cocina_cuchillo" type="Area2D"]
+[node name="turno_cocina_romero" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
-global_id = "turno_cocina_cuchillo"
+global_id = "turno_cocina_romero"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_romero.esc"
+interaction_direction = 6
 combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-animations = null
 tooltips = {
-  "action3": "Mirar",
-  "action4": "Usar",
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
 }
+animations = null