diff --git a/gymkhana/items/inventory/I_Bombona.tscn b/gymkhana/items/inventory/I_Bombona.tscn index 7ea028b9..5ec2670b 100644 --- a/gymkhana/items/inventory/I_Bombona.tscn +++ b/gymkhana/items/inventory/I_Bombona.tscn @@ -1,25 +1,20 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://game/items/inventory/wrench.png" type="Texture" id=1] +[ext_resource path="res://gymkhana/items/inventory/assets/bombona.png" type="Texture" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip-reworked/tooltip-action2.tscn" type="PackedScene" id=28] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip-reworked/tooltip-action1.tscn" type="PackedScene" id=29] [node name="i_bombona" type="Area2D"] pause_mode = 1 +position = Vector2( 0, -1 ) [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 10, 10 ) +scale = Vector2( 0.65625, 0.65625 ) texture = ExtResource( 1 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PoolVector2Array( -13, -19, -14, -3, -15, 30, -4, 34, 10, 32, 20, 29, 22, 16, 22, -6, 21, -19, 12, -28, 1, -28 ) - -[node name="action1" parent="." instance=ExtResource( 29 )] -position = Vector2( -53, -48 ) - -[node name="action2" parent="." instance=ExtResource( 28 )] -position = Vector2( -13, 51 ) +position = Vector2( -6, -4 ) +scale = Vector2( 0.67384, 0.67384 ) +polygon = PoolVector2Array( -22, -30, -23, -3, -23, 59, 9, 64, 34, 61, 41, 58, 41, -3, 42, -23, 37, -30, 35, -39, 26, -42, 26, -31, 20, -38, 13, -36, 11, -49, 7, -49, 4, -36, -7, -36, -11, -44, -19, -39, -17, -30 ) [node name="ESCLocation" type="Position2D" parent="."] position = Vector2( -65, 57 ) diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index edd2a6bf..4fc43ed1 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=31 format=2] +[gd_scene load_steps=32 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] @@ -28,6 +28,7 @@ [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png" type="Texture" id=26] [ext_resource path="res://gymkhana/items/inventory/I_Bombona.tscn" type="PackedScene" id=27] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=28] +[ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29] [sub_resource type="SpriteFrames" id=2] animations = [ { @@ -38,9 +39,9 @@ animations = [ { } ] [sub_resource type="NavigationPolygon" id=1] -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 ) ] +vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 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, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15 ), PoolIntArray( 16, 17, 18, 19, 5 ), PoolIntArray( 16, 20, 17 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 13, 15 ), PoolIntArray( 5, 21, 16 ), PoolIntArray( 22, 15, 3, 6 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 19, 23 ) ] +outlines = [ PoolVector2Array( 263, 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, 242, 376 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -63,7 +64,7 @@ script = ExtResource( 2 ) position = Vector2( 1476, 363 ) scale = Vector2( 0.634168, 0.634168 ) frames = SubResource( 2 ) -frame = 11 +frame = 3 playing = true flip_h = true @@ -71,7 +72,7 @@ flip_h = true position = Vector2( 953, 329 ) scale = Vector2( 0.867751, 0.867751 ) frames = SubResource( 2 ) -frame = 10 +frame = 2 playing = true offset = Vector2( -0.09375, 20.0582 ) @@ -113,13 +114,13 @@ position = Vector2( 748, 465 ) script = ExtResource( 3 ) [node name="bombona" parent="Hotspots" instance=ExtResource( 27 )] -position = Vector2( 557, 408 ) +position = Vector2( 583, 414 ) script = ExtResource( 28 ) global_id = "i_bombona" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona.esc" tooltip_name = "TT Mirar bombona" combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 8 ) +inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) tooltip2_name = "TT2 Coger bombona" inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" @@ -133,7 +134,7 @@ global_id = "i_bombona2" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc" tooltip_name = "TT Mirar bombona" combine_when_selected_action_is_in = [ "action1" ] -inventory_texture = ExtResource( 8 ) +inventory_texture = ExtResource( 29 ) dialog_color = Color( 1, 1, 1, 1 ) tooltip2_name = "TT2 Coger bombona" inventory_action1_text = "Usar"