From 19d38e5e1c382eb156fdfc96886cca2330e7c5dc Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sat, 26 Aug 2023 20:00:57 +0200 Subject: [PATCH] start with frontal --- gymkhana/items/inventory/turno_cocina_frontal.esc | 9 ++++----- gymkhana/items/inventory/turno_cocina_frontal.tscn | 6 ++---- gymkhana/rooms/turno_cocina/cocina/cocina.tscn | 4 ++-- .../turno_cocina/cocina_delante/esc/cocina_delante.esc | 2 ++ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gymkhana/items/inventory/turno_cocina_frontal.esc b/gymkhana/items/inventory/turno_cocina_frontal.esc index db47f32c..b9a452b0 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.esc +++ b/gymkhana/items/inventory/turno_cocina_frontal.esc @@ -1,6 +1,5 @@ -:action1 -say player "Que cosa tan curiosa" - -:action2 -say player "No lo quiero coger" +:action3 +say player "Es mi frontal de toda la vida, le tengo cariño" +:action4 +say player "NOT IMPLEMENTED" diff --git a/gymkhana/items/inventory/turno_cocina_frontal.tscn b/gymkhana/items/inventory/turno_cocina_frontal.tscn index 0d357814..9867a18d 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.tscn +++ b/gymkhana/items/inventory/turno_cocina_frontal.tscn @@ -14,9 +14,7 @@ global_id = "turno_cocina_frontal" esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "¿Que es esto?" -action2_text = "Coger" -action3_text = "Mirar" +action3_text = "Admirar" action4_text = "Usar" animations = null @@ -31,4 +29,4 @@ shape = SubResource( 1 ) [node name="ESCLocation" type="Position2D" parent="."] position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +script = ExtResource( 3 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index d0116b7f..ea1ba079 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -31,8 +31,8 @@ texture = ExtResource( 3 ) position = Vector2( 302.5, 0 ) script = ExtResource( 4 ) scales = ExtResource( 7 ) -scale_min = 0.25 -scale_max = 1.25 +scale_min = 0.3 +scale_max = 1.4 player_speed_multiplier = 1.2 player_doubleclick_speed_multiplier = 2.0 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 5e0ade98..6c1b602f 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -1,4 +1,6 @@ :setup + inventory_add turno_cocina_frontal + > [eq ESC_LAST_SCENE despensa] teleport player puerta_despensa_start set_angle player 180