diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png new file mode 100644 index 00000000..27046983 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png new file mode 100644 index 00000000..bec67608 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png new file mode 100644 index 00000000..66d8de2e Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/columna.png b/gymkhana/rooms/trasera_cocina/assets/columna.png new file mode 100644 index 00000000..b94e8e70 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/columna.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png new file mode 100644 index 00000000..2fbda8c1 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png new file mode 100644 index 00000000..7eb916a8 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png new file mode 100644 index 00000000..a22aa2ab Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png new file mode 100644 index 00000000..4f1ad403 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png new file mode 100644 index 00000000..c24980c0 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png new file mode 100644 index 00000000..5ba10a56 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png new file mode 100644 index 00000000..52f5b179 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png new file mode 100644 index 00000000..f5a55ef7 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png new file mode 100644 index 00000000..8a12b369 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png new file mode 100644 index 00000000..b5d5880d Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png new file mode 100644 index 00000000..2198fe38 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png new file mode 100644 index 00000000..0228624a Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png new file mode 100644 index 00000000..67b8f1bc Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png new file mode 100644 index 00000000..6df5a0f8 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png new file mode 100644 index 00000000..4d9bca3e Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png new file mode 100644 index 00000000..a0042b23 Binary files /dev/null and b/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png differ diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-fuma-sprite.tpsheet b/gymkhana/rooms/trasera_cocina/assets/eneko-fuma-sprite.tpsheet new file mode 100644 index 00000000..3b10f2f3 --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/assets/eneko-fuma-sprite.tpsheet @@ -0,0 +1,258 @@ +{ + "textures": [ + { + "image": "eneko-fuma-sprite.png", + "size": { + "w": 300, + "h": 2048 + }, + "sprites": [ + { + "filename": "unscreen-001.jpg", + "region": { + "x": 0, + "y": 0, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-002.jpg", + "region": { + "x": 0, + "y": 256, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-003.jpg", + "region": { + "x": 0, + "y": 512, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-004.jpg", + "region": { + "x": 0, + "y": 768, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-005.jpg", + "region": { + "x": 0, + "y": 1024, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-006.jpg", + "region": { + "x": 0, + "y": 1280, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-007.jpg", + "region": { + "x": 0, + "y": 1536, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-008.jpg", + "region": { + "x": 0, + "y": 1792, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-009.jpg", + "region": { + "x": 150, + "y": 0, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-010.jpg", + "region": { + "x": 150, + "y": 256, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-011.jpg", + "region": { + "x": 150, + "y": 512, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-012.jpg", + "region": { + "x": 150, + "y": 768, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-013.jpg", + "region": { + "x": 150, + "y": 1024, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-014.jpg", + "region": { + "x": 150, + "y": 1280, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-015.jpg", + "region": { + "x": 150, + "y": 1536, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + }, + { + "filename": "unscreen-016.jpg", + "region": { + "x": 150, + "y": 1792, + "w": 150, + "h": 256 + }, + "margin": { + "x": 0, + "y": 0, + "w": 0, + "h": 0 + } + } + ] + } + ], + "meta": { + "app": "http://free-tex-packer.com", + "version": "0.6.7", + "format": "RGBA8888", + } +} \ No newline at end of file diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index fd8bafbe..d6649953 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -1,18 +1,43 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=28 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_background.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test3.jpg" type="Texture" id=5] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577.jpg" type="Texture" id=6] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png" type="Texture" id=6] [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=8] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=11] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png" type="Texture" id=12] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png" type="Texture" id=13] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png" type="Texture" id=14] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png" type="Texture" id=15] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png" type="Texture" id=16] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png" type="Texture" id=17] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png" type="Texture" id=18] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png" type="Texture" id=19] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png" type="Texture" id=20] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png" type="Texture" id=21] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png" type="Texture" id=22] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png" type="Texture" id=23] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png" type="Texture" id=24] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=25] +[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png" type="Texture" id=26] + +[sub_resource type="SpriteFrames" id=2] +animations = [ { +"frames": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 17 ), ExtResource( 23 ), ExtResource( 13 ), ExtResource( 21 ), ExtResource( 12 ), ExtResource( 24 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 10 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 9 ), ExtResource( 20 ), ExtResource( 22 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 1318, 435, 1394, 422, 1388, 546, 1249, 454, 464, 432, 186, 527, 155, 425, 259, 395, 354, 391, 442, 395, 506, 457, 1133, 474, 981, 480, 864, 482, 846, 467, 725, 472, 749, 460, 794, 462, 584, 468 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7, 8, 9 ), PoolIntArray( 5, 4, 10 ), PoolIntArray( 11, 3, 2 ), PoolIntArray( 11, 2, 5, 12 ), PoolIntArray( 13, 12, 5 ), PoolIntArray( 14, 13, 5, 15 ), PoolIntArray( 15, 16, 17, 14 ), PoolIntArray( 5, 10, 18 ), PoolIntArray( 5, 18, 15 ) ] -outlines = [ PoolVector2Array( 259, 395, 354, 391, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1394, 422, 1388, 546, 186, 527, 155, 425 ) ] +vertices = PoolVector2Array( 155, 425, 129, 383, 260, 374, 1511, 445, 1512, 574, 193, 574, 1133, 474, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 1318, 435, 1367, 411, 1420, 441, 725, 472, 794, 462, 846, 467, 864, 482, 749, 460, 584, 468, 1249, 454, 981, 480 ) +polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8 ), PoolIntArray( 8, 9, 10, 5 ), PoolIntArray( 5, 10, 11 ), PoolIntArray( 12, 13, 14 ), PoolIntArray( 15, 16, 17, 18, 5 ), PoolIntArray( 15, 19, 16 ), PoolIntArray( 5, 11, 20 ), PoolIntArray( 21, 12, 14 ), PoolIntArray( 5, 20, 15 ), PoolIntArray( 21, 14, 3, 6 ), PoolIntArray( 22, 6, 5 ), PoolIntArray( 5, 18, 22 ) ] +outlines = [ PoolVector2Array( 260, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1420, 441, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -31,17 +56,40 @@ mouse_filter = 2 texture = ExtResource( 6 ) script = ExtResource( 2 ) +[node name="AnimatedSprite3" type="AnimatedSprite" parent="."] +position = Vector2( 643, 359 ) +scale = Vector2( 0.752992, 0.752993 ) +frames = SubResource( 2 ) +frame = 5 +playing = true +offset = Vector2( -0.09375, 20.0582 ) + +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( 1476, 363 ) +scale = Vector2( 0.634168, 0.634168 ) +frames = SubResource( 2 ) +frame = 8 +playing = true +flip_h = true + +[node name="AnimatedSprite2" type="AnimatedSprite" parent="."] +position = Vector2( 1018, 333 ) +scale = Vector2( 0.867751, 0.867751 ) +frames = SubResource( 2 ) +frame = 7 +playing = true +offset = Vector2( -0.09375, 20.0582 ) + [node name="ESCTerrain" type="Navigation2D" parent="."] script = ExtResource( 4 ) -scales = ExtResource( 5 ) +scales = ExtResource( 26 ) scale_min = 0.5 -scale_max = 0.8 [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] navpoly = SubResource( 1 ) [node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( 783, 480 ) +position = Vector2( 786, 501 ) script = ExtResource( 3 ) global_id = "trasera_cocina_start" is_start_location = true @@ -68,3 +116,9 @@ polygon = PoolVector2Array( 21, 575, 22, 331, 135, 339, 137, 581 ) [node name="Position2D" type="Position2D" parent="Hotspots/entrada_cocina"] position = Vector2( 748, 465 ) script = ExtResource( 3 ) + +[node name="Columna" type="Sprite" parent="."] +position = Vector2( 253.25, 294.5 ) +scale = Vector2( 0.973684, 1.02358 ) +z_index = 400 +texture = ExtResource( 25 )