From 373e8d3f1f78555b19398bba88102f0bb7d464f8 Mon Sep 17 00:00:00 2001 From: oier Date: Fri, 24 Feb 2023 19:43:07 +0100 Subject: [PATCH] dialogos eneko --- .gitignore | 1 + .../trasera_cocina/esc/p_eneko_smoking.esc | 24 +++++---- .../rooms/trasera_cocina/trasera_cocina.tscn | 53 ++----------------- 3 files changed, 17 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index d6e4d689..ba62f8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ bin .import *.translation .godot +saves/ # Local overrides to project.godot go in override.cfg. /override.cfg diff --git a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc index 2f9218a1..e4741a6d 100644 --- a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc +++ b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc @@ -8,15 +8,17 @@ set_global loom_conversation_done false ? - - "What is your name?" - say current_player "Who are you?" - say eneko_smoking "I'm the worker" [!name_known] - say eneko_smoking "You already asked me that" [name_known] + - "Quien eres tu?" + say current_player "Quien eres tu?" + say eneko_smoking "Soy Eneko" [!name_known] + say eneko_smoking "Ya te he dicho mi nombre!! NO PREGUNTES, NI ME CONTACTES POR WHATSAPP O TE BLOQUEARE" [name_known] + say eneko_smoking "NO PREGUNTES, NI ME CONTACTES POR WHATSAPP O TE BLOQUEARE" [name_known] + say eneko_smoking "NI ME CONTACTES POR WHATSAPP O TE BLOQUEARE" [name_known] set_global name_known true - - "Why are you here?" - say current_player "Why are you here?" - say eneko_smoking "I'm waiting for you to give me the" - say eneko_smoking "filled form from room 5." + - "Que haces?" + say current_player "Que haces aqui?" + say eneko_smoking "Fumar" + say eneko_smoking "no lo ves?" # This starts an inner subset of questions - "Can I ask you about Loom?" [!loom_conversation_done] say current_player "What do you know about Loom?" @@ -36,9 +38,9 @@ set_global loom_conversation_done false - "I know enough about Loom." [!loom_conversation_done] set_global loom_conversation_done true ! - - "I'm done." - say player "Bye!" + - "Agur" + say player "Agur yogur!" #turn_to eneko_smoking player stop ! -set_gui_visible true \ No newline at end of file +#set_gui_visible true \ No newline at end of file diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index d3ad15d3..ca7648d8 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -1,28 +1,11 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd" type="Script" id=5] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577-noItems.jpg" type="Texture" id=6] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=11] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png" type="Texture" id=12] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png" type="Texture" id=13] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png" type="Texture" id=14] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png" type="Texture" id=15] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png" type="Texture" id=16] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png" type="Texture" id=17] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png" type="Texture" id=18] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png" type="Texture" id=19] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png" type="Texture" id=20] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png" type="Texture" id=21] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png" type="Texture" id=22] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png" type="Texture" id=23] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png" type="Texture" id=24] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=25] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png" type="Texture" id=26] [ext_resource path="res://gymkhana/items/inventory/I_Bombona.tscn" type="PackedScene" id=27] @@ -31,14 +14,6 @@ [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=30] [ext_resource path="res://gymkhana/items/inventory/I_caja_herramientas.tscn" type="PackedScene" id=31] -[sub_resource type="SpriteFrames" id=2] -animations = [ { -"frames": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 17 ), ExtResource( 23 ), ExtResource( 13 ), ExtResource( 21 ), ExtResource( 12 ), ExtResource( 24 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 10 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 9 ), ExtResource( 20 ), ExtResource( 22 ) ], -"loop": true, -"name": "default", -"speed": 5.0 -} ] - [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 ) polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15, 16, 5 ), PoolIntArray( 17, 18, 19, 3 ), PoolIntArray( 13, 20, 14 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 17, 3 ), PoolIntArray( 5, 21, 13 ), PoolIntArray( 6, 22, 3 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 16, 23 ) ] @@ -61,14 +36,6 @@ mouse_filter = 2 texture = ExtResource( 6 ) script = ExtResource( 2 ) -[node name="AnimatedSprite2" type="AnimatedSprite" parent="."] -position = Vector2( 1154, 358 ) -scale = Vector2( 0.867751, 0.867751 ) -frames = SubResource( 2 ) -frame = 11 -playing = true -offset = Vector2( -0.09375, 20.0582 ) - [node name="ESCTerrain" type="Navigation2D" parent="."] script = ExtResource( 4 ) scales = ExtResource( 26 ) @@ -149,22 +116,12 @@ margin_bottom = 464.0 [node name="Area2D" type="Area2D" parent="."] position = Vector2( 598, 283 ) -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Area2D"] -polygon = PoolVector2Array( 15, 112, 29, 118, 31, 147, 29, 181, 56, 186, 63, 174, 81, 186, 105, 185, 95, 156, 102, 112, 92, 89, 94, 50, 79, 27, 69, 17, 42, -4, 32, 19, 20, 31, 0, 71, 18, 86 ) -script = ExtResource( 5 ) - -[node name="AnimatedSprite3" type="AnimatedSprite" parent="Area2D/CollisionPolygon2D"] -position = Vector2( 53, 77 ) -scale = Vector2( 0.752992, 0.752993 ) -frames = SubResource( 2 ) -offset = Vector2( -0.09375, 20.0582 ) - [node name="TextureRect" type="TextureRect" parent="Area2D"] margin_right = 40.0 margin_bottom = 40.0 [node name="EnekoSmoking" parent="." instance=ExtResource( 30 )] -position = Vector2( 962, 375 ) +position = Vector2( 959, 413 ) tooltip_name = "Objervar sujeto" dialog_color = Color( 0, 1, 0.462745, 1 ) action1_text = "Objervar sujeto" @@ -173,7 +130,7 @@ tooltip2_name = "Hablar" selectable = true [node name="ESCLocation" type="Position2D" parent="EnekoSmoking"] -position = Vector2( -124, 124 ) +position = Vector2( -169, 179 ) script = ExtResource( 3 ) global_id = "eneko_smoking" @@ -187,7 +144,3 @@ tooltip2_name = "Coger" position = Vector2( -51, 69 ) script = ExtResource( 3 ) global_id = "caja_herramientas" - -[connection signal="mouse_entered" from="TextureRect" to="Area2D/CollisionPolygon2D" method="_on_TextureRect_mouse_entered"] -[connection signal="mouse_entered" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_entered"] -[connection signal="mouse_exited" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_exited"]