diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.esc b/gymkhana/items/inventory/turno_cocina_cuerno.esc index db47f32c..a2f38b14 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.esc +++ b/gymkhana/items/inventory/turno_cocina_cuerno.esc @@ -4,3 +4,8 @@ say player "Que cosa tan curiosa" :action2 say player "No lo quiero coger" +:action3 +say player "Que cosa tan curiosa" + +:action4 +say player "No lo quiero coger" diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn index 2804555e..2ac56862 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn @@ -4,9 +4,6 @@ [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) - [node name="turno_cocina_cuerno" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) @@ -15,9 +12,9 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar dentro", + "action1": "Mirar el cuerno", + "action2": "Coger el cuerno", + "action3": "Mirar", "action4": "Usar" } animations = null @@ -27,10 +24,5 @@ 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 +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 7cab0247..56b4952b 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=23 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] @@ -19,6 +19,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture" id=17] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture" id=18] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=19] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" type="PackedScene" id=20] [sub_resource type="NavigationPolygon" id=3] vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 ) @@ -391,3 +392,17 @@ polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443 [node name="turno_cocina_carton_location" type="Position2D" parent="turno_cocina_carton"] position = Vector2( 93.7431, -73.8329 ) script = ExtResource( 5 ) + +[node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )] +position = Vector2( 2805, 151 ) +rotation = 1.44513 +scale = Vector2( 0.8, 0.8 ) +combine_when_selected_action_is_in = [ ] + +[node name="turno_cocina_cuerno_collision" type="CollisionPolygon2D" parent="turno_cocina_cuerno"] +position = Vector2( 15.9014, -11.2695 ) +polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.133, -1.61509, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 ) + +[node name="turno_cocina_cuerno_location" type="Position2D" parent="turno_cocina_cuerno"] +position = Vector2( 421.503, 164.124 ) +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 e03a6f7b..2b4536c3 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -20,8 +20,8 @@ set_angle player 90 :ready # Uncomment to disable intro scene -# set_global cocina_delante_intro_played true -# set_global cocina_intro_played true +set_global cocina_delante_intro_played true +set_global cocina_intro_played true > [!cocina_delante_intro_played] set_global cocina_delante_intro_played true accept_input SKIP