From 41496f5d52fb7bc324fefc4fbb8ed3dc1ed9b40a Mon Sep 17 00:00:00 2001
From: Eneko Nieto <eneko@eneko.ovh>
Date: Thu, 9 Mar 2023 13:29:38 +0100
Subject: [PATCH] Combine wrench with caja_herramientas and give to Eneko

---
 gymkhana/items/inventory/caja_herramientas.esc        |  8 +++++++-
 gymkhana/items/inventory/caja_herramientas.tscn       |  4 ++++
 gymkhana/items/inventory/wrench.tscn                  |  2 +-
 gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc  | 11 -----------
 gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc |  6 +++++-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/gymkhana/items/inventory/caja_herramientas.esc b/gymkhana/items/inventory/caja_herramientas.esc
index c6033990..da38e656 100644
--- a/gymkhana/items/inventory/caja_herramientas.esc
+++ b/gymkhana/items/inventory/caja_herramientas.esc
@@ -6,5 +6,11 @@ say current_player "Podria ser util!!"
 set_active caja_herramientas false
 inventory_add caja_herramientas
 
+:action3 wrench
+say current_player "Parece buen sitio para guardarla"
+inventory_remove wrench
+set_global caja_herramientas_with_wrench true
+
 :action3
-say current_player "Hay de too!"
+say current_player "Hay de too!" [caja_herramientas_with_wrench]
+say current_player "Está vacía" [!caja_herramientas_with_wrench]
diff --git a/gymkhana/items/inventory/caja_herramientas.tscn b/gymkhana/items/inventory/caja_herramientas.tscn
index ccb161b3..2842f795 100644
--- a/gymkhana/items/inventory/caja_herramientas.tscn
+++ b/gymkhana/items/inventory/caja_herramientas.tscn
@@ -20,6 +20,10 @@ action1_text = "¿Que es esto?"
 action2_text = "Coger"
 action3_text = "Mirar dentro"
 action4_text = "Usar"
+action3_target_texts = {
+"wrench": "Guardarla en la caja"
+}
+target_when_selected_action_is_in = [ "action3" ]
 animations = null
 
 [node name="Sprite" type="Sprite" parent="."]
diff --git a/gymkhana/items/inventory/wrench.tscn b/gymkhana/items/inventory/wrench.tscn
index a21c9ce5..903e71a5 100644
--- a/gymkhana/items/inventory/wrench.tscn
+++ b/gymkhana/items/inventory/wrench.tscn
@@ -16,7 +16,7 @@ action1_text = "¿Que es esto?"
 action2_text = "Coger"
 action3_text = "¿Que es esto?"
 action4_text = "Usar"
-combine_when_selected_action_is_in = PoolStringArray( "use" )
+combine_when_selected_action_is_in = [ "action4" ]
 use_from_inventory_only = true
 inventory_texture = ExtResource( 1 )
 dialog_color = Color( 1, 1, 1, 1 )
diff --git a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc
index 12ae0efe..fc60f1ee 100644
--- a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc
+++ b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc
@@ -2,22 +2,11 @@
 say player "Parece que veo a Mikel"
 
 :action2
-#say player "Esta cerrada por dentro."
 play_snd res://game/sfx/sounds/doorOpen_2.ogg
 change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn"
 
 :action3 bombona2
 say player "He usado la 'bombona' con la puerta"
-# > [eq r5_dialog_advance 2]
-# 	say player "I already fixed the water leak."
-# 	stop
-# accept_input SKIP
-# set_state r5_pipe stop_water
-# set_global r5_pipe_broken false
-# say player "The leak's now fixed."
-# set_global r5_dialog_advance 2
-# accept_input ALL
-
 
 :action4 bombona2
 say player "No creo que les haga gracia"
diff --git a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc
index 967d7a52..bded9145 100644
--- a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc
+++ b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc
@@ -45,7 +45,11 @@ set_global loom_conversation_done false
 #set_gui_visible true
 
 :action3 caja_herramientas
-say eneko_smoking "No quiero una caja vacía"
+> [caja_herramientas_with_wrench]
+	inventory_remove caja_herramientas
+	say eneko_smoking "Gracias majo!"
+	stop
+say eneko_smoking "No quiero una caja vacía" [!caja_herramientas_with_wrench]
 
 :action3 bombona2
 > [eq bombona2_offered 1]