From fab2a7c23417e50fd685d53ad5cebb0b29347dba Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Thu, 16 Feb 2023 19:55:39 +0100 Subject: [PATCH] =?UTF-8?q?mont=C3=B3n=20de=20bombonas,=20pruebas=20para?= =?UTF-8?q?=20inventario=20lleno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gymkhana/items/inventory/I_Bombona.tscn | 10 --- .../rooms/trasera_cocina/esc/i_bombona2.esc | 15 ++++ .../rooms/trasera_cocina/esc/i_bombona3.esc | 15 ++++ .../rooms/trasera_cocina/esc/i_bombona4.esc | 15 ++++ .../rooms/trasera_cocina/esc/i_bombona5.esc | 15 ++++ .../rooms/trasera_cocina/esc/i_bombona6.esc | 15 ++++ .../rooms/trasera_cocina/trasera_cocina.tscn | 83 ++++++++++++++++++- project.godot | 2 +- 8 files changed, 156 insertions(+), 14 deletions(-) create mode 100644 gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc create mode 100644 gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc create mode 100644 gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc create mode 100644 gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc create mode 100644 gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc diff --git a/gymkhana/items/inventory/I_Bombona.tscn b/gymkhana/items/inventory/I_Bombona.tscn index d06ba6dc..ef5cb92f 100644 --- a/gymkhana/items/inventory/I_Bombona.tscn +++ b/gymkhana/items/inventory/I_Bombona.tscn @@ -2,26 +2,16 @@ [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/esc_item_with_tooltip.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"] pause_mode = 1 -position = Vector2( 557, 408 ) -script = ExtResource( 27 ) -global_id = "i_bombona" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona.esc" -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" -inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" -inventory_action2_text = "¿Por qué es una llave inglesa?" -animations = null [node name="Sprite" type="Sprite" parent="."] position = Vector2( 10, 10 ) diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc new file mode 100644 index 00000000..2ebf0678 --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc @@ -0,0 +1,15 @@ +:action1 +say player "Es naranja" [!i/i_bombona2] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona2] + +:action2 +> [!i/i_bombona2] + say player "Voy a cogerla" + set_active i_bombona2 false + inventory_add i_bombona2 + stop + +> [i/i_bombona2] + say player "Antes era una bombona pero ahora es una llave inglesa." + say player "¿Esto es real?" + say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc new file mode 100644 index 00000000..0027005b --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc @@ -0,0 +1,15 @@ +:action1 +say player "Es naranja" [!i/i_bombona3] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona3] + +:action2 +> [!i/i_bombona3] + say player "Voy a cogerla" + set_active i_bombona3 false + inventory_add i_bombona3 + stop + +> [i/i_bombona3] + say player "Antes era una bombona pero ahora es una llave inglesa." + say player "¿Esto es real?" + say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc new file mode 100644 index 00000000..e6df80bf --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc @@ -0,0 +1,15 @@ +:action1 +say player "Es naranja" [!i/i_bombona4] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona4] + +:action2 +> [!i/i_bombona4] + say player "Voy a cogerla" + set_active i_bombona4 false + inventory_add i_bombona4 + stop + +> [i/i_bombona4] + say player "Antes era una bombona pero ahora es una llave inglesa." + say player "¿Esto es real?" + say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc new file mode 100644 index 00000000..16281a29 --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc @@ -0,0 +1,15 @@ +:action1 +say player "Es naranja" [!i/i_bombona5] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona5] + +:action2 +> [!i/i_bombona5] + say player "Voy a cogerla" + set_active i_bombona5 false + inventory_add i_bombona5 + stop + +> [i/i_bombona5] + say player "Antes era una bombona pero ahora es una llave inglesa." + say player "¿Esto es real?" + say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc new file mode 100644 index 00000000..c91ad060 --- /dev/null +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc @@ -0,0 +1,15 @@ +:action1 +say player "Es naranja" [!i/i_bombona6] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona6] + +:action2 +> [!i/i_bombona6] + say player "Voy a cogerla" + set_active i_bombona6 false + inventory_add i_bombona6 + stop + +> [i/i_bombona6] + say player "Antes era una bombona pero ahora es una llave inglesa." + say player "¿Esto es real?" + say player "¿Vivo en Matrix?" diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 83a9ddde..4e982413 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -7,7 +7,6 @@ [ext_resource path="res://gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd" type="Script" id=5] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png" type="Texture" id=6] [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=7] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=8] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=11] @@ -27,6 +26,7 @@ [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=25] [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] [sub_resource type="SpriteFrames" id=2] animations = [ { @@ -62,7 +62,7 @@ script = ExtResource( 2 ) position = Vector2( 1476, 363 ) scale = Vector2( 0.634168, 0.634168 ) frames = SubResource( 2 ) -frame = 1 +frame = 7 playing = true flip_h = true @@ -70,6 +70,7 @@ flip_h = true position = Vector2( 1018, 333 ) scale = Vector2( 0.867751, 0.867751 ) frames = SubResource( 2 ) +frame = 6 playing = true offset = Vector2( -0.09375, 20.0582 ) @@ -91,7 +92,7 @@ is_start_location = true [node name="entrada_cocina" type="Area2D" parent="Hotspots"] pause_mode = 1 -script = ExtResource( 8 ) +script = ExtResource( 28 ) global_id = "l_exit" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" is_exit = true @@ -111,6 +112,82 @@ position = Vector2( 748, 465 ) script = ExtResource( 3 ) [node name="bombona" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 557, 408 ) +script = ExtResource( 28 ) +global_id = "i_bombona" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null + +[node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 357, 408 ) +script = ExtResource( 28 ) +global_id = "i_bombona2" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null + +[node name="bombona3" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 857, 508 ) +script = ExtResource( 28 ) +global_id = "i_bombona3" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null + +[node name="bombona4" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 757, 508 ) +script = ExtResource( 28 ) +global_id = "i_bombona4" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null + +[node name="bombona5" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 557, 508 ) +script = ExtResource( 28 ) +global_id = "i_bombona5" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null + +[node name="bombona6" parent="Hotspots" instance=ExtResource( 27 )] +position = Vector2( 1057, 508 ) +script = ExtResource( 28 ) +global_id = "i_bombona6" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc" +tooltip_name = "TT Mirar bombona" +action1_text = "" +action2_text = "" +tooltip2_name = "TT2 Coger bombona" +inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?" +inventory_action2_text = "¿Por qué es una llave inglesa?" +animations = null [node name="Columna" type="Sprite" parent="."] position = Vector2( 253.25, 294.5 ) diff --git a/project.godot b/project.godot index 0d9cd029..0365cc65 100644 --- a/project.godot +++ b/project.godot @@ -850,7 +850,7 @@ escoria="*res://addons/escoria-core/game/esc_autoload.gd" [display] window/size/width=1280 -window/size/height=640 +window/size/height=750 window/stretch/mode="2d" window/stretch/aspect="keep"