ajo y eneko catador

This commit is contained in:
2024-01-26 23:35:03 +01:00
parent 09269a28d6
commit 04272190f5
16 changed files with 68 additions and 8 deletions

View File

@@ -36,6 +36,6 @@ func validate(arguments: Array):
# Run the command # Run the command
func run(command_params: Array) -> int: func run(command_params: Array) -> int:
escoria.game_scene.play_video(command_params[0]) escoria.game_scene.play_video(command_params[0])
#We wait for the video to emit "finished" fignal with yield #We wait for the video to emit "finished" signal with yield
yield(escoria.game_scene.get_video_player(),"finished") yield(escoria.game_scene.get_video_player(),"finished")
return ESCExecution.RC_OK return ESCExecution.RC_OK

View File

@@ -59,13 +59,20 @@ say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de p
say_last_dialog_option say_last_dialog_option
say eneko_smoking cocina_delante_intro_dialog_end_res:"Hmm, podría servir, pero no te pases con la cantidad, no quiero estar cinco días comiendo lo mismo." say eneko_smoking cocina_delante_intro_dialog_end_res:"Hmm, podría servir, pero no te pases con la cantidad, no quiero estar cinco días comiendo lo mismo."
say current_player cocina_delante_intro_dialog_end_res_player:"¡Ningún problema! En cuanto decida que hacer de comer me pongo a cocinar." say current_player cocina_delante_intro_dialog_end_res_player:"¡Ningún problema! En cuanto decida que hacer de comer me pongo a cocinar."
stop stop
# - cocina_delante_intro_dialog_option:"" [!cocina_delante_intro_dialog_option_done] # - cocina_delante_intro_dialog_option:"" [!cocina_delante_intro_dialog_option_done]
# say_last_dialog_option # say_last_dialog_option
# say eneko_smoking cocina_delante_intro_dialog_option_res:"" # say eneko_smoking cocina_delante_intro_dialog_option_res:""
# set_global cocina_delante_intro_dialog_option_done true # set_global cocina_delante_intro_dialog_option_done true
! !
:turno_cocina_eneko_catando_end
play_video res://gymkhana/videos/turno_cocina_eneko_sale_le_gusta_muchisimo.ogv [turno_cocina_ingrediente_ajo,turno_cocina_ingrediente_romero]
play_video res://gymkhana/videos/turno_cocina_eneko_sale_le_gusta.ogv [turno_cocina_ingrediente_ajo]
play_video res://gymkhana/videos/turno_cocina_eneko_sale_no_le_gusta.ogv [!turno_cocina_ingrediente_ajo]
set_active eneko_smoking true
set_active turno_cocina_ajo false
:action2 :action2
> [whatsapp_blocked] > [whatsapp_blocked]
say current_player "Hola..." say current_player "Hola..."
@@ -76,6 +83,14 @@ say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de p
#turn_to eneko_smoking player #turn_to eneko_smoking player
? ?
- cocina_delante_intro_dialog_catar:"Ya he hecho las lentejas!" [turno_cocina_ingrediente_lentejas,turno_cocina_ingrediente_patatas,turno_cocina_economica_encendida]
say_last_dialog_option
say eneko_smoking cocina_delante_intro_dialog_catar_res:"En serio! Voy a probarlas!"
play_video res://gymkhana/videos/turno_cocina_eneko_entra_cocina.ogv
set_active eneko_smoking false
set_active turno_cocina_ajo true
sched_event 10 eneko_smoking turno_cocina_eneko_catando_end
stop
- "Quien eres tu?" - "Quien eres tu?"
say current_player "Quien eres tu?" say current_player "Quien eres tu?"
say eneko_smoking "Soy Eneko" [!name_known] say eneko_smoking "Soy Eneko" [!name_known]
@@ -131,7 +146,7 @@ set_global bombona2_offered 1
:action3 turno_cocina_madera :action3 turno_cocina_madera
say current_player "Quieres leña?" say current_player "Quieres leña?"
say eneko_smoking "Andas buscando pelea?" say eneko_smoking "Andas buscaturno_cocina_ingrediente_patatasndo pelea?"
say eneko_smoking "Te advierto que soy cinturón negro de Kung Fu!" say eneko_smoking "Te advierto que soy cinturón negro de Kung Fu!"
? ?
- "No, no. Solo te ofrecía un trozo de leña." [!eneko_madera_option1_done] - "No, no. Solo te ofrecía un trozo de leña." [!eneko_madera_option1_done]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 32 KiB

View File

@@ -0,0 +1,7 @@
:action1
say player "Ajooo!"
inventory_add turno_cocina_ajo
set_active turno_cocina_ajo false
:action3
say player "Una buena cabeza de ajo."

View File

@@ -0,0 +1,26 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" type="Texture" id=2]
[node name="turno_cocina_ajo" type="Area2D"]
pause_mode = 1
script = ExtResource( 1 )
global_id = "turno_cocina_ajo"
esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc"
combine_when_selected_action_is_in = [ "action4" ]
inventory_texture = ExtResource( 2 )
dialog_color = Color( 1, 1, 1, 1 )
tooltips = {
"action1": "Coger ajo",
"action3": "Mirar",
"action4": "Usar"
}
animations = null
[node name="Sprite" type="Sprite" parent="."]
scale = Vector2( 0.101548, 0.101548 )
texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -7, -6, 7, -6, 7, 6, -7, 6 )

View File

@@ -11,7 +11,7 @@ say player "a ver...."
say player "Lentejas con patatas:" say player "Lentejas con patatas:"
say player "4 patatas medianas" say player "4 patatas medianas"
say player "1 kg de lentejas" say player "1 kg de lentejas"
say player "1 diente de ajo" say player "ajo."
set_global turno_cocina_hint_romero true [eq turno_cocina_libro_leido_count 4] set_global turno_cocina_hint_romero true [eq turno_cocina_libro_leido_count 4]
say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 4] say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 4]
say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 8] say player "Tambien hay un dibujo de una hierva con la palabra ROMERO"[eq turno_cocina_libro_leido_count 8]

View File

@@ -37,6 +37,12 @@
inventory_remove turno_cocina_romero inventory_remove turno_cocina_romero
:action3 turno_cocina_madera :action3 turno_cocina_madera
say player "Más madera que es la guerra!" say player "Más madera que es la guerra!"
set_global turno_cocina_economica_con_madera true set_global turno_cocina_economica_con_madera true
inventory_remove turno_cocina_madera inventory_remove turno_cocina_madera
:action3 turno_cocina_ajo
say player "Con ajo quedara al gusto de Eneko."
set_global turno_cocina_ingrediente_ajo true
inventory_remove turno_cocina_ajo

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 117 KiB

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=2] [gd_scene load_steps=13 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_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -10,6 +10,7 @@
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" type="PackedScene" id=11]
[sub_resource type="NavigationPolygon" id=1] [sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 )
@@ -160,3 +161,6 @@ polygon = PoolVector2Array( -2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.
[node name="turno_cocina_madera_location" type="Position2D" parent="turno_cocina_madera"] [node name="turno_cocina_madera_location" type="Position2D" parent="turno_cocina_madera"]
position = Vector2( 366.864, 132.98 ) position = Vector2( 366.864, 132.98 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )]
position = Vector2( 858, 399 )

View File

@@ -1,5 +1,6 @@
:setup :setup
inventory_add turno_cocina_frontal inventory_add turno_cocina_frontal
set_active turno_cocina_ajo false [!turno_cocina_eneko_catando]
anim eneko_smoking idle anim eneko_smoking idle
> [eq ESC_LAST_SCENE despensa] > [eq ESC_LAST_SCENE despensa]
teleport player puerta_despensa_start teleport player puerta_despensa_start

View File

@@ -14,5 +14,6 @@ set_global turno_cocina_ingrediente_patatas false
set_global turno_cocina_ingrediente_ajo false set_global turno_cocina_ingrediente_ajo false
set_global turno_cocina_ingrediente_romero false set_global turno_cocina_ingrediente_romero false
set_global turno_cocina_libro_leido_count 0 set_global turno_cocina_libro_leido_count 0
set_global turno_cocina_eneko_catando false
# Starting scene # Starting scene
change_scene res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn change_scene res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn

Binary file not shown.

Binary file not shown.