diff --git a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png b/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png index 9f6dc1fd..dcd3e16e 100644 Binary files a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png and b/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png differ diff --git a/gymkhana/rooms/interior_cocina/assets/grey.png b/gymkhana/rooms/interior_cocina/assets/grey.png new file mode 100644 index 00000000..c2449334 Binary files /dev/null and b/gymkhana/rooms/interior_cocina/assets/grey.png differ diff --git a/gymkhana/rooms/interior_cocina/interior_cocina.tscn b/gymkhana/rooms/interior_cocina/interior_cocina.tscn index 8896bc9c..d6ebde67 100644 --- a/gymkhana/rooms/interior_cocina/interior_cocina.tscn +++ b/gymkhana/rooms/interior_cocina/interior_cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2] @@ -8,11 +8,13 @@ [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] [ext_resource path="res://gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png" type="Texture" id=8] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=9] +[ext_resource path="res://gymkhana/rooms/interior_cocina/assets/grey.png" type="Texture" id=10] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 2377, 435, 2553, 380, 2595, 485, 2314, 593, 2040, 322, 2069, 370, 1826, 496, 1634, 513, 1600, 512, 1606, 453, 1787, 387, 413, 417, 543, 411, 779, 404, 839, 576, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 2725, 472, 2745, 505, 2742, 848, 1510, 743, 1916, 586, 1062, 679 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 1, 0, 5 ), PoolIntArray( 6, 7, 8, 9, 10, 4, 5 ), PoolIntArray( 11, 12, 13, 14, 15, 16, 17, 18, 19 ), PoolIntArray( 2, 20, 21, 22, 3 ), PoolIntArray( 23, 7, 6, 24 ), PoolIntArray( 15, 14, 25 ), PoolIntArray( 15, 25, 23 ), PoolIntArray( 22, 15, 23 ), PoolIntArray( 3, 22, 23, 24 ) ] -outlines = [ PoolVector2Array( 2725, 472, 2745, 505, 2742, 848, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 413, 417, 543, 411, 779, 404, 839, 576, 1062, 679, 1510, 743, 1634, 513, 1600, 512, 1606, 453, 1787, 387, 2040, 322, 2553, 380, 2595, 485 ), PoolVector2Array( 1826, 496, 1916, 586, 2314, 593, 2377, 435, 2069, 370 ) ] +vertices = PoolVector2Array( 2377, 435, 2553, 380, 2595, 485, 2314, 593, 2040, 322, 2069, 370, 1600, 512, 1606, 453, 1787, 387, 1773, 499, 1634, 513, 413, 417, 543, 411, 779, 404, 839, 576, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 2725, 472, 2745, 505, 2742, 848, 1969, 734, 1875, 634, 1510, 743, 1062, 679, 2076, 660 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 1, 0, 5 ), PoolIntArray( 6, 7, 8, 4, 5, 9, 10 ), PoolIntArray( 11, 12, 13, 14, 15, 16, 17, 18, 19 ), PoolIntArray( 3, 2, 20, 21, 22, 23 ), PoolIntArray( 10, 9, 24, 25 ), PoolIntArray( 25, 24, 23 ), PoolIntArray( 15, 14, 26 ), PoolIntArray( 15, 26, 25 ), PoolIntArray( 22, 15, 25, 23 ), PoolIntArray( 3, 23, 27 ) ] +outlines = [ PoolVector2Array( 2725, 472, 2745, 505, 2742, 848, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 413, 417, 543, 411, 779, 404, 839, 576, 1062, 679, 1510, 743, 1634, 513, 1600, 512, 1606, 453, 1787, 387, 2040, 322, 2553, 380, 2595, 485 ), PoolVector2Array( 1773, 499, 1875, 634, 1969, 734, 2076, 660, 2314, 593, 2377, 435, 2069, 370 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 2 ) @@ -21,8 +23,8 @@ player_scene = ExtResource( 7 ) camera_limits = [ Rect2( 0, 0, 2925, 577 ) ] [node name="ESCBackground" type="TextureRect" parent="."] -margin_right = 5955.0 -margin_bottom = 1503.0 +margin_right = 2925.0 +margin_bottom = 1077.0 mouse_filter = 2 texture = ExtResource( 5 ) script = ExtResource( 1 ) @@ -31,6 +33,7 @@ script = ExtResource( 1 ) position = Vector2( -1650, 3 ) script = ExtResource( 4 ) scales = ExtResource( 8 ) +scale_max = 2.0 [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] position = Vector2( 1650, 0 ) @@ -64,3 +67,19 @@ script = ExtResource( 3 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="salida_detras"] position = Vector2( 1651, -2 ) polygon = PoolVector2Array( -12, 69, -47, 64, -48, -96, -11, -104, 44, -95, 51, 66 ) + +[node name="ESCItem" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 9 ) +combine_when_selected_action_is_in = [ ] +inventory_texture = ExtResource( 10 ) +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="Sprite" type="Sprite" parent="ESCItem"] +position = Vector2( 0, -28215.5 ) +scale = Vector2( 292.6, 49.9003 ) +z_index = 1000 +texture = ExtResource( 10 ) +centered = false +offset = Vector2( 0, 577 ) diff --git a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc index ba66bbb9..d5194143 100644 --- a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc +++ b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc @@ -2,7 +2,7 @@ say player "Parece que veo a Mikel" :action2 -play_snd res://game/sfx/sounds/doorOpen_2.ogg +# play_snd res://game/sfx/sounds/doorOpen_2.ogg change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" :action3 bombona2