diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index de0e1f00..c87dc311 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -20,7 +20,7 @@ say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de p say_last_dialog_option say eneko_smoking cocina_delante_intro_dialog_option2_1_res:"Puede ser, pero tú no tienes pinta de nativo americano." set_global cocina_delante_intro_dialog_option2_1_done true - - cocina_delante_intro_dialog_option2_2:"Históricamente, el cannabis se ha utilizado para inducir experiencias espirituales." [!cocina_delante_intro_dialog_option2_done, !cocina_delante_intro_dialog_option2_2_done] + - cocina_delante_intro_dialog_option2_2:"Históricamente el cannabis se ha utilizado para inducir experiencias espirituales." [!cocina_delante_intro_dialog_option2_done, !cocina_delante_intro_dialog_option2_2_done] say_last_dialog_option say eneko_smoking cocina_delante_intro_dialog_option2_2_res:"¿Colocarte y ver a los espíritus te parece hacer algo de provecho?" set_global cocina_delante_intro_dialog_option2_2_done true diff --git a/gymkhana/items/inventory/turno_cocina_madera.esc b/gymkhana/items/inventory/turno_cocina_madera.esc index db47f32c..9123cdda 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.esc +++ b/gymkhana/items/inventory/turno_cocina_madera.esc @@ -1,6 +1,10 @@ :action1 -say player "Que cosa tan curiosa" +say current_player cocina_delante_madera_action1_say:"Sin duda, muchos pinos murieron para que se llenara." :action2 -say player "No lo quiero coger" +say current_player cocina_delante_madera_action2_say:"Con esto podré hacer un buen fuego." +inventory_add turno_cocina_madera +set_active turno_cocina_madera false +:action3 +say current_player cocina_delante_madera_action3_say:"Es leña de pino, esto tiene que dejar los tubos bien sucios." diff --git a/gymkhana/items/inventory/turno_cocina_madera.tscn b/gymkhana/items/inventory/turno_cocina_madera.tscn index b1110560..add07725 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.tscn +++ b/gymkhana/items/inventory/turno_cocina_madera.tscn @@ -15,22 +15,9 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar", - "action4": "Usar" + "action1": "cocina_delante_madera_action1", + "action2": "cocina_delante_madera_action2", + "action3": "cocina_delante_madera_action3", + "action4": "cocina_delante_madera_action4" } animations = null - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) - -[node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index f428a839..68c5b46f 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [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] @@ -9,11 +9,12 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" type="Texture" id=7] [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/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 36, 211, 270, 182, 278, 280, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6 ), PoolIntArray( 7, 4, 6, 0, 8 ), PoolIntArray( 7, 9, 10, 4 ), PoolIntArray( 8, 0, 3, 11 ) ] -outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 270, 182, 278, 280, -768, 301, -1163, 462 ) ] +vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 649, 54, 647, -17, 715, -15, 760, 50, 167, 278, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 4, 7, 8, 9 ), PoolIntArray( 10, 9, 8, 0, 11 ), PoolIntArray( 10, 12, 13, 9 ), PoolIntArray( 11, 0, 3, 14 ) ] +outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 649, 54, 647, -17, 715, -15, 760, 50, 167, 278, -768, 301, -1163, 462 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -156,3 +157,16 @@ polygon = PoolVector2Array( -20, 43, 37, 46, 39, 87, 57, 86, 92, 84, 91, -16, 47 [node name="ESCLocation" type="Position2D" parent="pegatinas"] position = Vector2( -99, 213 ) script = ExtResource( 5 ) + +[node name="turno_cocina_madera" parent="." instance=ExtResource( 10 )] +position = Vector2( 1505, 160 ) +scale = Vector2( 0.880435, 0.88735 ) +combine_when_selected_action_is_in = [ ] + +[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"] +position = Vector2( 396.395, 87.9022 ) +polygon = PoolVector2Array( -2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.4277, -78.3702, -21.4121 ) + +[node name="turno_cocina_madera_location" type="Position2D" parent="turno_cocina_madera"] +position = Vector2( 366.864, 132.98 ) +script = ExtResource( 5 ) 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 a160c7bf..78169abc 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -22,9 +22,9 @@ set_angle player 180 play_snd res://gymkhana/sounds/music_loop.ogg _music set_global cutscene_played true accept_input SKIP - set_gui_visible false - walk_block player puerta_cocina_start - set_angle player 90 - queue_event eneko_smoking intro_dialog - set_gui_visible true + # set_gui_visible false + # walk_block player puerta_cocina_start + # set_angle player 90 + # queue_event eneko_smoking intro_dialog + # set_gui_visible true accept_input ALL diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv index bfda9ffc..da3d9bcc 100644 --- a/gymkhana/translations/turno_cocina.csv +++ b/gymkhana/translations/turno_cocina.csv @@ -3,7 +3,6 @@ hello_start_game,Alo Uli!,Alo Uli!,Alo Uli! 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 -pegatinas_action2_eneko_smoking_say,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan cocina_delante_intro_dialog_player,,, cocina_delante_intro_dialog_eneko,,, cocina_delante_intro_dialog_eneko_2,,, @@ -38,8 +37,16 @@ cocina_delante_intro_dialog_end_res,,, cocina_delante_intro_dialog_end_res_player,,, cocina_delante_pegatinas_action1,,,"Observar pegatinas" cocina_delante_pegatinas_action2,,,"Coger una pegatina" +pegatinas_action2_eneko_smoking_say,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan,Eh! las pegatinas no se tocan 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" +cocina_delante_madera_action1,,,"Mirar el leñero" +cocina_delante_madera_action1_say,,, +cocina_delante_madera_action2,,,"Coger leña" +cocina_delante_madera_action2_say,,, +cocina_delante_madera_action3,,,"Mirar" +cocina_delante_madera_action2_say,,, +cocina_delante_madera_action4,,,"Usar"