From dc7deb496f8f30c6d550d493674af1f00fa9b295 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Thu, 9 Mar 2023 12:19:30 +0100 Subject: [PATCH] caja_herramientas code cleanup --- gymkhana/items/inventory/caja_herramientas.tscn | 16 +++++++++++----- .../rooms/trasera_cocina/trasera_cocina.tscn | 3 +-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gymkhana/items/inventory/caja_herramientas.tscn b/gymkhana/items/inventory/caja_herramientas.tscn index d46fac15..ccb161b3 100644 --- a/gymkhana/items/inventory/caja_herramientas.tscn +++ b/gymkhana/items/inventory/caja_herramientas.tscn @@ -1,24 +1,26 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://gymkhana/items/inventory/assets/caja-herramientas.png" type="Texture" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 22.5, 12.5 ) -[node name="ESCItemWithTooltip" type="Area2D"] +[node name="caja_herramientas" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) global_id = "caja_herramientas" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) -animations = null +esc_script = "res://gymkhana/items/inventory/caja_herramientas.esc" combine_when_selected_action_is_in = [ "action4" ] use_from_inventory_only = true +inventory_texture = ExtResource( 2 ) +dialog_color = Color( 1, 1, 1, 1 ) action1_text = "¿Que es esto?" action2_text = "Coger" action3_text = "Mirar dentro" action4_text = "Usar" +animations = null [node name="Sprite" type="Sprite" parent="."] position = Vector2( -2, 0 ) @@ -28,3 +30,7 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( -1.5, -0.5 ) shape = SubResource( 1 ) + +[node name="ESCLocation" type="Position2D" parent="."] +position = Vector2( -51, 69 ) +script = ExtResource( 3 ) diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 0d96b369..ac308097 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -130,8 +130,7 @@ script = ExtResource( 3 ) global_id = "eneko_smoking" [node name="caja_herramientas" parent="." instance=ExtResource( 31 )] -esc_script = "res://gymkhana/items/inventory/caja_herramientas.esc" -position = Vector2( 707, 522 ) +position = Vector2( 707, 422 ) [node name="ESCLocation" type="Position2D" parent="ESCItemWithTooltip"] position = Vector2( -51, 69 )