feat: encender la economica

gymkhana/items/inventory/turno_cocina_carton.esc

@@ -1,6 +1,13 @@
 :action1
-say player "Que cosa tan curiosa"
+say player "Una caja de cartón vacía."
 
 :action2
-say player "No lo quiero coger"
+say player "Cartón pa la saca!"
+set_active turno_cocina_carton false
+inventory_add turno_cocina_carton
 
+:action3
+say player "Es una caja cartón de vacía. ¿Qué haría al lado de la económica?"
+
+:action3 turno_cocina_mechero
+say player "El mechero no tiene gas, no puedo encender el cartón."

gymkhana/items/inventory/turno_cocina_carton.tscn

@@ -1,36 +1,34 @@
-[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_carton.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_carton" type="Area2D"]
 pause_mode = 1
+rotation = 1.11177
 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 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
-    "action4": "Usar"
+"action1": "Mirar",
+"action2": "Coger",
+"action3": "Mirar",
+"action4": "Usar"
 }
 animations = null
 
+action3_target_texts = {
+"turno_cocina_mechero": "Encender el cartón"
+}
+target_when_selected_action_is_in = [ "action3" ]
+
 [node name="Sprite" type="Sprite" parent="."]
 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 )
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 )

gymkhana/items/inventory/turno_cocina_carton_encendido.esc

@@ -0,0 +1,2 @@
+:action3
+say player "Con esto ya puedo encender lo que quiera."

gymkhana/items/inventory/turno_cocina_carton_encendido.tscn

@@ -0,0 +1,27 @@
+[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_carton_encendido.png" type="Texture" id=2]
+
+[node name="turno_cocina_carton_encendido" type="Area2D"]
+pause_mode = 1
+rotation = 1.11177
+script = ExtResource( 1 )
+global_id = "turno_cocina_carton_encendido"
+esc_script = "res://gymkhana/items/inventory/turno_cocina_carton_encendido.esc"
+combine_when_selected_action_is_in = [ "action4" ]
+inventory_texture = ExtResource( 2 )
+dialog_color = Color( 1, 1, 1, 1 )
+tooltips = {
+"action3": "Mirar",
+"action4": "Usar"
+}
+animations = null
+
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( -2, 0 )
+scale = Vector2( 0.5, 0.5 )
+texture = ExtResource( 2 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 )

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=17 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]
@@ -14,6 +14,7 @@
 [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12]
 [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=13]
 [ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=15]
 
 [sub_resource type="NavigationPolygon" id=3]
 vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 )
@@ -283,8 +284,10 @@ tooltips = {
 }
 action3_target_texts = {
 "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_olla_llena": "Poner encima de la económica"
+"turno_cocina_carton": "Meter cartón en la económica",
+"turno_cocina_carton_encendido": "Encender la económica"
 }
 target_when_selected_action_is_in = [ "action3" ]
 animations = null
@@ -326,9 +329,10 @@ tooltips = {
 "action2": "Encender"
 }
 action3_target_texts = {
+"turno_cocina_carton": "Prender el cartón",
 "turno_cocina_mechero": "Encender el gas",
-"turno_cocina_olla_vacia": "Cocinar al gas",
-"turno_cocina_olla_llena": "Cocinar al gas"
+"turno_cocina_olla_llena": "Cocinar al gas",
+"turno_cocina_olla_vacia": "Cocinar al gas"
 }
 target_when_selected_action_is_in = [ "action3" ]
 animations = null
@@ -349,3 +353,16 @@ scale = Vector2( 1.06318, 1.06318 )
 position = Vector2( -160.838, 201.283 )
 script = ExtResource( 5 )
 interaction_direction = 3
+
+[node name="turno_cocina_carton" parent="." instance=ExtResource( 15 )]
+position = Vector2( 1586, 536 )
+rotation = 1.44513
+scale = Vector2( 0.8, 0.8 )
+
+[node name="turno_cocina_carton_collision" type="CollisionPolygon2D" parent="turno_cocina_carton"]
+position = Vector2( 15.9014, -11.2695 )
+polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.1329, -1.61511, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 )
+
+[node name="turno_cocina_carton_location" type="Position2D" parent="turno_cocina_carton"]
+position = Vector2( 93.7431, -73.8329 )
+script = ExtResource( 5 )

gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc

@@ -9,6 +9,13 @@ 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_carton
+say player "No puedo hacerlo con la cocina apagada." [!turno_cocina_cocina_gas_encendida]
+say player "Muy bien, ya tengo una llama portable!" [turno_cocina_cocina_gas_encendida]
+set_global turno_cocina_cocina_gas_encendida false
+inventory_remove turno_cocina_carton
+inventory_add turno_cocina_carton_encendido
+
 :action3 turno_cocina_olla_vacia
 say player "Mejor uso la económica, sino seguro que Eneko me riñe."
 

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

@@ -1,19 +1,31 @@
 :action1
-say player "Yo diria que sirve para cocinar."
+say current_player "Yo diria que sirve para cocinar."
     
 :action2
-say player "No pienso poner la mano encima."
+say current_player "No pienso poner la mano encima."
 
 :action3 turno_cocina_olla_vacia
-say player "Debería llenar la olla de agua primero."
+say current_player "Debería llenar la olla de agua primero."
 
 :action3 turno_cocina_olla_llena
-say player "Me siento un cocinero de verdad."
+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
-say player "Más madera que es la guerra!"
+say current_player "Más madera que es la guerra!"
 set_global turno_cocina_economica_con_madera true
 inventory_remove turno_cocina_madera
+
+:action3 turno_cocina_carton
+say current_player "Prefiero meter el cartón cuando esté encendido."
+
+:action3 turno_cocina_carton_encendido
+> [!turno_cocina_economica_con_madera]
+  say current_player "Debería meter leña primero."
+  stop
+> [turno_cocina_economica_con_madera]
+  say current_player "He encendido la cocina, a cocinar!"
+  set_global turno_cocina_economica_encendida true
+  inventory_remove turno_cocina_carton_encendido