Picked observer, global observer

This commit is contained in:
2025-09-14 04:44:12 +02:00
parent 5e1d88c333
commit f41fc361b8
28 changed files with 183 additions and 103 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=34 format=3 uid="uid://dowbdjo7ka0sq"]
[gd_scene load_steps=32 format=3 uid="uid://dowbdjo7ka0sq"]
[ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"]
@@ -11,10 +11,8 @@
[ext_resource type="Texture2D" uid="uid://p7ou513681ag" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"]
[ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"]
[ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"]
[ext_resource type="Texture2D" uid="uid://bk7lml882oihk" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="11_fji2i"]
[ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"]
[ext_resource type="Texture2D" uid="uid://b8obukr30qnmd" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"]
[ext_resource type="Texture2D" uid="uid://276uevmvuuhp" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" id="13_wnoqk"]
[ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"]
[ext_resource type="Texture2D" uid="uid://xv1xya2lcavx" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"]
[ext_resource type="Script" uid="uid://bh55kesnba2x4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd" id="15_fji2i"]
@@ -146,7 +144,6 @@ global_id = "puerta_delante_start"
[node name="turno_cocina_peso" parent="." instance=ExtResource("10")]
position = Vector2(2505, 160)
scale = Vector2(0.880435, 0.88735)
inventory_texture_hovered = ExtResource("11_fji2i")
[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
position = Vector2(15.9014, -11.2695)
@@ -159,8 +156,6 @@ script = ExtResource("5")
[node name="turno_cocina_bol" parent="." instance=ExtResource("11")]
position = Vector2(1505, 160)
scale = Vector2(0.880435, 0.88735)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("13_wnoqk")
[node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"]
position = Vector2(169.235, 210.74)
@@ -176,7 +171,6 @@ scale = Vector2(0.880435, 0.88735)
global_id = "cocina_pan"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/pan.esc"
combine_when_selected_action_is_in = PackedStringArray()
inventory_texture_hovered = ExtResource("13_wnoqk")
custom_data = {
"tooltips": {
"action1": "tooltip_common_look",
@@ -292,6 +286,12 @@ polygon = PackedVector2Array(466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 5
position = Vector2(420, 494)
script = ExtResource("5")
[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="debajo_sofa"]
script = ExtResource("15_fji2i")
targeted_global_variable = "cocina_debajo_sofa_picked"
inverted = true
metadata/_custom_type_script = "uid://bh55kesnba2x4"
[node name="cocina_patata" type="Area2D" parent="."]
process_mode = 1
z_index = 1001
@@ -412,7 +412,6 @@ position = Vector2(-56, 78)
script = ExtResource("5")
[node name="turno_cocina_olla_llena" parent="." instance=ExtResource("12")]
visible = false
position = Vector2(1281, 491)
scale = Vector2(1.06318, 1.06318)
@@ -422,7 +421,6 @@ script = ExtResource("5")
[node name="turno_cocina_cuerno" parent="." instance=ExtResource("20")]
position = Vector2(2801, 175)
combine_when_selected_action_is_in = PackedStringArray()
inventory_texture_hovered = ExtResource("23_fji2i")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"]

View File

@@ -17,7 +17,6 @@
say($player, "La patata gigante no cuenta, es demasiado grande.", "cocina_debajo_sofa_action2_say_frontal_used_patata_grande_in_inventory")
inventory_add("turno_cocina_patata")
item_count_add("turno_cocina_patata")
set_active($cocina_debajo_sofa, false)
cocina_debajo_sofa_picked = true
else:
say($player, "No pienso meter la mano está muy oscuro.", "cocina_debajo_sofa_action2_say")