diff --git a/gymkhana/items/inventory/I_Bombona.tscn b/gymkhana/items/inventory/I_Bombona.tscn index 7ec7c9b2..75f193e1 100644 --- a/gymkhana/items/inventory/I_Bombona.tscn +++ b/gymkhana/items/inventory/I_Bombona.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=5 format=2] +[ext_resource path="res://game/items/inventory/wrench.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/item.gd" type="Script" id=27] [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"] +[node name="i_bombona" type="Area2D"] pause_mode = 1 position = Vector2( 557, 408 ) script = ExtResource( 27 ) @@ -15,24 +16,29 @@ tooltip_name = "TT Mirar bombona" tooltip2_name = "TT2 Coger bombona" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource( 1 ) action1_text = "Mirar bombona" action2_text = "Coger bombona" animations = null -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="I_Bombona"] +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 10, 10 ) +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="I_Bombona" instance=ExtResource( 29 )] +[node name="action1" parent="." instance=ExtResource( 29 )] position = Vector2( -53, -48 ) -[node name="action2" parent="I_Bombona" instance=ExtResource( 28 )] +[node name="action2" parent="." instance=ExtResource( 28 )] position = Vector2( -13, 51 ) -[node name="ESCLocation" type="Position2D" parent="I_Bombona"] +[node name="ESCLocation" type="Position2D" parent="."] position = Vector2( -65, 57 ) script = ExtResource( 3 ) -[connection signal="mouse_entered" from="I_Bombona" to="I_Bombona/action1" method="_on_ESCItemWithTooltip_mouse_entered"] -[connection signal="mouse_entered" from="I_Bombona" to="I_Bombona/action2" method="_on_ESCItemWithTooltip_mouse_entered"] -[connection signal="mouse_exited" from="I_Bombona" to="I_Bombona/action1" method="_on_ESCItemWithTooltip_mouse_exited"] -[connection signal="mouse_exited" from="I_Bombona" to="I_Bombona/action2" method="_on_ESCItemWithTooltip_mouse_exited"] +[connection signal="mouse_entered" from="i_bombona" to="i_bombona/action1" method="_on_ESCItemWithTooltip_mouse_entered"] +[connection signal="mouse_entered" from="i_bombona" to="i_bombona/action2" method="_on_ESCItemWithTooltip_mouse_entered"] +[connection signal="mouse_exited" from="i_bombona" to="i_bombona/action1" method="_on_ESCItemWithTooltip_mouse_exited"] +[connection signal="mouse_exited" from="i_bombona" to="i_bombona/action2" method="_on_ESCItemWithTooltip_mouse_exited"] diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc index 78f57d90..8726342d 100644 --- a/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc @@ -1,7 +1,8 @@ :action1 -say player "Es naranja" +say player "Es naranja" [!i/i_bombona] +say player "Está en mi bolsillo" [i/i_bombona] :action2 say player "Voy a cogerla" -inventory_add I_Bombona -set_active I_Bombona false +inventory_add i_bombona +set_active i_bombona false