From 157f20b0e8797f27f18180b0a60cc74d80f0b7c7 Mon Sep 17 00:00:00 2001
From: Eneko Nieto <eneko@eneko.ovh>
Date: Tue, 3 Oct 2023 23:55:51 +0200
Subject: [PATCH] feat: now oier talks to eneko on init, making the developing
 experience more frustating! bugfix: initial location in cocina and
 cocina_delante

---
 gymkhana/characters/eneko/eneko_smoking.esc   | 26 +++++++++++++++++++
 .../rooms/turno_cocina/cocina/esc/cocina.esc  |  2 +-
 .../cocina_delante/cocina_delante.tscn        |  2 +-
 .../cocina_delante/esc/cocina_delante.esc     | 12 +++++----
 gymkhana/translations/turno_cocina.csv        |  3 ++-
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc
index b2eaf64e..c056a46f 100644
--- a/gymkhana/characters/eneko/eneko_smoking.esc
+++ b/gymkhana/characters/eneko/eneko_smoking.esc
@@ -1,6 +1,32 @@
 :action1
 say current_player "Tiene pinta de que fuma"
 
+#1
+:talk
+
+say current_player "Hello!"
+say eneko_smoking "How can I help you?"
+
+#2
+?
+    #3
+    - "I sell fine leather jackets."
+
+        say eneko_smoking "Aha. Well, I don't like leather."
+        stop
+
+    #4
+    - "Can you tell me where the train station is?"
+
+        say eneko_smoking "Sure. You just go right, then right."
+        say current_player "Okay?"
+        say eneko_smoking "Then right and then right."
+        say current_player "Aha?"
+        say eneko_smoking "And then you ask somebody else."
+        stop
+#5
+!
+
 :action2
 > [whatsapp_blocked]
 	say current_player "Hola..."
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
index 0c7a0f08..983ab071 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
@@ -1,5 +1,5 @@
 :setup
-  > [eq ESC_LAST_SCENE cocina_detras]
+> [eq ESC_LAST_SCENE cocina_detras]
   teleport player puerta_detras_start
   set_angle player 180
   stop
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
index 0b523c73..f428a839 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
@@ -130,7 +130,7 @@ z_index = 4096
 texture = ExtResource( 9 )
 
 [node name="new_game_start_location" type="Position2D" parent="."]
-position = Vector2( 1425, 527 )
+position = Vector2( 1326, 519 )
 script = ExtResource( 5 )
 global_id = "new_game_start_location"
 is_start_location = true
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
index 09bcf54a..b2dc88e6 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
@@ -1,15 +1,15 @@
 :setup
 inventory_add turno_cocina_frontal
 anim eneko_smoking idle
-  > [eq ESC_LAST_SCENE despensa]
+> [eq ESC_LAST_SCENE despensa]
   teleport player puerta_despensa_start
   set_angle player 180
   stop
-  > [eq ESC_LAST_SCENE cocina_detras]
+> [eq ESC_LAST_SCENE cocina_detras]
   teleport player puerta_detras_start
   set_angle player 180
   stop
-  > [eq ESC_LAST_SCENE cocina]
+> [eq ESC_LAST_SCENE cocina]
   teleport player puerta_cocina_start
   set_angle player 180
   stop
@@ -23,7 +23,9 @@ set_angle player 180
   accept_input SKIP
   set_gui_visible false
   walk_block player puerta_cocina_start
-  set_angle player 180
-  say current_player hello_start_game:"Alo Uli!"
+  set_angle player 90
+  # say current_player hello_start_game:"Alo Uli!"
+  # say current_player cocina_delante_start_2:"Cuéntame un chiste"
+	queue_event eneko_smoking talk
   set_gui_visible true
   accept_input ALL
diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv
index 33153777..d0066428 100644
--- a/gymkhana/translations/turno_cocina.csv
+++ b/gymkhana/translations/turno_cocina.csv
@@ -1,5 +1,6 @@
 keys,en,fr,es
 hello_start_game,Alo Uli!,Alo Uli!,Alo Uli!
+cocina_delante_start_2,Tell me a joke,,Cuéntame un chiste
 frontal_action3,Admire,Admire,Admirar
 frontal_action3_say,"It's my lifelong headlight, I love it","C'est ma lampe frontale de toujours, je l'adore","Es mi frontal de toda la vida, le tengo cariño"
 frontal_action4,Use,Utiliser,Usar
@@ -10,4 +11,4 @@ cocina_delante_eneko_smoking_action1,,,"Observar sujeto"
 cocina_delante_eneko_smoking_action2,,,"Hablar"
 cocina_delante_puerta_detras_action1,,,"Ir detrás"
 cocina_delante_puerta_despensa_action1,,,"Bajar a la despensa"
-cocina_delante_puerta_cocina_action1,,,"Entrar en la cocina"
\ No newline at end of file
+cocina_delante_puerta_cocina_action1,,,"Entrar en la cocina"