From 79054332170119e7d4e04c385fe59e32b75bd368 Mon Sep 17 00:00:00 2001
From: Oier Bravo Urtasun <oierbravo@gmail.com>
Date: Wed, 13 Nov 2024 00:40:00 +0100
Subject: [PATCH] Cocina fantasma, closes #91

---
 .../rooms/turno_cocina/cocina/cocina.tscn     | 19 ++++++++++---------
 .../rooms/turno_cocina/cocina/cocina_gas.gd   |  8 ++++++++
 .../turno_cocina/cocina/esc/cocina_gas.esc    |  6 ++----
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd

diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
index 1c4d4103..a117c09b 100644
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=28 format=2]
+[gd_scene load_steps=29 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]
@@ -25,6 +25,7 @@
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture" id=23]
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture" id=24]
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" type="PackedScene" id=25]
+[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" type="Script" id=26]
 
 [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 )
@@ -35,12 +36,12 @@ outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1
 animations = [ {
 "frames": [ ExtResource( 15 ) ],
 "loop": true,
-"name": "apagado",
+"name": "apagada",
 "speed": 5.0
 }, {
 "frames": [ ExtResource( 17 ), ExtResource( 18 ), ExtResource( 16 ) ],
 "loop": true,
-"name": "encendido",
+"name": "encendida",
 "speed": 5.0
 } ]
 
@@ -235,17 +236,16 @@ script = ExtResource( 6 )
 global_id = "cocina_cuchillos"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc"
 combine_when_selected_action_is_in = [  ]
-action3_target_texts = {
-"turno_cocina_cuchillo": "Dejar en su sitio"
-}
-target_when_selected_action_is_in = [ "action3" ]
-
 custom_data = {
 "tooltips": {
 "action1": "Contar los cuchillos",
 "action2": "Coger un buen cuchillo"
 }
 }
+action3_target_texts = {
+"turno_cocina_cuchillo": "Dejar en su sitio"
+}
+target_when_selected_action_is_in = [ "action3" ]
 animations = null
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"]
@@ -407,8 +407,9 @@ polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18,
 position = Vector2( 7, -8 )
 z_as_relative = false
 frames = SubResource( 4 )
-animation = "apagado"
+animation = "apagada"
 playing = true
+script = ExtResource( 26 )
 
 [node name="ESCLocation" type="Position2D" parent="turno_cocina_cocina_gas"]
 position = Vector2( -56, 78 )
diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd b/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd
new file mode 100644
index 00000000..8b042417
--- /dev/null
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd
@@ -0,0 +1,8 @@
+extends AnimatedSprite
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(_delta):
+	if(escoria.globals_manager.get_global("turno_cocina_cocina_gas_encendida")):
+		play("encendida")
+	else:
+		play("apagada")
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc
index 57477a5b..ab8d5f1c 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc
@@ -6,19 +6,17 @@ say player "Necesito usar un mechero para encenderla." [!turno_cocina_cocina_gas
 say player "Ya está encendida!." [turno_cocina_cocina_gas_encendida]
 
 :action3 turno_cocina_mechero
-anim turno_cocina_cocina_gas encendido [!turno_cocina_cocina_gas_encendida]
+set_global turno_cocina_cocina_gas_encendida true [!turno_cocina_cocina_gas_encendida]
 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 [!turno_cocina_cocina_gas_encendida]
 
 
 :action3 turno_cocina_carton
 > [!turno_cocina_cocina_gas_encendida]
     say player "No puedo hacerlo con la cocina apagada." [!turno_cocina_cocina_gas_encendida]
 > [turno_cocina_cocina_gas_encendida]
-    say player "Muy bien, ya tengo una llama portable!" [turno_cocina_cocina_gas_encendida]
+    say player "Muy bien, ya tengo una llama portable!"
     set_global turno_cocina_cocina_gas_encendida false
-    anim turno_cocina_cocina_gas apagado
     inventory_remove turno_cocina_carton
     inventory_add turno_cocina_carton_encendido