From 1445f1db78f6518c7f46c6dca675488e6bd30013 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Thu, 9 Mar 2023 12:39:28 +0100 Subject: [PATCH] Wrench added to trasera_cocina --- gymkhana/items/inventory/assets/wrench.png | Bin 0 -> 420 bytes gymkhana/items/inventory/wrench.esc | 10 +++++ gymkhana/items/inventory/wrench.tscn | 35 ++++++++++++++++++ .../rooms/trasera_cocina/trasera_cocina.tscn | 22 ++++++++--- 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 gymkhana/items/inventory/assets/wrench.png create mode 100755 gymkhana/items/inventory/wrench.esc create mode 100644 gymkhana/items/inventory/wrench.tscn diff --git a/gymkhana/items/inventory/assets/wrench.png b/gymkhana/items/inventory/assets/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..16d6b3eacb9a14585c8c49cdc3c816ef600fcac5 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^7C>yt!3-orSR^`u6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(Ko&cW^*Mx+G|Ns9VIB)m(H; z-OdA3{;4>Bmo=MKEcZl|OWBptZenccvAYR{i`H;E1Ww+4VDoOL!0yk9LM|I?O}d?w zh0h);n6NZQZ@(&=*~w6rt~IV4o2E#you2iAqj_g&&5nt)>f2ASCOmRJU-{up&5PZ} zdv++7)Wxf^TUb|hy>_rp$=Kg?r`SodahmDEMyLRz3k{1)2O9*d_wq(Pi7ljZUug;wJ+_KKPQ@Lase1(44$rj JF6*2UngBRUr?LP5 literal 0 HcmV?d00001 diff --git a/gymkhana/items/inventory/wrench.esc b/gymkhana/items/inventory/wrench.esc new file mode 100755 index 00000000..1ff103f7 --- /dev/null +++ b/gymkhana/items/inventory/wrench.esc @@ -0,0 +1,10 @@ +:action1 +say player "That's a wrench on the floor." +stop + +:action2 +set_active wrench false +inventory_add wrench + +:action3 +say player "It seems even more useful now that I picked it up." diff --git a/gymkhana/items/inventory/wrench.tscn b/gymkhana/items/inventory/wrench.tscn new file mode 100644 index 00000000..a21c9ce5 --- /dev/null +++ b/gymkhana/items/inventory/wrench.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://gymkhana/items/inventory/assets/wrench.png" type="Texture" id=1] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=3] + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 37, 33.5 ) + +[node name="wrench" type="Area2D"] +pause_mode = 1 +script = ExtResource( 3 ) +global_id = "wrench" +esc_script = "res://gymkhana/items/inventory/wrench.esc" +action1_text = "¿Que es esto?" +action2_text = "Coger" +action3_text = "¿Que es esto?" +action4_text = "Usar" +combine_when_selected_action_is_in = PoolStringArray( "use" ) +use_from_inventory_only = true +inventory_texture = ExtResource( 1 ) +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 0 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 0 ) +shape = SubResource( 2 ) + +[node name="ESCLocation" type="Position2D" parent="."] +position = Vector2( 0, 0 ) +script = ExtResource( 2 ) diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index ac308097..e980a0a7 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=17 format=2] +[gd_scene load_steps=18 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] @@ -14,6 +14,7 @@ [ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=30] [ext_resource path="res://gymkhana/items/inventory/caja_herramientas.tscn" type="PackedScene" id=31] +[ext_resource path="res://gymkhana/items/inventory/wrench.tscn" type="PackedScene" id=32] [sub_resource type="NavigationPolygon" id=1] 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, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 ) @@ -64,11 +65,16 @@ script = ExtResource( 28 ) global_id = "l_exit" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" is_exit = true +combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) action1_text = "Esto es una puerta y tiene una descripcion mu larga" action2_text = "Entrar! con descricion..." -action3_target_texts = { "bombona2": "Usar la bombona con la puerta?" } -action4_target_texts = { "bombona2": "Lanzarla contra la puerta" } +action3_target_texts = { +"bombona2": "Usar la bombona con la puerta?" +} +action4_target_texts = { +"bombona2": "Lanzarla contra la puerta" +} target_when_selected_action_is_in = [ "action3", "action4" ] animations = SubResource( 2 ) @@ -120,7 +126,10 @@ tooltip_name = "Objervar sujeto" dialog_color = Color( 0, 1, 0.462745, 1 ) action1_text = "Objervar sujeto" action2_text = "Hablar" -action3_target_texts = { "bombona2": "Toma, un regalo", "caja_herramientas": "Regalar" } +action3_target_texts = { +"bombona2": "Toma, un regalo", +"caja_herramientas": "Regalar" +} target_when_selected_action_is_in = [ "action3" ] selectable = true @@ -132,7 +141,10 @@ global_id = "eneko_smoking" [node name="caja_herramientas" parent="." instance=ExtResource( 31 )] position = Vector2( 707, 422 ) -[node name="ESCLocation" type="Position2D" parent="ESCItemWithTooltip"] +[node name="wrench" parent="." instance=ExtResource( 32 )] +position = Vector2( 507, 522 ) + +[node name="ESCItemWithTooltip@ESCLocation" type="Position2D" parent="."] position = Vector2( -51, 69 ) script = ExtResource( 3 ) global_id = "caja_herramientas"