From 1d23db63c4e6e5faa83ce0b79e77d8124164af04 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 30 Mar 2025 04:17:11 +0200 Subject: [PATCH] fix(say_last_dialog_option): closes #104 --- .../chooser/simple.tscn | 2 ++ .../commands/say_last_dialog_option.gd | 7 ++--- .../rooms/turno_cocina/cocina/cocina.tscn | 28 +++++++++---------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index 8fe7f2b7..b4ee582a 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -16,6 +16,8 @@ anchor_right = 1.0 anchor_bottom = 1.0 offset_top = 560.0 offset_right = 7.0 +grow_horizontal = 2 +grow_vertical = 2 theme = ExtResource("2") script = ExtResource("1") diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd index 54a4b5bf..8536a4d9 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd @@ -34,16 +34,13 @@ func run(_command_params: Array) -> int: return ESCExecution.RC_CANCEL var last_chosen_option = escoria.globals_manager.get_global("ESC_DIALOG_CHOSEN_OPTION") - # Surround text with quotes. Required by escoria.dialog_player.say() - var text = "\"%s\"" % last_chosen_option - var speaking_character_global_id = escoria.main.current_scene.player.global_id escoria.dialog_player.say( speaking_character_global_id, "", - text, - text # TODO (Eneko): should we pass real key? + last_chosen_option, + last_chosen_option ) await escoria.dialog_player.say_finished escoria.current_state = escoria.GAME_STATE.DEFAULT diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 508e3079..1b2e982b 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=3 uid="uid://dowbdjo7ka0sq"] +[gd_scene load_steps=32 format=3 uid="uid://dowbdjo7ka0sq"] [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"] [ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"] @@ -11,6 +11,7 @@ [ext_resource type="Texture2D" uid="uid://bna12h746ucar" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"] [ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"] [ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"] +[ext_resource type="Texture2D" uid="uid://bhomm5rmi8fnr" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="11_wxxpa"] [ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"] [ext_resource type="Texture2D" uid="uid://djkmw4bj8siok" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"] [ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"] @@ -21,8 +22,10 @@ [ext_resource type="PackedScene" uid="uid://d7l30s558mvd" path="res://gymkhana/particles/SmokeParticles.tscn" id="19"] [ext_resource type="PackedScene" uid="uid://igj2f3midaad" path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" id="20"] [ext_resource type="Script" uid="uid://uadel3g82io" path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" id="21"] -[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" id="22"] +[ext_resource type="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="21_kafnq"] +[ext_resource type="PackedScene" uid="uid://bthshk88n0ida" path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" id="22"] [ext_resource type="Texture2D" uid="uid://bfrdglprxc04e" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="23"] +[ext_resource type="Texture2D" uid="uid://d33c6oen4di3s" path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" id="23_fji2i"] [ext_resource type="Texture2D" uid="uid://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="24"] [ext_resource type="PackedScene" uid="uid://byfyg5p0h02br" path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" id="25"] [ext_resource type="Script" uid="uid://oaq45tntm70n" path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" id="26"] @@ -96,14 +99,13 @@ position = Vector2(302.5, 0) script = ExtResource("6") global_id = "cocina_puerta_detras" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc" -is_exit = true combine_when_selected_action_is_in = PackedStringArray() +is_exit = true custom_data = { "tooltips": { "action1": "tooltip_cocina_puerta_detras_action1" } } -animations = null [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] position = Vector2(1710, -167) @@ -121,14 +123,13 @@ position = Vector2(302.5, 0) script = ExtResource("6") global_id = "cocina_puerta_delante" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc" -is_exit = true combine_when_selected_action_is_in = PackedStringArray() +is_exit = true custom_data = { "tooltips": { "action1": "tooltip_cocina_puerta_delante_action1" } } -animations = null [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] position = Vector2(2385, -81) @@ -144,6 +145,7 @@ global_id = "puerta_delante_start" position = Vector2(2505, 160) scale = Vector2(0.880435, 0.88735) combine_when_selected_action_is_in = PackedStringArray("action4") +inventory_texture_hovered = ExtResource("11_wxxpa") [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"] position = Vector2(15.9014, -11.2695) @@ -205,7 +207,6 @@ custom_data = { "action2": "tooltip_common_use" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"] polygon = PackedVector2Array(2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286) @@ -231,7 +232,6 @@ custom_data = { "action2": "cocina_fregadero_action2" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"] polygon = PackedVector2Array(1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273) @@ -256,7 +256,6 @@ custom_data = { "action2": "tooltip_cocina_cuchillos_action2" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"] position = Vector2(1452, -245) @@ -282,7 +281,6 @@ custom_data = { "action2": "tooltip_cocina_debajo_sofa_action2" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"] polygon = PackedVector2Array(466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386) @@ -302,6 +300,7 @@ global_id = "cocina_patata" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc" combine_when_selected_action_is_in = PackedStringArray() inventory_texture = ExtResource("13") +inventory_texture_hovered = ExtResource("13") custom_data = { "count_textures": [{ "start": 1, @@ -321,7 +320,6 @@ custom_data = { "action2": "tooltip_cocina_patata_action2" } } -animations = null [node name="Sprite2D" type="Sprite2D" parent="cocina_patata"] position = Vector2(-2, 0) @@ -358,7 +356,6 @@ custom_data = { "action2": "cocina_economica_action2" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"] position = Vector2(-6, -4) @@ -400,7 +397,6 @@ custom_data = { "action2": "tooltip_cocina_gas_action2" } } -animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] z_index = 5 @@ -423,6 +419,7 @@ visible = false position = Vector2(1281, 491) scale = Vector2(1.06318, 1.06318) combine_when_selected_action_is_in = PackedStringArray("action4") +inventory_texture_hovered = ExtResource("21_kafnq") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"] position = Vector2(-160.838, 201.283) @@ -431,6 +428,7 @@ script = ExtResource("5") [node name="turno_cocina_cuerno" parent="." instance=ExtResource("20")] position = Vector2(2801, 175) combine_when_selected_action_is_in = PackedStringArray() +inventory_texture_hovered = ExtResource("23_fji2i") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"] position = Vector2(-81, 334) @@ -446,6 +444,7 @@ position = Vector2(1974, 236) scale = Vector2(0.880435, 0.88735) combine_when_selected_action_is_in = PackedStringArray() inventory_texture = ExtResource("23") +inventory_texture_hovered = ExtResource("23") [node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra"] position = Vector2(15.9011, -12.3964) @@ -458,8 +457,7 @@ script = ExtResource("5") [node name="turno_cocina_jarra_volcada" parent="." instance=ExtResource("25")] position = Vector2(1965, 282) scale = Vector2(0.880435, 0.88735) -combine_when_selected_action_is_in = PackedStringArray() -inventory_texture = ExtResource("24") +inventory_texture_hovered = ExtResource("24") [node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada"] position = Vector2(18.1726, -12.3964)