diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn index 96b75831..17daefd9 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn @@ -27,10 +27,10 @@ stream = SubResource( 1 ) expand = false [node name="Skip" type="Button" parent="."] -margin_left = 598.0 -margin_top = 662.0 -margin_right = 685.0 -margin_bottom = 694.0 +margin_left = 1163.0 +margin_top = 680.0 +margin_right = 1250.0 +margin_bottom = 712.0 shortcut = SubResource( 3 ) text = "Saltar video" flat = true diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 1f08bc5a..177eb54a 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -44,7 +44,7 @@ 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( 1, 1, 1, 1 ) +dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) tooltips = { "action1": "cocina_delante_eneko_smoking_action1", "action2": "cocina_delante_eneko_smoking_action2" diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 7225221d..5942cc76 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -111,7 +111,6 @@ global_id = "puerta_detras_start" [node name="EnekoSmoking" parent="." instance=ExtResource( 8 )] position = Vector2( 813, 440 ) combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) [node name="ESCLocation" type="Position2D" parent="EnekoSmoking"] position = Vector2( -44, 82 ) 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 599befb6..436db042 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -5,7 +5,7 @@ > [!cocina_delante_intro_played] accept_input SKIP stop_snd - play_video res://gymkhana/videos/turno_cocina/intro.ogv + play_video res://gymkhana/videos/turno_cocina/intro_subs.ogv inventory_add turno_cocina_frontal set_active turno_cocina_ajo false [!turno_cocina_eneko_catando] diff --git a/gymkhana/videos/turno_cocina/intro.ogv b/gymkhana/videos/turno_cocina/intro_no_subs.ogv similarity index 100% rename from gymkhana/videos/turno_cocina/intro.ogv rename to gymkhana/videos/turno_cocina/intro_no_subs.ogv diff --git a/gymkhana/videos/turno_cocina/intro_subs.ogv b/gymkhana/videos/turno_cocina/intro_subs.ogv new file mode 100644 index 00000000..b29d89b0 Binary files /dev/null and b/gymkhana/videos/turno_cocina/intro_subs.ogv differ