diff --git a/gymkhana/items/inventory/assets/bombona-inv.png b/gymkhana/items/inventory/assets/bombona-inv.png deleted file mode 100644 index 39495da9..00000000 Binary files a/gymkhana/items/inventory/assets/bombona-inv.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/cafetera-inv.png b/gymkhana/items/inventory/assets/cafetera-inv.png deleted file mode 100644 index 45934b22..00000000 Binary files a/gymkhana/items/inventory/assets/cafetera-inv.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/cafetera.png b/gymkhana/items/inventory/assets/cafetera.png deleted file mode 100644 index a1c31bfa..00000000 Binary files a/gymkhana/items/inventory/assets/cafetera.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/caja-herramientas.png b/gymkhana/items/inventory/assets/caja-herramientas.png deleted file mode 100644 index cacb1259..00000000 Binary files a/gymkhana/items/inventory/assets/caja-herramientas.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/caja_herramientas-inv.png b/gymkhana/items/inventory/assets/caja_herramientas-inv.png deleted file mode 100644 index 5a637738..00000000 Binary files a/gymkhana/items/inventory/assets/caja_herramientas-inv.png and /dev/null differ diff --git a/gymkhana/items/inventory/assets/wrench.png b/gymkhana/items/inventory/assets/wrench.png deleted file mode 100644 index 16d6b3ea..00000000 Binary files a/gymkhana/items/inventory/assets/wrench.png and /dev/null differ diff --git a/gymkhana/items/inventory/turno_cocina_mechero.esc b/gymkhana/items/inventory/turno_cocina_mechero.esc index db47f32c..8a812a97 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.esc +++ b/gymkhana/items/inventory/turno_cocina_mechero.esc @@ -1,6 +1,20 @@ :action1 -say player "Que cosa tan curiosa" +set_angle player 270 +say player "Mi mechero, que bien!!" +set_angle player 270 +say player "Ayer lo dejé un segundo encima de la mesa y desapareció." :action2 -say player "No lo quiero coger" +set_angle player 270 +say current_player "A la saca!" +set_active turno_cocina_mechero false +inventory_add turno_cocina_mechero +:action3 +say player "Parece que no tiene gas." +say player "Eso explica que lo hayan abandonado." +set_angle player 180 +say player "Si vienes a Uli vigila tu mechero." + +:action4 turno_cocina_carton +say player "Fuego!" diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index 892c16c6..d93a5394 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -1,24 +1,21 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 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/turno_cocina_mechero.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="turno_cocina_mechero" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) global_id = "turno_cocina_mechero" esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" +combine_when_selected_action_is_in = [ "action4" ] inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar", - "action4": "Usar" +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" } animations = null @@ -27,10 +24,5 @@ position = Vector2( -2, 0 ) scale = Vector2( 0.5, 0.5 ) 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 ) \ No newline at end of file +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) diff --git a/gymkhana/items/inventory/wrench.esc b/gymkhana/items/inventory/wrench.esc deleted file mode 100755 index 1ff103f7..00000000 --- a/gymkhana/items/inventory/wrench.esc +++ /dev/null @@ -1,10 +0,0 @@ -: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 deleted file mode 100644 index e11e0c06..00000000 --- a/gymkhana/items/inventory/wrench.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[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" -tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "¿Que es esto?", - "action4": "Usar" -} -combine_when_selected_action_is_in = [ "action4" ] -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/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 8d2926e4..a5e08d13 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -283,6 +283,7 @@ tooltips = { } action3_target_texts = { "turno_cocina_madera": "Meter leña en la económica", +"turno_cocina_olla_vacia": "Poner encima de la económica", "turno_cocina_olla_llena": "Poner encima de la económica" } target_when_selected_action_is_in = [ "action3" ] @@ -312,6 +313,34 @@ script = ExtResource( 5 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"] polygon = PoolVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 ) +[node name="turno_cocina_cocina_gas" type="Area2D" parent="."] +pause_mode = 1 +position = Vector2( 2219, 272 ) +script = ExtResource( 6 ) +global_id = "turno_cocina_cocina_gas" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc" +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +tooltips = { +"action1": "Mirar", +"action2": "Encender" +} +action3_target_texts = { +"turno_cocina_mechero": "Encender el gas", +"turno_cocina_olla_vacia": "Cocinar al gas", +"turno_cocina_olla_llena": "Cocinar al gas" +} +target_when_selected_action_is_in = [ "action3" ] +animations = null + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] +position = Vector2( 2, -33 ) +polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 ) + +[node name="ESCLocation" type="Position2D" parent="turno_cocina_cocina_gas"] +position = Vector2( -9, 95 ) +script = ExtResource( 5 ) + [node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )] position = Vector2( 1281, 491 ) scale = Vector2( 1.06318, 1.06318 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc new file mode 100644 index 00000000..428890b9 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc @@ -0,0 +1,16 @@ +:action1 +say player "Rápido y sencillo. El gas mola." + +:action2 +say player "Necesito usar un mechero para encenderla." + +:action3 turno_cocina_mechero +say player "Ya tengo fuego, que listo soy!" [!turno_cocina_cocina_gas_encendida] +say player "Ya está encendida." [turno_cocina_cocina_gas_encendida] +set_global turno_cocina_cocina_gas_encendida true + +:action3 turno_cocina_olla_vacia +say player "Mejor uso la económica, sino seguro que Eneko me riñe." + +:action3 turno_cocina_olla_llena +say player "Mejor uso la económica, sino seguro que Eneko me riñe." diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc index 483693ad..871c1e91 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc @@ -4,6 +4,9 @@ say player "Yo diria que sirve para cocinar." :action2 say player "No pienso poner la mano encima." +:action3 turno_cocina_olla_vacia +say player "Debería llenar la olla de agua primero." + :action3 turno_cocina_olla_llena say player "Me siento un cocinero de verdad." set_global turno_cocina_economica_con_olla true diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 8b3328fa..b2424f38 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] @@ -9,7 +9,8 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=10] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11] [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) @@ -109,7 +110,16 @@ scale = Vector2( 0.5, 0.5 ) position = Vector2( 1, 96 ) script = ExtResource( 5 ) -[node name="turno_cocina_romero" parent="." instance=ExtResource( 10 )] +[node name="turno_cocina_mechero" parent="." instance=ExtResource( 10 )] +position = Vector2( 108, 438 ) +rotation = 1.44513 +scale = Vector2( 0.4, 0.4 ) + +[node name="ESCLocation" type="Position2D" parent="turno_cocina_mechero"] +position = Vector2( 296.645, -154.035 ) +script = ExtResource( 5 ) + +[node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )] position = Vector2( 61, 341 ) [node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"]