From 27badc4b677c9aa4dfdd5f0853cc9398907d5fda Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 3 Nov 2024 00:21:12 +0100 Subject: [PATCH] feat(cocina_detras): parece que veo a Mikel, closes #83 --- ...olla_llena_economica_encendida_observer.gd | 2 +- .../rooms/turno_cocina/cocina/esc/cocina.esc | 6 +++ .../cocina_detras/cocina_detras.tscn | 41 ++++++++++++++----- .../cocina_detras/esc/cocina_detras.esc | 2 +- .../turno_cocina/cocina_detras/esc/mikel.esc | 6 +++ .../cocina_detras/esc/puerta_cocina.esc | 4 ++ .../creditos/RestartGameButton.gd | 2 +- .../turno_cocina/creditos/scrollingText.gd | 2 +- 8 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc diff --git a/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd index 73756e6e..14cafa23 100644 --- a/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd +++ b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd @@ -1,7 +1,7 @@ extends Node -func _process(delta: float): +func _process(_delta: float): if(escoria.globals_manager.get_global("turno_cocina_economica_encendida") == true): self.visible = true else: diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc index 6f08c767..08ae376b 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc @@ -53,3 +53,9 @@ set_active turno_cocina_olla_llena false [!turno_cocina_economica_con_olla] say player "No se me ocurre ningún plato, debería buscar un libro de recetas." say player "Si mantienes MAYÚSCULAS pulsado los objetos con los que puedes interactuar aparecerán marcados." accept_input ALL +> [turno_cocina_mikel_playing] + # walk_block player new_game_start_location + # set_angle player 180 + say player "Ya no está, que raro..." + accept_input ALL + set_global turno_cocina_mikel_playing false diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index b6beb25e..7a17a1be 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -58,11 +58,10 @@ global_id = "cocina_detras_puerta_cocina" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc" is_exit = true combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) custom_data = { - "tooltips": { - "action1": "Entrar en la cocina" - } +"tooltips": { +"action1": "Entrar en la cocina" +} } animations = null @@ -71,10 +70,10 @@ position = Vector2( 630, -130 ) scale = Vector2( 0.963362, 0.9875 ) polygon = PoolVector2Array( 117.298, 581.266, 120.412, 341.266, 169.199, 325.063, 236.671, 333.165, 236.671, 588.354 ) -[node name="puerta_cocina_start" type="Position2D" parent="puerta_cocina"] +[node name="cocina_detras_puerta_cocina_start" type="Position2D" parent="puerta_cocina"] position = Vector2( 793, 465 ) script = ExtResource( 5 ) -global_id = "puerta_cocina_start" +global_id = "cocina_detras_puerta_cocina_start" [node name="puerta_delante" type="Area2D" parent="."] pause_mode = 1 @@ -83,11 +82,10 @@ global_id = "cocina_detras_puerta_delante" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc" is_exit = true combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) custom_data = { - "tooltips": { - "action1": "Ir delante" - } +"tooltips": { +"action1": "Ir delante" +} } animations = null @@ -129,8 +127,29 @@ position = Vector2( 61, 341 ) [node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"] position = Vector2( 89, 60 ) script = ExtResource( 5 ) -interaction_direction = 6 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"] position = Vector2( -61, -341 ) polygon = PoolVector2Array( 75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434 ) + +[node name="mikel" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_detras_mikel" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc" +combine_when_selected_action_is_in = [ ] +custom_data = { +"tooltips": { +"action1": "Mirar" +} +} +animations = null + +[node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"] +position = Vector2( 751, -159 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 129.754, 469.873, 129.754, 371.646, 140.134, 369.62, 183.732, 381.772, 184.77, 471.899 ) + +[node name="mikel_location" type="Position2D" parent="mikel"] +position = Vector2( 857, 491 ) +script = ExtResource( 5 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc index 5b011a21..25dec153 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc @@ -3,5 +3,5 @@ teleport player puerta_delante_start set_angle player 180 stop - teleport player puerta_cocina_start + teleport player cocina_detras_puerta_cocina_start set_angle player 180 diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc new file mode 100644 index 00000000..9f76766c --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc @@ -0,0 +1,6 @@ +:action1 +accept_input SKIP +set_global turno_cocina_mikel_playing true +say player "Parece que veo a mikel, voy a saludarle!" +walk_block player cocina_detras_puerta_cocina_start +queue_event cocina_detras_puerta_cocina open diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc index 79918edb..a9d76958 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc @@ -1,3 +1,7 @@ :action1 play_lib_snd puerta_cocina_detras change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" + +:open +play_lib_snd puerta_cocina_detras +change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" diff --git a/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd b/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd index 516827f0..dd2aa2e1 100644 --- a/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd +++ b/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd @@ -6,6 +6,6 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): +func _process(_delta): if(escoria.globals_manager.get_global("turno_cocina_creditos_return_to_menu_visible")): self.visible = true diff --git a/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd b/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd index 61f9d7ba..2073a946 100644 --- a/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd +++ b/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd @@ -5,7 +5,7 @@ signal finished func _ready(): pass # Replace with function body. -func _process(delta): +func _process(_delta): var size = self.get_global_rect().size if escoria.globals_manager.get_global("turno_credits_rolling"): self.set_position(self.get_position() + Vector2(0, -1))