imagen carton

gymkhana/items/inventory/turno_cocina_carton.tscn

@@ -1,7 +1,9 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 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_carton.png" type="Texture" id=2]
+[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture" id=3]
+
 
 [node name="turno_cocina_carton" type="Area2D"]
 pause_mode = 1
@@ -10,7 +12,7 @@ script = ExtResource( 1 )
 global_id = "turno_cocina_carton"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc"
 combine_when_selected_action_is_in = [ "action4" ]
-inventory_texture = ExtResource( 2 )
+inventory_texture = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
 "action1": "Mirar",

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -300,11 +300,11 @@ tooltips = {
 "action2": "Usar"
 }
 action3_target_texts = {
+"turno_cocina_carton": "Meter cartón en la económica",
+"turno_cocina_carton_encendido": "Encender la económica",
 "turno_cocina_madera": "Meter leña en la económica",
 "turno_cocina_olla_llena": "Poner encima de la económica",
-"turno_cocina_olla_vacia": "Poner encima de la económica",
-"turno_cocina_carton": "Meter cartón en la económica",
-"turno_cocina_carton_encendido": "Encender la económica"
+"turno_cocina_olla_vacia": "Poner encima de la económica"
 }
 target_when_selected_action_is_in = [ "action3" ]
 animations = null
@@ -354,18 +354,20 @@ action3_target_texts = {
 target_when_selected_action_is_in = [ "action3" ]
 animations = null
 
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"]
+position = Vector2( 2, -33 )
+z_index = 5
+polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 )
+
 [node name="AnimatedSprite" type="AnimatedSprite" parent="turno_cocina_cocina_gas"]
 position = Vector2( 7, -8 )
+z_as_relative = false
 frames = SubResource( 4 )
 animation = "apagado"
 playing = true
 
-[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 )
+position = Vector2( -56, 78 )
 script = ExtResource( 5 )
 
 [node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )]

gymkhana/rooms/turno_cocina/cocina/esc/economica.esc

@@ -8,9 +8,9 @@ say current_player "No pienso poner la mano encima."
 say current_player "Debería llenar la olla de agua primero."
 
 :action3 turno_cocina_olla_llena
+set_active turno_cocina_olla_llena true
 say current_player "Me siento un cocinero de verdad."
 set_global turno_cocina_economica_con_olla true
-set_active turno_cocina_olla_llena true
 inventory_remove turno_cocina_olla_llena
 
 :action3 turno_cocina_madera