diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png b/gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png new file mode 100644 index 00000000..68dfc51e Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png new file mode 100644 index 00000000..f92abfc6 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png new file mode 100644 index 00000000..04aea4bf Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png new file mode 100644 index 00000000..4fbc8176 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index a5e08d13..66e01276 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=16 format=2] +[gd_scene load_steps=21 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] @@ -14,12 +14,29 @@ [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=13] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" type="Texture" id=15] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture" id=16] +[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] [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 ) 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, 14, 13, 19, 20 ), PoolIntArray( 21, 18, 20, 22 ), PoolIntArray( 23, 24, 21, 22, 25, 26 ), PoolIntArray( 26, 25, 27, 28 ), PoolIntArray( 29, 28, 27, 30, 31 ), PoolIntArray( 4, 17, 32, 33 ), PoolIntArray( 34, 33, 32, 35, 36 ), PoolIntArray( 37, 34, 36, 38, 31 ), PoolIntArray( 31, 38, 29 ), PoolIntArray( 39, 40, 31, 30, 41 ) ] outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1337.5, 449, 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 ) ] +[sub_resource type="SpriteFrames" id=4] +animations = [ { +"frames": [ ExtResource( 15 ) ], +"loop": true, +"name": "apagado", +"speed": 5.0 +}, { +"frames": [ ExtResource( 17 ), ExtResource( 18 ), ExtResource( 16 ) ], +"loop": true, +"name": "encendido", +"speed": 5.0 +} ] + [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) __meta__ = { @@ -283,8 +300,8 @@ tooltips = { } action3_target_texts = { "turno_cocina_madera": "Meter leña en la económica", -"turno_cocina_olla_vacia": "Poner encima de la económica", -"turno_cocina_olla_llena": "Poner encima de la económica" +"turno_cocina_olla_llena": "Poner encima de la económica", +"turno_cocina_olla_vacia": "Poner encima de la económica" } target_when_selected_action_is_in = [ "action3" ] animations = null @@ -327,12 +344,18 @@ tooltips = { } action3_target_texts = { "turno_cocina_mechero": "Encender el gas", -"turno_cocina_olla_vacia": "Cocinar al gas", -"turno_cocina_olla_llena": "Cocinar al gas" +"turno_cocina_olla_llena": "Cocinar al gas", +"turno_cocina_olla_vacia": "Cocinar al gas" } target_when_selected_action_is_in = [ "action3" ] animations = null +[node name="AnimatedSprite" type="AnimatedSprite" parent="turno_cocina_cocina_gas"] +position = Vector2( 7, -8 ) +frames = SubResource( 4 ) +animation = "apagado" +playing = true + [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] position = Vector2( 2, -33 ) polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 )