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..f8d0bfe3 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -15,11 +15,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" 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" } +combine_when_selected_action_is_in = [ "action4" ] animations = null [node name="Sprite" type="Sprite" parent="."] @@ -33,4 +34,4 @@ shape = SubResource( 1 ) [node name="ESCLocation" type="Position2D" parent="."] position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +script = ExtResource( 3 ) 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_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"]