diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf b/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf new file mode 100644 index 00000000..0bec3abd Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf new file mode 100644 index 00000000..c1b2b6cf Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/depth.png b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png index dcd3e16e..0a71da09 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/depth.png and b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png b/gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png new file mode 100644 index 00000000..4f17e66c Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png b/gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png new file mode 100644 index 00000000..8436bf06 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 96a21340..87f4ca02 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=9 format=2] +[gd_scene load_steps=11 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] @@ -7,11 +7,13 @@ [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [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/rooms/turno_cocina/cocina/assets/depth.png" type="Texture" id=7] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" type="Texture" id=8] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture" id=9] -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 1131, 195, 1245.43, 193.692, 1306, 193, 1246, 291, 170, 291, 180, 219, 137, 198, 200, 151, 568, 72, -346, 392, -1217, 390, -1221, 244, -857, 225, -451, 348, -1046, 121, 1082, 89, 1445, 460, 65, 379, -678, 228 ) -polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8 ), PoolIntArray( 9, 10, 11, 12, 13 ), PoolIntArray( 11, 14, 12 ), PoolIntArray( 8, 15, 0, 4, 5 ), PoolIntArray( 4, 3, 16, 17 ), PoolIntArray( 17, 16, 9 ), PoolIntArray( 13, 17, 9 ), PoolIntArray( 13, 12, 18 ) ] -outlines = [ PoolVector2Array( -1046, 121, -857, 225, -678, 228, -451, 348, 65, 379, 170, 291, 180, 219, 137, 198, 200, 151, 568, 72, 1082, 89, 1131, 195, 1245.43, 193.692, 1306, 193, 1246, 291, 1445, 460, -346, 392, -1217, 390, -1221, 244 ) ] +[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, 1466, 514, 1345, 505, 1320, 485, 1382, 439, 1466, 412, 1493, 479, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1788, 325, 1787, 383, 2018, 419, 2238, 386, 2109, 424 ) +polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8, 9 ), PoolIntArray( 9, 8, 10, 11 ), PoolIntArray( 12, 11, 10 ), PoolIntArray( 12, 10, 13 ), PoolIntArray( 14, 12, 13 ), PoolIntArray( 15, 16, 17, 4, 3 ), PoolIntArray( 18, 19, 20, 21, 22, 23 ), PoolIntArray( 24, 14, 13, 25, 26 ), PoolIntArray( 27, 24, 26, 28 ), PoolIntArray( 29, 30, 27, 28, 31, 32 ), PoolIntArray( 32, 31, 33, 34 ), PoolIntArray( 18, 34, 33, 19 ), PoolIntArray( 23, 22, 35, 36 ), PoolIntArray( 37, 36, 35, 38, 39 ), PoolIntArray( 4, 17, 39, 38 ) ] +outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1320, 485, 1382, 439, 1466, 412, 1788, 325, 2238, 386, 2283, 493, 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2287, 687, 2062, 635, 2113, 565, 2109, 424, 2018, 419, 1787, 383, 1493, 479, 1466, 514, 1480, 587, 1489, 627, 1502, 646, 1409, 752, 1269, 739, 696, 737, 273, 570, 252, 478, 200, 465, 162, 471, 144, 568, 3, 570, -56, 524, 111, 445, 229, 445, 305, 524, 512, 591, 703, 699, 1241, 699, 1345, 667 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -27,11 +29,21 @@ texture = ExtResource( 3 ) [node name="ESCTerrain" type="Navigation2D" parent="."] script = ExtResource( 4 ) scales = ExtResource( 7 ) -scale_max = 2.0 +scale_min = 0.25 +scale_max = 1.25 + +[node name="Foreground-mesa" type="Sprite" parent="ESCTerrain"] +position = Vector2( 1786, 424 ) +z_index = 4096 +texture = ExtResource( 8 ) [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] -position = Vector2( 1160, 289 ) -navpoly = SubResource( 1 ) +navpoly = SubResource( 3 ) + +[node name="Foreground-silla" type="Sprite" parent="ESCTerrain/NavigationPolygonInstance"] +position = Vector2( 202, 499 ) +z_index = 4096 +texture = ExtResource( 9 ) [node name="puerta_detras" type="Area2D" parent="."] pause_mode = 1