From 63cf13a452a84905cc30fd3e65753e997e403ead Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Fri, 3 Mar 2023 19:46:43 +0100 Subject: [PATCH] fix(rich_tooltip): use action3 and action4 texts if item in inventory --- .../esc_rich_tooltip.gd | 14 ++++++++++---- .../rooms/trasera_cocina/esc/i_bombona2.esc | 2 +- .../rooms/trasera_cocina/trasera_cocina.tscn | 17 ++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd b/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd index 65e0bf99..817360d2 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd @@ -144,11 +144,17 @@ func update_tooltip_text(): if(current_target_object == null): return - $tooltip1.visible = current_target_object.action1_text != ""; - $tooltip1/label.text = current_target_object.action1_text + var itemInInventory = escoria.inventory_manager.inventory_has(current_target_object.global_id) - $tooltip2.visible = current_target_object.action2_text != ""; - $tooltip2/label.text = current_target_object.action2_text + var action1_text = current_target_object.action1_text if !itemInInventory else current_target_object.action3_text + var action2_text = current_target_object.action2_text if !itemInInventory else current_target_object.action4_text + + + $tooltip1/label.text = action1_text + $tooltip1.visible = action1_text != ""; + + $tooltip2/label.text = action2_text + $tooltip2.visible = action2_text != ""; diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc index 38adecc6..b8806bd0 100644 --- a/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc @@ -10,6 +10,6 @@ inventory_add i_bombona2 say player "Es el segundo bolsillo más grande que he visto nunca" :action4 -say player "Antes era una bombona pero ahora es una llave inglesa." +say player "Tiene pinta de dibujo animado" say player "¿Esto es real?" say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 95650278..45130420 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -86,15 +86,15 @@ position = Vector2( 583, 414 ) script = ExtResource( 28 ) global_id = "i_bombona" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona.esc" -tooltip_name = "TT Mirar bombona" +tooltip_name = "Mirar bombona" combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "TT Mirar bombona" -action2_text = "TT2 Coger bombona" +action1_text = "Mirar bombona" +action2_text = "Coger bombona" action3_text = "¿Cómo ha entrado en mi bolsillo?" action4_text = "¿Por qué es una llave inglesa?" -tooltip2_name = "TT2 Coger bombona" +tooltip2_name = "Coger bombona" animations = null [node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )] @@ -102,16 +102,15 @@ position = Vector2( 355, 409 ) script = ExtResource( 28 ) global_id = "i_bombona2" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc" -tooltip_name = "TT Mirar bombona" combine_when_selected_action_is_in = [ "action1", "action3" ] use_from_inventory_only = true inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "TT Mirar bombona" -action2_text = "TT2 Coger bombona" +action1_text = "Mirar bombona" +action2_text = "Coger bombona" action3_text = "Usar" -action4_text = "¿Por qué es una llave inglesa?" -tooltip2_name = "TT Mirar bombona" +action4_text = "¿Por qué es un dibujo animado?" +tooltip2_name = "Mirar bombona" animations = null [node name="Columna" type="Sprite" parent="."]