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")

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=18 format=3 uid="uid://dwvu5kn7qr35s"]
[gd_scene load_steps=15 format=3 uid="uid://dwvu5kn7qr35s"]
[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"]
@@ -13,9 +13,6 @@
[ext_resource type="PackedScene" uid="uid://cbsyjat8xvwfx" path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" id="10"]
[ext_resource type="PackedScene" uid="uid://84h4l81cuwdv" path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" id="11"]
[ext_resource type="PackedScene" uid="uid://dyejne0ibag68" path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" id="12"]
[ext_resource type="Texture2D" uid="uid://b580c3swhl2q3" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="12_us6ip"]
[ext_resource type="Texture2D" uid="uid://c47biotravims" path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" id="14_ref2y"]
[ext_resource type="Texture2D" uid="uid://cw3t327fk3bcg" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="16_dqfmc"]
[sub_resource type="NavigationPolygon" id="1"]
vertices = PackedVector2Array(-768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166)
@@ -157,8 +154,6 @@ script = ExtResource("5")
[node name="turno_cocina_madera" parent="." instance=ExtResource("10")]
position = Vector2(1505, 160)
scale = Vector2(0.880435, 0.88735)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("12_us6ip")
[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"]
position = Vector2(396.395, 87.9022)
@@ -170,8 +165,6 @@ script = ExtResource("5")
[node name="turno_cocina_ajo" parent="." instance=ExtResource("11")]
position = Vector2(858, 399)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("14_ref2y")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo"]
position = Vector2(-21, 91)
@@ -179,8 +172,6 @@ script = ExtResource("5")
[node name="turno_cocina_carton" parent="." instance=ExtResource("12")]
position = Vector2(1221, 423)
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("16_dqfmc")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton"]
position = Vector2(-52, 34)

View File

@@ -1,13 +1,15 @@
[gd_scene load_steps=10 format=3 uid="uid://nwfqcmgsuh8w"]
[gd_scene load_steps=12 format=3 uid="uid://nwfqcmgsuh8w"]
[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"]
[ext_resource type="Texture2D" uid="uid://blmv2ddwts1il" path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" id="3"]
[ext_resource type="Texture2D" uid="uid://dsu0dsn7ykt84" path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" id="3"]
[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"]
[ext_resource type="PackedScene" uid="uid://b3owsy6kidijt" path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" id="7"]
[ext_resource type="Texture2D" uid="uid://bjt7tlgobhgo1" path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" id="8"]
[ext_resource type="Texture2D" uid="uid://p3tb2n6jljfp" path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" id="8"]
[ext_resource type="Texture2D" uid="uid://bj6ii0ic1xyce" path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" id="8_m2e5b"]
[ext_resource type="Script" uid="uid://bh55kesnba2x4" path="res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentGlobalObserver.gd" id="10_i2nyn"]
[sub_resource type="NavigationPolygon" id="60"]
vertices = PackedVector2Array(1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628)
@@ -26,7 +28,7 @@ editor_debug_mode = 1
position = Vector2(636, 289.125)
texture = ExtResource("3")
[node name="ESCTerrain" type="Navigation2D" parent="."]
[node name="ESCTerrain" type="Node2D" parent="."]
position = Vector2(206, -4)
script = ExtResource("4")
scale_min = 1.0
@@ -43,14 +45,13 @@ position = Vector2(863, 175)
script = ExtResource("6")
global_id = "turno_cocina_despensa_puerta_exterior"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc"
combine_when_selected_action_is_in = PackedStringArray()
is_exit = true
combine_when_selected_action_is_in = []
custom_data = {
"tooltips": {
"action1": "tooltip_despensa_puerta_exterior"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"]
position = Vector2(161.721, -721)
@@ -74,14 +75,13 @@ position = Vector2(452, 192)
script = ExtResource("6")
global_id = "turno_cocina_despensa_cebolla_izq"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_turno_cocina_despensa_cebolla_action1",
"action2": "tooltip_turno_cocina_despensa_cebolla_action2"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"]
position = Vector2(60.6594, -46.582)
@@ -98,14 +98,13 @@ position = Vector2(941, 385)
script = ExtResource("6")
global_id = "turno_cocina_despensa_cebolla_der"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_turno_cocina_despensa_cebolla_action1",
"action2": "tooltip_turno_cocina_despensa_cebolla_action2"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"]
position = Vector2(-305.617, -238.789)
@@ -122,14 +121,13 @@ position = Vector2(941, 385)
script = ExtResource("6")
global_id = "turno_cocina_despensa_bidon_der"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_common_look_inside",
"action2": "tooltip_common_pick"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"]
position = Vector2(-129, 84)
@@ -146,14 +144,13 @@ position = Vector2(941, 385)
script = ExtResource("6")
global_id = "turno_cocina_despensa_bidon_izq"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_izq.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_common_look_inside",
"action2": "tooltip_common_look_pick"
}
}
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"]
position = Vector2(-300, 61)
@@ -167,6 +164,8 @@ script = ExtResource("5")
[node name="turno_cocina_patata_grande" parent="." instance=ExtResource("7")]
position = Vector2(440, 161)
scale = Vector2(0.880435, 0.88735)
combine_when_selected_action_is_in = PackedStringArray()
inventory_texture_hovered = ExtResource("8_m2e5b")
custom_data = {
"tooltips": {
"action1": "tooltip_common_look",
@@ -184,30 +183,29 @@ script = ExtResource("5")
polygon = PackedVector2Array(21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135)
[node name="foreground" type="Sprite2D" parent="."]
z_index = 4096
position = Vector2(304, 351)
scale = Vector2(0.994367, 0.994367)
z_index = 4096
texture = ExtResource("8")
[node name="bidon_cntr" type="Area2D" parent="."]
process_mode = 1
position = Vector2(941, 385)
script = ExtResource("6")
action3_target_texts = {
"turno_cocina_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_bol",
"turno_cocina_peso_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_peso_bol"
}
target_when_selected_action_is_in = ["action3"]
global_id = "turno_cocina_despensa_bidon_cntr"
esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc"
combine_when_selected_action_is_in = []
combine_when_selected_action_is_in = PackedStringArray()
custom_data = {
"tooltips": {
"action1": "tooltip_common_look_inside",
"action2": "tooltip_common_pick"
}
}
action3_target_texts = {
"turno_cocina_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_bol",
"turno_cocina_peso_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_peso_bol"
}
target_when_selected_action_is_in = ["action3"]
animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_cntr"]
position = Vector2(-245, 95)
@@ -217,3 +215,9 @@ polygon = PackedVector2Array(-39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.
[node name="ESCLocation" type="Marker2D" parent="bidon_cntr"]
position = Vector2(-189, 372)
script = ExtResource("5")
[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="bidon_cntr"]
script = ExtResource("10_i2nyn")
targeted_global_variable = "turno_cocina_bol_lentejas_picked"
inverted = true
metadata/_custom_type_script = "uid://bh55kesnba2x4"