From b4dc4691e69fa45a1a9e7045daa56d9c0abb40f3 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sun, 30 Mar 2025 01:08:57 +0100 Subject: [PATCH] Fixed dialog position. Closes #105 --- gymkhana/characters/eneko/eneko_smoking.tscn | 72 ++++++++++--------- gymkhana/characters/oier/oier.tscn | 24 ++++--- .../turno_cocina/creditos/EnekoDancing.tscn | 30 ++++---- .../turno_cocina/creditos/OierDancing.tscn | 30 ++++---- 4 files changed, 86 insertions(+), 70 deletions(-) diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 9f017497..6f577b0f 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -1,23 +1,24 @@ -[gd_scene load_steps=21 format=3 uid="uid://wx76bqug4qy8"] +[gd_scene load_steps=22 format=3 uid="uid://wx76bqug4qy8"] [ext_resource type="Resource" uid="uid://c4lhcwvjqx5ty" path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" id="1"] [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://d3llwr16eq05e" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" id="4"] -[ext_resource type="Texture2D" uid="uid://bfsccuoj7pmbf" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" id="5"] -[ext_resource type="Texture2D" uid="uid://dttlqbxpeqwi2" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" id="6"] -[ext_resource type="Texture2D" uid="uid://cms1wfpspj3lm" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" id="7"] -[ext_resource type="Texture2D" uid="uid://dvn6aneqx6ki4" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" id="8"] -[ext_resource type="Texture2D" uid="uid://c3oauyuv2m63f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" id="9"] -[ext_resource type="Texture2D" uid="uid://dj3afybpcing3" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" id="10"] -[ext_resource type="Texture2D" uid="uid://b2fp3wx3yc4ac" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" id="11"] -[ext_resource type="Texture2D" uid="uid://dc18o6ownjk4f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" id="12"] -[ext_resource type="Texture2D" uid="uid://cwaa6byg1k8jp" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" id="13"] -[ext_resource type="Texture2D" uid="uid://b8dkc8xtqe4sh" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" id="14"] -[ext_resource type="Texture2D" uid="uid://bhj0jj26o1v24" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" id="15"] -[ext_resource type="Texture2D" uid="uid://cms3agh4k5nrs" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" id="16"] -[ext_resource type="Texture2D" uid="uid://deqj1jv3tlrnw" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" id="17"] -[ext_resource type="Texture2D" uid="uid://nrkwgky7ip6w" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" id="18"] -[ext_resource type="Texture2D" uid="uid://dh4jyr03r21c8" path="res://gymkhana/characters/eneko/assets/speak-2.png" id="20"] +[ext_resource type="Texture2D" uid="uid://bb02qchp31qbk" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" id="4"] +[ext_resource type="Texture2D" uid="uid://d1077cyo2guax" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" id="5"] +[ext_resource type="Texture2D" uid="uid://cnnggyic1gucn" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" id="6"] +[ext_resource type="Texture2D" uid="uid://dv1wxodjpaugw" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" id="7"] +[ext_resource type="Texture2D" uid="uid://cekotf5gc6xbk" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" id="8"] +[ext_resource type="Texture2D" uid="uid://nfn7piw54ra0" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" id="9"] +[ext_resource type="Texture2D" uid="uid://cpi3eoydqcvqj" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" id="10"] +[ext_resource type="Texture2D" uid="uid://chr5s14dhyvqc" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" id="11"] +[ext_resource type="Texture2D" uid="uid://cjtv1xqse0yuy" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" id="12"] +[ext_resource type="Texture2D" uid="uid://6bsralxp8ndw" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" id="13"] +[ext_resource type="Texture2D" uid="uid://cxo2ep1tqvkqm" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" id="14"] +[ext_resource type="Texture2D" uid="uid://bs7od2dqskigr" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" id="15"] +[ext_resource type="Texture2D" uid="uid://c5ylkrfmvy4uj" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" id="16"] +[ext_resource type="Texture2D" uid="uid://bibmiuts6ow8w" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" id="17"] +[ext_resource type="Texture2D" uid="uid://ueswqch37ph4" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" id="18"] +[ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="19_maw5o"] +[ext_resource type="Texture2D" uid="uid://d4lpmrlecmrj1" path="res://gymkhana/characters/eneko/assets/speak-2.png" id="20"] [sub_resource type="AtlasTexture" id="2"] atlas = ExtResource("20") @@ -93,17 +94,7 @@ animations = [{ [node name="ESCPlayerWithTooltip2" type="Area2D"] process_mode = 1 script = ExtResource("2") -global_id = "eneko_smoking" -esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" -is_movable = true -combine_when_selected_action_is_in = [] -dialog_color = Color(0.584314, 0.490196, 0.270588, 1) -custom_data = { -"tooltips": { -"action1": "cocina_delante_eneko_smoking_action1", -"action2": "cocina_delante_eneko_smoking_action2" -} -} +selectable = true action3_target_texts = { "turno_cocina_cuchillo": "Amenzar", "turno_cocina_frontal": "Ofrecer", @@ -111,18 +102,31 @@ action3_target_texts = { "turno_cocina_mechero": "Ofrecer" } target_when_selected_action_is_in = ["action3"] -selectable = true +global_id = "eneko_smoking" +esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" +is_movable = true +dialog_color = Color(0.584314, 0.490196, 0.270588, 1) +combine_when_selected_action_is_in = PackedStringArray() +animations = ExtResource("1") +custom_data = { +"tooltips": { +"action1": "cocina_delante_eneko_smoking_action1", +"action2": "cocina_delante_eneko_smoking_action2" +} +} animations = ExtResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] position = Vector2(32.625, -50.56) scale = Vector2(0.8, 0.8) -frames = SubResource("1") -animation = "speak" +sprite_frames = SubResource("1") +animation = &"speak" flip_h = true -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(36, -253) - [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PackedVector2Array(-5, 6, -4, 22, -7, 32, -10, 39, -6, 43, 7, 43, 12, 35, 14, 25, 12, 12, 10, -25, 31, -38, 32, 37, 48, 37, 49, 28, 46, 22, 50, -1, 51, -35, 57, -39, 57, -72, 58, -74, 70, -68, 76, -69, 79, -76, 78, -81, 72, -89, 67, -104, 56, -114, 47, -115, 45, -120, 46, -140, 38, -145, 34, -146, 28, -144, 24, -139, 22, -129, 24, -122, 23, -119, 17, -114, 5, -109, -7, -80, -7, -62, 4, -58, 5, -53, -7, -34) + +[node name="ESCDialogLocation" type="Marker2D" parent="."] +position = Vector2(40, -240) +script = ExtResource("19_maw5o") +metadata/_custom_type_script = "uid://85bledusisk1" diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn index 8217b740..f01d88c3 100644 --- a/gymkhana/characters/oier/oier.tscn +++ b/gymkhana/characters/oier/oier.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=32 format=3 uid="uid://cjmsexhyhi4vs"] +[gd_scene load_steps=33 format=3 uid="uid://cjmsexhyhi4vs"] [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://b2msjygw7oyi0" path="res://gymkhana/characters/oier/oier-mod.png" id="2"] +[ext_resource type="Texture2D" uid="uid://da1kd8lccd24" path="res://gymkhana/characters/oier/oier-mod.png" id="2"] [ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"] -[ext_resource type="Texture2D" uid="uid://bcs6kqj5w23vk" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"] +[ext_resource type="Texture2D" uid="uid://dayds4a0t1ldv" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"] +[ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="5_10x32"] [sub_resource type="AtlasTexture" id="22"] atlas = ExtResource("2") @@ -251,22 +252,25 @@ position = Vector2(-5, 0) script = ExtResource("1") global_id = "player" esc_script = "res://gymkhana/characters/oier/oier.esc" -is_interactive = false is_movable = true -default_action = "action1" -combine_when_selected_action_is_in = [] dialog_color = Color(0.321569, 0.662745, 0.301961, 1) +default_action = "action1" +combine_when_selected_action_is_in = PackedStringArray() +is_interactive = false +animations = ExtResource("3") animations = ExtResource("3") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] position = Vector2(0, -155) scale = Vector2(0.389246, 0.389247) -frames = SubResource("20") -animation = "speak_down" +sprite_frames = SubResource("20") +animation = &"speak_down" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(5, -151) shape = SubResource("21") -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(1, -473) +[node name="ESCDialogLocation" type="Marker2D" parent="."] +position = Vector2(10, -452) +script = ExtResource("5_10x32") +metadata/_custom_type_script = "uid://85bledusisk1" diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn index 1ab3a23c..1df84908 100644 --- a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=26 format=3 uid="uid://bgiskd55j17fc"] +[gd_scene load_steps=27 format=3 uid="uid://bgiskd55j17fc"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://wb78a2y0m57i" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" id="2"] -[ext_resource type="Texture2D" uid="uid://dc5ssanpsjr4v" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" id="3"] -[ext_resource type="Texture2D" uid="uid://dn6d46kpmkhpw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" id="4"] -[ext_resource type="Texture2D" uid="uid://cdkeajd7fstp6" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" id="5"] +[ext_resource type="Texture2D" uid="uid://dlndx4wt43du5" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cocv4kkfk5iov" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" id="3"] +[ext_resource type="Texture2D" uid="uid://vpnelytw2stc" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" id="4"] +[ext_resource type="Texture2D" uid="uid://h7emnr0usymg" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" id="5"] [ext_resource type="Script" uid="uid://ixw3klxr3w2p" path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" id="7"] -[ext_resource type="Texture2D" uid="uid://caru5ygwmheyw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" id="8"] -[ext_resource type="Resource" path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" id="9"] +[ext_resource type="Texture2D" uid="uid://do8xbit43kike" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" id="8"] +[ext_resource type="Resource" uid="uid://cr02ebtkhjlw7" path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" id="9"] +[ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="9_v123t"] [sub_resource type="CapsuleShape2D" id="1"] radius = 57.0 @@ -150,24 +151,27 @@ animations = [{ process_mode = 1 script = ExtResource("1") global_id = "eneko_dancing" +dialog_color = Color(0.584314, 0.490196, 0.270588, 1) +combine_when_selected_action_is_in = PackedStringArray() is_interactive = false player_orients_on_arrival = false -combine_when_selected_action_is_in = [] -dialog_color = Color(0.584314, 0.490196, 0.270588, 1) +animations = ExtResource("9") animations = ExtResource("9") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -frames = SubResource("14") -animation = "idle" +sprite_frames = SubResource("14") +animation = &"idle" script = ExtResource("7") [node name="Timer" type="Timer" parent="AnimatedSprite2D"] wait_time = 6.0 -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(-2, -273) +[node name="ESCDialogLocation" type="Marker2D" parent="."] +position = Vector2(7, -271) +script = ExtResource("9_v123t") +metadata/_custom_type_script = "uid://85bledusisk1" [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"] diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn index 81aaf3e5..182a1aec 100644 --- a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=26 format=3 uid="uid://dg3q322t7b34f"] +[gd_scene load_steps=27 format=3 uid="uid://dg3q322t7b34f"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://cht3r83h74v1p" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" id="2"] -[ext_resource type="Texture2D" uid="uid://h38hcuygme4d" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" id="3"] -[ext_resource type="Texture2D" uid="uid://cbqvx5efjmdci" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" id="4"] -[ext_resource type="Texture2D" uid="uid://c7g27vatqcft4" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" id="5"] +[ext_resource type="Texture2D" uid="uid://do2a6t8weecj8" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" id="2"] +[ext_resource type="Texture2D" uid="uid://d8kde02dy8aw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" id="3"] +[ext_resource type="Texture2D" uid="uid://0g6vnnf6cvp0" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" id="4"] +[ext_resource type="Texture2D" uid="uid://dna03xt7qpx8w" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" id="5"] [ext_resource type="Script" uid="uid://ixw3klxr3w2p" path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" id="6"] -[ext_resource type="Texture2D" uid="uid://dt1rchb7y4qe" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" id="7"] -[ext_resource type="Resource" path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" id="8"] +[ext_resource type="Texture2D" uid="uid://diww8ibxlxjlr" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" id="7"] +[ext_resource type="Resource" uid="uid://bl5rc1krhwcbu" path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" id="8"] +[ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="9_wcgd0"] [sub_resource type="CapsuleShape2D" id="1"] radius = 57.0 @@ -150,24 +151,27 @@ animations = [{ process_mode = 1 script = ExtResource("1") global_id = "oier_dancing" +dialog_color = Color(0.321569, 0.662745, 0.301961, 1) +combine_when_selected_action_is_in = PackedStringArray() is_interactive = false player_orients_on_arrival = false -combine_when_selected_action_is_in = [] -dialog_color = Color(0.321569, 0.662745, 0.301961, 1) +animations = ExtResource("8") animations = ExtResource("8") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -frames = SubResource("14") -animation = "idle" +sprite_frames = SubResource("14") +animation = &"idle" script = ExtResource("6") [node name="Timer" type="Timer" parent="AnimatedSprite2D"] wait_time = 6.0 -[node name="dialog_position" type="Marker2D" parent="."] -position = Vector2(-2, -273) +[node name="ESCDialogLocation" type="Marker2D" parent="."] +position = Vector2(2, -269) +script = ExtResource("9_wcgd0") +metadata/_custom_type_script = "uid://85bledusisk1" [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"]