diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd b/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd index e5aa0535..dfaae5c0 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd @@ -14,6 +14,8 @@ export(String) var action3_text = "" # Action 4 tooltip text if item in inventory export(String) var action4_text = "" +export(Dictionary) var tooltips = {} + # Action 3 tooltip texts if item is target. Dictionary with tool's global id as key. export(Dictionary) var action3_target_texts = {} @@ -69,7 +71,7 @@ func highlight(value: bool): isHighlighted = value func set_tooltip(action: String, text: String): - set(action + "_text", text) + tooltips[action] = text func _input(event): if(event.is_action_pressed("ui_show_hints")): 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 e1b44054..7767f16e 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 @@ -155,8 +155,8 @@ func update_tooltip_text(): var item_in_inventory = escoria.inventory_manager.inventory_has(current_target_object.global_id) var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM - var action1_text = get_action_target_text(current_target_object.action3_target_texts) if waiting_for_target_item else current_target_object.action3_text if item_in_inventory else current_target_object.action1_text - var action2_text = get_action_target_text(current_target_object.action4_target_texts) if waiting_for_target_item else current_target_object.action4_text if item_in_inventory else current_target_object.action2_text + var action1_text = get_action_target_text(current_target_object.action3_target_texts) if waiting_for_target_item else get_tooltip_from_current_target("action3") if item_in_inventory else get_tooltip_from_current_target("action1") + var action2_text = get_action_target_text(current_target_object.action4_target_texts) if waiting_for_target_item else get_tooltip_from_current_target("action4") if item_in_inventory else get_tooltip_from_current_target("action2") $tooltip1/label.text = action1_text $tooltip1.visible = !hidden and action1_text != ""; @@ -164,7 +164,11 @@ func update_tooltip_text(): $tooltip2/label.text = action2_text $tooltip2.visible = !hidden and action2_text != ""; - +func get_tooltip_from_current_target(verb): + var tooltips = current_target_object.get('tooltips') + if(tooltips.has(verb)): + return tooltips.get(verb) + return "" func get_action_target_text(action_target_texts: Dictionary): var action_target_text = action_target_texts.get(escoria.action_manager.current_tool.global_id) return action_target_text if action_target_text else "" diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index d07e97dc..133f4222 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -123,7 +123,7 @@ func _exit_tree(): func _input(event: InputEvent) -> void: if escoria.get_escoria().is_ready_for_inputs(): if event is InputEventMouseMotion: - #_current_mouse_pos = get_global_mouse_position() + #_current_mouse_pos = get_global_mouse_position() # Escoria core _current_mouse_pos = get_viewport().get_mouse_position() update_tooltip_following_mouse_position(tooltip_node) update_tooltip_following_mouse_position(tooltip2_node) @@ -404,7 +404,7 @@ func calculateMousePosition(size: Vector2): size.x / 2 size.y / 2 #escoria.logger.info(self, "_current_mouse_pos" + String(_current_mouse_pos.x) + " gameSize: " + escoria.game_size.x) - + #return _current_mouse_pos - size return _current_mouse_pos diff --git a/gymkhana/items/inventory/caja_herramientas.tscn b/gymkhana/items/inventory/caja_herramientas.tscn index ca766591..9bba7686 100644 --- a/gymkhana/items/inventory/caja_herramientas.tscn +++ b/gymkhana/items/inventory/caja_herramientas.tscn @@ -15,10 +15,12 @@ esc_script = "res://gymkhana/items/inventory/caja_herramientas.esc" combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar dentro" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} action3_target_texts = { "wrench": "Guardarla en la caja" } diff --git a/gymkhana/items/inventory/turno_cocina_bol.tscn b/gymkhana/items/inventory/turno_cocina_bol.tscn index 1cdda32f..d8b98d1e 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol.tscn @@ -15,9 +15,11 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc" combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Coger un bol" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "Coger un bol", + "action3": "Mirar", + "action4": "Usar" +} action3_target_texts = { "turno_cocina_peso": "Poner el bol sobre el peso" } diff --git a/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn b/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn index ff35e0d9..9cdb2053 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_bol_inventario" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_inventario.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn index 75920580..9738842a 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn @@ -14,10 +14,13 @@ global_id = "turno_cocina_bol_lentejas" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} + animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn index e7c6f8db..8a334020 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_bol_lentejas_agua" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn index d4c07fae..a5a88780 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_carton" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_cuatro_patatas.tscn b/gymkhana/items/inventory/turno_cocina_cuatro_patatas.tscn index c41d823d..c22e27af 100644 --- a/gymkhana/items/inventory/turno_cocina_cuatro_patatas.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuatro_patatas.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_cuatro_patatas" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuatro_patatas.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn index 51d54911..2804555e 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_cuerno" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_dos_patatas.tscn b/gymkhana/items/inventory/turno_cocina_dos_patatas.tscn index 1956a0a6..9d45327b 100644 --- a/gymkhana/items/inventory/turno_cocina_dos_patatas.tscn +++ b/gymkhana/items/inventory/turno_cocina_dos_patatas.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_dos_patatas" esc_script = "res://gymkhana/items/inventory/turno_cocina_dos_patatas.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn index 33f825a3..e0f67c1c 100644 --- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn +++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_libro_de_cocina" esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar dentro", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_madera.tscn b/gymkhana/items/inventory/turno_cocina_madera.tscn index e5c1889b..b1110560 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.tscn +++ b/gymkhana/items/inventory/turno_cocina_madera.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_madera" esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index 9eebb56d..892c16c6 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_mechero" esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_patata.tscn b/gymkhana/items/inventory/turno_cocina_patata.tscn index 652ccae1..7ac37fc8 100644 --- a/gymkhana/items/inventory/turno_cocina_patata.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_patata" esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn index d3582897..0e6094c0 100644 --- a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn @@ -11,8 +11,10 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_patata_grande.esc" combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null diff --git a/gymkhana/items/inventory/turno_cocina_peso.tscn b/gymkhana/items/inventory/turno_cocina_peso.tscn index 2b9a1105..45c38851 100644 --- a/gymkhana/items/inventory/turno_cocina_peso.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso.tscn @@ -12,10 +12,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc" combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 3 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "¿Que es esto?" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} action3_target_texts = { "turno_cocina_bol": "Poner el bol sobre el peso" } diff --git a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn index 0a07cd98..b9403a32 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn @@ -15,10 +15,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc" combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} target_when_selected_action_is_in = [ "action3" ] animations = null diff --git a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn index 94714266..1506881e 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_peso_inventario" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_salero.tscn b/gymkhana/items/inventory/turno_cocina_salero.tscn index 0c9d143e..68175d7c 100644 --- a/gymkhana/items/inventory/turno_cocina_salero.tscn +++ b/gymkhana/items/inventory/turno_cocina_salero.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_salero" esc_script = "res://gymkhana/items/inventory/turno_cocina_salero.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/turno_cocina_tres_patatas.tscn b/gymkhana/items/inventory/turno_cocina_tres_patatas.tscn index e8785ac8..44d7e56d 100644 --- a/gymkhana/items/inventory/turno_cocina_tres_patatas.tscn +++ b/gymkhana/items/inventory/turno_cocina_tres_patatas.tscn @@ -14,10 +14,12 @@ global_id = "turno_cocina_tres_patatas" esc_script = "res://gymkhana/items/inventory/turno_cocina_tres_patatas.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "Mirar", + "action4": "Usar" +} animations = null [node name="Sprite" type="Sprite" parent="."] diff --git a/gymkhana/items/inventory/wrench.tscn b/gymkhana/items/inventory/wrench.tscn index 4ae380d3..e11e0c06 100644 --- a/gymkhana/items/inventory/wrench.tscn +++ b/gymkhana/items/inventory/wrench.tscn @@ -12,10 +12,12 @@ pause_mode = 1 script = ExtResource( 3 ) global_id = "wrench" esc_script = "res://gymkhana/items/inventory/wrench.esc" -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "¿Que es esto?" -action4_text = "Usar" +tooltips = { + "action1": "¿Que es esto?", + "action2": "Coger", + "action3": "¿Que es esto?", + "action4": "Usar" +} combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 1 ) dialog_color = Color( 1, 1, 1, 1 ) diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index e76cd303..dcb47147 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -59,8 +59,10 @@ global_id = "l_exit" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Esto es una puerta y tiene una descripcion mu larga" -action2_text = "Entrar! con descricion..." +tooltips = { + "action1": "Esto es una puerta y tiene una descripcion mu larga", + "action2": "Entrar! con descricion..." +} action3_target_texts = { "bombona2": "Usar la bombona con la puerta?" } @@ -88,6 +90,9 @@ tooltip_name = "Mirar bombona" inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) action1_text = "Mirar bombona" +tooltips = { + "action1": "Mirar bombona" +} animations = null [node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )] @@ -97,10 +102,12 @@ global_id = "bombona2" esc_script = "res://gymkhana/items/inventory/bombona2.esc" inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar bombona" -action2_text = "Coger bombona" -action3_text = "Usar" -action4_text = "¿Por qué es un dibujo animado?" +tooltips = { + "action1": "Mirar bombona", + "action2": "Coger bombona", + "action3": "Usar", + "action4": "¿Por qué es un dibujo animado?" +} animations = null [node name="Columna" type="Sprite" parent="."] @@ -113,8 +120,10 @@ texture = ExtResource( 25 ) position = Vector2( 959, 413 ) tooltip_name = "Objervar sujeto" dialog_color = Color( 0, 1, 0.462745, 1 ) -action1_text = "Objervar sujeto" -action2_text = "Hablar" +tooltips = { + "action1": "Objervar sujeto", + "action2": "Hablar" +} action3_target_texts = { "bombona2": "Toma, un regalo", "caja_herramientas": "Regalar" diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 750cba66..9e45425c 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -59,7 +59,9 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc" is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Ir detrás" +tooltips = { + "action1": "Ir detrás" +} animations = null [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] @@ -81,7 +83,9 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc" is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Salir de la cocina" +tooltips = { + "action1": "Salir de la cocina" +} animations = null [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] @@ -125,8 +129,10 @@ global_id = "cocina_fregadero_der" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar fregadero" -action2_text = "Usar" +tooltips = { + "action1": "Mirar fregadero", + "action2": "Usar" +} action3_target_texts = { "turno_cocina_bol": "Llenar el bol de agua", "turno_cocina_bol_lentejas": "Llenar el bol de agua" @@ -148,8 +154,10 @@ global_id = "cocina_fregadero_izq" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar fregadero" -action2_text = "Usar" +tooltips = { + "action1": "Mirar fregadero", + "action2": "Usar" +} action3_target_texts = { "turno_cocina_bol": "Llenar el bol de agua", "turno_cocina_bol_lentejas": "Llenar el bol de agua" @@ -171,8 +179,10 @@ global_id = "cocina_debajo_sofa" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc" combine_when_selected_action_is_in = [ "action4" ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar debajo del sofa" -action2_text = "Meter la mano" +tooltips = { + "action1": "Mirar debajo del sofa", + "action2": "Meter la mano" +} action3_target_texts = { "turno_cocina_frontal": "Mirar denajo del sofa" } diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 68a15ffe..dc430c77 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -44,7 +44,9 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Entrar en la cocina" +tooltips = { + "action1": "Entrar en la cocina" +} animations = null [node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] @@ -65,7 +67,9 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despen is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Bajar a la despensa" +tooltips = { + "action1": "Bajar a la despensa" +} animations = null [node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"] @@ -86,7 +90,9 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Ir detrás" +tooltips = { + "action1": "Ir detrás" +} animations = null [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] @@ -101,10 +107,11 @@ 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" +tooltips = { + "action1": "Observar sujeto", + "action2": "Hablar" +} action3_target_texts = { "bombona2": "Toma, un regalo", "caja_herramientas": "Regalar" diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 3e3a1475..448ce65f 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -43,7 +43,9 @@ global_id = "cocina_detras_puerta_cocina" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Entrar en la cocina" +tooltips = { + "action1": "Entrar en la cocina" +} animations = null [node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] @@ -63,7 +65,9 @@ global_id = "cocina_detras_puerta_delante" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc" is_exit = true dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Ir delante" +tooltips = { + "action1": "Ir delante" +} animations = null [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] diff --git a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn index 1961ff9f..ea03721a 100644 --- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn +++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn @@ -46,8 +46,10 @@ esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Salir fuera" animations = null +tooltips = { + "action1": "Salir fuera" +} [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"] position = Vector2( 129, -721 ) @@ -73,8 +75,10 @@ global_id = "turno_cocina_despensa_cebolla_izq" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar cebollas" -action2_text = "Coger cebollas" +tooltips = { + "action1": "Mirar cebollas", + "action2": "Coger cebollas" +} animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"] @@ -94,8 +98,10 @@ global_id = "turno_cocina_despensa_cebolla_der" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar cebollas" -action2_text = "Coger cebollas" +tooltips = { + "action1": "Mirar cebollas", + "action2": "Coger cebollas" +} animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"] @@ -115,8 +121,10 @@ global_id = "turno_cocina_despensa_bidon_der" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar dentro" -action2_text = "Coger" +tooltips = { + "action1": "Mirar dentro", + "action2": "Coger" +} animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"] @@ -136,8 +144,10 @@ global_id = "turno_cocina_despensa_bidon_izq" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar dentro" -action2_text = "Coger" +tooltips = { + "action1": "Mirar dentro", + "action2": "Coger" +} animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"] @@ -152,7 +162,9 @@ script = ExtResource( 5 ) [node name="turno_cocina_patata_grande" parent="." instance=ExtResource( 7 )] position = Vector2( 440, 161 ) scale = Vector2( 0.880435, 0.88735 ) -action1_text = "Mirar" +tooltips = { + "action1": "Mirar" +} [node name="ESCLocation2" type="Position2D" parent="turno_cocina_patata_grande"] position = Vector2( 40.8889, 672.79 ) @@ -175,8 +187,10 @@ global_id = "turno_cocina_despensa_bidon_cntr" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar dentro" -action2_text = "Coger" +tooltips = { + "action1": "Mirar dentro", + "action2": "Coger" +} action3_target_texts = { "turno_cocina_bol": "Coger lentejas a ojo", "turno_cocina_peso_bol": "Coger las lentejas exactas"