default configs + escoria configs

.cursorignore

@@ -0,0 +1,3 @@
+*.import
+*.uid
+*.translation

.gitea/workflows/push-release.yml

@@ -9,7 +9,7 @@ env:
   GODOT_VERSION: 4.5
   EXPORT_NAME: LasGymkhanikasDeUli
   PROJECT_PATH: .
-  APPWRITE_API_KEY: ${{ secrets.APPWRITE_API_KEY }}
+  APPWRITE_API_KEY: "${{ secrets.APPWRITE_API_KEY }}"
   
 jobs:
   all-exports:
@@ -36,3 +36,4 @@ jobs:
             build/**/*.appimage
             build/**/*.tar.gz
             build/**/*.zip
+            build/**/*.exe

AUTHORS.md

@@ -1,9 +0,0 @@
-## Development
-- Oier
-- Eneko
-
-## Collaborations
-- Pico
-- Miette
-- Niko
-- Urtzi

Itch_io_publishing.patch

@@ -1,83 +0,0 @@
-Subject: [PATCH] feat(deploy): Itch.io publishing. #203
----
-Index: .gitea/workflows/push-release.yml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.gitea/workflows/push-release.yml b/.gitea/workflows/push-release.yml
---- a/.gitea/workflows/push-release.yml	(revision 1c1f32e2aa839ccf963326d88f5f21bb3085ba1d)
-+++ b/.gitea/workflows/push-release.yml	(revision 8d2907c071001995b91dc6234ec511729fd49137)
-@@ -34,16 +34,6 @@
-           files: |
-             build/**/*.appimage
-             build/**/*.tar.gz
--      - name: Publish AMD to itch.io
--        uses: yeslayla/butler-publish-itchio-action@master
--        env:
--          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_API_KEY }}
--          CHANNEL: linux
--          PACKAGE: build/debug/amd64/*.appimage
--      - name: Publish ARM to itch.io
--        uses: yeslayla/butler-publish-itchio-action@master
--        env:
--          BUTLER_CREDENTIALS: ${{ secrets.BUTLER_API_KEY }}
--          CHANNEL: linux
--          PACKAGE: build/debug/arm64/*.appimage
--          VERSION_FILE: build/version.txt
-\ No newline at end of file
-+      - name: Publishing
-+        run: |
-+          ./publish.sh
-\ No newline at end of file
-Index: bash_colors.sh
-===================================================================
-diff --git a/bash_colors.sh b/bash_colors.sh
-new file mode 100644
---- /dev/null	(revision 8d2907c071001995b91dc6234ec511729fd49137)
-+++ b/bash_colors.sh	(revision 8d2907c071001995b91dc6234ec511729fd49137)
-@@ -0,0 +1,6 @@
-+NOCOLOR='\033[0m' # No Color
-+BLUE='\e[34m' # BrightBlue
-+BOLD_BLUE='\033[1;94m' # BrightBlue
-+GREEN='\e[49;32m' # Green
-+ORANGE='\033[1;33m'
-+RED='\033[1;31m'
-\ No newline at end of file
-Index: publish.sh
-===================================================================
-diff --git a/publish.sh b/publish.sh
-new file mode 100644
---- /dev/null	(revision 8d2907c071001995b91dc6234ec511729fd49137)
-+++ b/publish.sh	(revision 8d2907c071001995b91dc6234ec511729fd49137)
-@@ -0,0 +1,29 @@
-+#!/bin/bash
-+source bash_colors.sh
-+
-+ITCHIO_ENABLED=true
-+
-+VERSION=`cat build/version.txt`
-+echo -e "Publishing ${GREEN}v${VERSION}${NOCOLOR}"
-+
-+# Publish to Itch.io
-+if [ "$ITCHIO_ENABLED" = true ] ; then
-+	echo -e "${BLUE}Publishing to Itch.io${NOCOLOR}"
-+	if ! command -v butler >/dev/null 2>&1
-+	then
-+		echo -e "${RED}butler could not be found. Aborting!${NOCOLOR}"
-+		exit 1
-+	fi
-+
-+
-+
-+		echo -e "${ORANGE}Publishing AMD64${NOCOLOR}"
-+		butler push build/debug/amd64/LasGymkhanikasDeUli--debug.x86_64.appimage uliwood/las-gymkhanikas-de-uli-turno-cocina:linux-amd64 --userversion $VERSION
-+
-+		echo -e "${ORANGE}Publishing ARM64${NOCOLOR}"
-+		butler push build/debug/arm64/LasGymkhanikasDeUli--debug.arm_64.appimage uliwood/las-gymkhanikas-de-uli-turno-cocina:linux-arm64 --userversion $VERSION
-+
-+
-+	else
-+		echo -e "${ORANGE}Itch.io not enabled.{NOCOLOR}"
-+fi
-\ No newline at end of file

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/chooser_button.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://v5lk1jcyag2q"]
+[gd_scene format=3 uid="uid://v5lk1jcyag2q"]
 
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="1_k44u5"]
 [ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_e65rn"]
 
-[node name="Button" type="Button"]
+[node name="Button" type="Button" unique_id=1065480700]
 theme = ExtResource("1_k44u5")
 script = ExtResource("2_e65rn")
 with_sound = false

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://nbnsf3pmh4jg"]
+[gd_scene format=3 uid="uid://nbnsf3pmh4jg"]
 
 [ext_resource type="Script" uid="uid://cvhue8e0ory00" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" id="1"]
 [ext_resource type="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme/dialog.tres" id="2"]
@@ -9,7 +9,7 @@ colors = PackedColorArray(1, 0, 0, 1, 1, 0, 0, 1)
 [sub_resource type="GradientTexture2D" id="2"]
 gradient = SubResource("1")
 
-[node name="text_dialog_choice" type="Control"]
+[node name="text_dialog_choice" type="Control" unique_id=1465091417]
 layout_mode = 3
 anchors_preset = 0
 size_flags_horizontal = 4
@@ -18,7 +18,7 @@ theme = ExtResource("2")
 script = ExtResource("1")
 color_hover = Color(0.0704665, 0.552225, 0, 1)
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=822810708]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -38,21 +38,21 @@ theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
-[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer" unique_id=443347496]
 clip_contents = false
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer" unique_id=1513512134]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme_override_constants/separation = 10
 
-[node name="Timer" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="." unique_id=564548219]
 one_shot = true
 
-[node name="TimerProgress" type="TextureProgressBar" parent="."]
+[node name="TimerProgress" type="TextureProgressBar" parent="." unique_id=1586726890]
 custom_minimum_size = Vector2(0, 20)
 layout_mode = 0
 anchor_right = 1.0

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd

@@ -40,7 +40,7 @@ func run(_command_params: Array) -> int:
 		speaking_character_global_id,
 		"",
 		last_chosen_option.get_translated_option(),
-		last_chosen_option.get_translation_id()
+		last_chosen_option.source_option.get_translation_key()
 	)
 	await escoria.dialog_player.say_finished
 	escoria.current_state = escoria.GAME_STATE.DEFAULT

addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://dyi4lxm20wgne"]
+[gd_scene format=3 uid="uid://dyi4lxm20wgne"]
 
 [ext_resource type="Theme" uid="uid://dvpaon5mw2w8l" path="res://addons/escoria-ui-return-monkey-island/theme.tres" id="1_3renm"]
 
-[node name="Label" type="Label"]
+[node name="Label" type="Label" unique_id=1796310462]
 offset_left = 1073.0
 offset_top = 508.0
 offset_right = 1248.0

addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=4 format=3 uid="uid://dlo07cyfhpilq"]
+[gd_resource type="Theme" format=3 uid="uid://dlo07cyfhpilq"]
 
 [sub_resource type="StyleBoxFlat" id="1"]
 content_margin_left = 4.0

addons/escoria-ui-return-monkey-island-dialog-simple/theme/dialog.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=4 format=3 uid="uid://dvwfrnya2nhxu"]
+[gd_resource type="Theme" format=3 uid="uid://dvwfrnya2nhxu"]
 
 [sub_resource type="StyleBoxFlat" id="1"]
 content_margin_left = 4.0

addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=7 format=3 uid="uid://cp75ofyuetxux"]
+[gd_scene format=3 uid="uid://cp75ofyuetxux"]
 
 [ext_resource type="Script" uid="uid://d12nyx86nlc6h" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://cn1fjp4q7b5e0" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" id="2_4itiw"]
+[ext_resource type="Texture2D" uid="uid://dpbp4rn2a8in5" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" id="2_4itiw"]
 [ext_resource type="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme/dialog.tres" id="2_7uovn"]
 [ext_resource type="Theme" uid="uid://dlo07cyfhpilq" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" id="2_f1tsx"]
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="3_xhqtt"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4itiw"]
 
-[node name="dialog_box" type="Window"]
+[node name="dialog_box" type="Window" unique_id=153948626]
 transparent_bg = true
 oversampling_override = 1.0
 size = Vector2i(600, 167)
@@ -19,28 +19,28 @@ popup_window = true
 script = ExtResource("1")
 centered_text = true
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=101138325]
 custom_minimum_size = Vector2(600, 60)
 offset_right = 600.0
 offset_bottom = 60.0
 scale = Vector2(0.9775281, 1)
 theme = ExtResource("2_7uovn")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer" unique_id=72621801]
 layout_mode = 2
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer" unique_id=217908685]
 layout_mode = 2
 theme_override_constants/margin_left = 15
 theme_override_constants/margin_top = 15
 theme_override_constants/margin_right = 15
 theme_override_constants/margin_bottom = 15
 
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer" unique_id=640539608]
 layout_mode = 2
 theme_override_constants/separation = 20
 
-[node name="text_node" type="RichTextLabel" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+[node name="text_node" type="RichTextLabel" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=350124160]
 unique_name_in_owner = true
 clip_contents = false
 layout_mode = 2
@@ -53,26 +53,26 @@ scroll_active = false
 autowrap_mode = 2
 justification_flags = 171
 
-[node name="ClickToContinueTip" type="HBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+[node name="ClickToContinueTip" type="HBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer" unique_id=282877454]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 8
 size_flags_vertical = 4
 
-[node name="icon" type="Sprite2D" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip"]
+[node name="icon" type="Sprite2D" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip" unique_id=259843122]
 position = Vector2(1, 8)
 scale = Vector2(0.583333, 0.583333)
 texture = ExtResource("2_4itiw")
 offset = Vector2(-28, 1)
 
-[node name="label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip"]
+[node name="label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip" unique_id=1677797102]
 layout_mode = 2
 theme = ExtResource("3_xhqtt")
 theme_override_font_sizes/font_size = 12
 theme_override_styles/normal = SubResource("StyleBoxEmpty_4itiw")
 text = "CLICK_TO_CONTINUE_TIP"
 
-[node name="ProgressBar" type="ProgressBar" parent="PanelContainer/VBoxContainer"]
+[node name="ProgressBar" type="ProgressBar" parent="PanelContainer/VBoxContainer" unique_id=2074278931]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd

@@ -0,0 +1,11 @@
+class_name RTMIAchievementSummaryMenu
+extends PanelContainer
+
+func ready() -> void:
+	%SummaryPanel.hide_position()
+
+func _on_rtmi_menu_button_pressed() -> void:
+	hide()
+
+func refresh() -> void:
+	%SummaryPanel.refresh()

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd.uid

@@ -0,0 +1 @@
+uid://bp676ele1a2dk

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.tscn

@@ -0,0 +1,54 @@
+[gd_scene format=3 uid="uid://bcu6ik8qq0dl6"]
+
+[ext_resource type="PackedScene" uid="uid://cbq03pmsdusib" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn" id="1_iv6go"]
+[ext_resource type="Script" uid="uid://bp676ele1a2dk" path="res://addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd" id="1_krbpm"]
+[ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_ntqhu"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_krbpm"]
+bg_color = Color(0.21960784, 0.21960784, 0.21960784, 1)
+
+[node name="AchievementsMenu" type="PanelContainer" unique_id=12776187]
+process_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_krbpm")
+script = ExtResource("1_krbpm")
+
+[node name="CenterContainer" type="CenterContainer" parent="." unique_id=649697499]
+layout_mode = 2
+
+[node name="PanelContainer" type="PanelContainer" parent="CenterContainer" unique_id=620650128]
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/PanelContainer" unique_id=720737615]
+layout_mode = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer" unique_id=638627760]
+custom_minimum_size = Vector2(300, 0)
+layout_mode = 2
+
+[node name="SummaryPanel" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer" unique_id=552957231 instance=ExtResource("1_iv6go")]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer" unique_id=1811508359]
+custom_minimum_size = Vector2(0, 50)
+layout_mode = 2
+theme_override_font_sizes/normal_font_size = 16
+text = "ACHIEVEMENTS_MENU_NOTE"
+vertical_alignment = 1
+
+[node name="Back" type="Button" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer" unique_id=1560119636]
+layout_mode = 2
+text = "OPTIONS_BACK"
+script = ExtResource("2_ntqhu")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[connection signal="pressed" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Back" to="." method="_on_rtmi_menu_button_pressed"]

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_manager.gd

@@ -46,6 +46,8 @@ func get_unlocked_achievements_total() -> int:
 			unlocked_achievements_total += 1
 	return unlocked_achievements_total
 
+func is_perfect_score() -> bool:
+	return get_achievements_total() == get_unlocked_achievements_total()
 
 func reset_achievements() -> void:
 	_achievement_tracker.clear()
@@ -65,7 +67,6 @@ func unlock_achievement(achievement_id) -> void:
 		_achievement_tracker.set(achievement_id, true)
 		unlocked.emit(achievement_id)
 
-
 func is_unlocked(achievement_id: String) -> bool:
 	if not has(achievement_id):
 		escoria.logger.error(self, "Achievement '%s' not found.")

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.tscn

@@ -1,11 +1,11 @@
-[gd_scene load_steps=3 format=3 uid="uid://dip0jl80tklyg"]
+[gd_scene format=3 uid="uid://dip0jl80tklyg"]
 
 [ext_resource type="Script" uid="uid://cbc01kasyr4uf" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.gd" id="1_fsunq"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_fw80s"]
 font_color = Color(1, 0.6166667, 0, 1)
 
-[node name="AchievementNotification" type="Control"]
+[node name="AchievementNotification" type="Control" unique_id=1552280247]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -14,45 +14,45 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_fsunq")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=395400324]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=870762163]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 15
 theme_override_constants/margin_bottom = 10
 
-[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer" unique_id=1747335802]
 layout_mode = 2
 theme_override_constants/separation = 8
 
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer" unique_id=893232794]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer" unique_id=1890910300]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"]
+[node name="Label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer" unique_id=861561291]
 layout_mode = 2
 text = "ACHIEVEMENT_UNLOCKED_NOTIFICATION_LABEL"
 
-[node name="AchievementCounter" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"]
+[node name="AchievementCounter" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer" unique_id=515767267]
 unique_name_in_owner = true
 layout_mode = 2
 text = "(1/2)"
 horizontal_alignment = 2
 
-[node name="AchievementTitle" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer"]
+[node name="AchievementTitle" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer" unique_id=1326980049]
 unique_name_in_owner = true
 layout_mode = 2
 text = "ACHIEVEMENT_ACHIVEMENT_ID_TITLE"
 label_settings = SubResource("LabelSettings_fw80s")
 
-[node name="ClearButton" type="Button" parent="PanelContainer/MarginContainer/HBoxContainer"]
+[node name="ClearButton" type="Button" parent="PanelContainer/MarginContainer/HBoxContainer" unique_id=1167693698]
 visible = false
 custom_minimum_size = Vector2(30, 30)
 layout_mode = 2

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.tscn

@@ -1,18 +1,18 @@
-[gd_scene load_steps=3 format=3 uid="uid://d3kgkl2r5xe4d"]
+[gd_scene format=3 uid="uid://d3kgkl2r5xe4d"]
 
 [ext_resource type="Script" uid="uid://bsfo4u74sp5qn" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.gd" id="1_omhs5"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_117yv"]
 
-[node name="AchievementContainer" type="PanelContainer"]
+[node name="AchievementContainer" type="PanelContainer" unique_id=677824088]
 offset_right = 40.0
 offset_bottom = 40.0
 theme_override_styles/panel = SubResource("StyleBoxEmpty_117yv")
 script = ExtResource("1_omhs5")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=2036669489]
 layout_mode = 2
 
-[node name="Container" type="VBoxContainer" parent="MarginContainer"]
+[node name="Container" type="VBoxContainer" parent="MarginContainer" unique_id=167498803]
 unique_name_in_owner = true
 layout_mode = 2

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.tscn

@@ -1,36 +1,36 @@
-[gd_scene load_steps=2 format=3 uid="uid://diaqb8q4cula7"]
+[gd_scene format=3 uid="uid://diaqb8q4cula7"]
 
 [ext_resource type="Script" uid="uid://vqxa0p3tqchn" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.gd" id="1_1st1v"]
 
-[node name="AchievementInspector" type="Control"]
+[node name="AchievementInspector" type="Control" unique_id=164835093]
 layout_mode = 3
 anchors_preset = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_1st1v")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1269402635]
 layout_mode = 0
 offset_right = 4.0
 offset_bottom = 404.0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=1469753836]
 layout_mode = 2
 theme_override_constants/margin_left = 2
 theme_override_constants/margin_top = 2
 theme_override_constants/margin_right = 2
 theme_override_constants/margin_bottom = 2
 
-[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer" unique_id=681093553]
 custom_minimum_size = Vector2(0, 400)
 layout_mode = 2
 horizontal_scroll_mode = 0
 
-[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/ScrollContainer"]
+[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/ScrollContainer" unique_id=379151825]
 unique_name_in_owner = true
 layout_mode = 2
 
-[node name="TimeTrackerLabel" type="Label" parent="PanelContainer/MarginContainer"]
+[node name="TimeTrackerLabel" type="Label" parent="PanelContainer/MarginContainer" unique_id=432956773]
 unique_name_in_owner = true
 layout_mode = 2
 text = "00:00:00"

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_score_manager.gd

@@ -57,7 +57,9 @@ func _load_api_config() -> void:
 
 func get_scores(collection: String) -> Array[RTMIScoreRow]:
 	var http_request = http_requests[collection]
-	var response_data = await _score_http_request(http_request, "%s/databases/%s/collections/%s/documents" % [api_url, database_id, collection])
+	var response_data = await _score_http_request(
+		http_request, '%s/databases/%s/collections/%s/documents?queries[1]={"method":"limit","values":[100]}' % [api_url, database_id, collection]
+	)
 
 	if not response_data:
 		return []
@@ -73,22 +75,12 @@ func get_scores(collection: String) -> Array[RTMIScoreRow]:
 
 func submit_score(collection: String, name: String, time: int) -> bool:
 	var hash = ("%s_%s_%s_%s" % [collection, name, time, score_submit_key]).sha256_text()
-	var request_data: String = (
-		JSON
-		. new()
-		. stringify(
-			{
-				"collectionId": collection,
-				"score":
-				{
-					"name": name,
-					"time": time,
-				},
-				"hash": hash
-			}
-		)
-	)
-	var response_data = await _score_http_request(http_requests[SUBMIT], score_submit_url, HTTPClient.METHOD_POST, request_data)
+	var url = "%s/%s/%s/%s/%s" % [score_submit_url, collection, name.uri_encode(), time, hash]
+	var response_data = await _score_http_request(http_requests[SUBMIT], url)
+
+	if response_data == null:
+		push_error("Error submitting score: response data is null")
+		return false
 
 	if not response_data.success:
 		push_error("Error submitting score: error=%s" % response_data.errorMsg)
@@ -134,7 +126,7 @@ func _score_http_request(
 	return response_data
 
 
-func format_time(time: int) -> String:
+static func format_time(time: int) -> String:
 	var hours = time / 3600
 	var minutes = (time % 3600) / 60
 	var seconds = time % 60

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://cqgluci3f3v3n"]
+[gd_scene format=3 uid="uid://cqgluci3f3v3n"]
 
 [ext_resource type="Script" uid="uid://bhi02d1pasur4" path="res://addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.gd" id="1_efvuy"]
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_ip2kf"]
@@ -7,7 +7,7 @@
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_efvuy"]
 bg_color = Color(0.22, 0.22, 0.22, 1)
 
-[node name="RtmiScoreboard" type="PanelContainer"]
+[node name="RtmiScoreboard" type="PanelContainer" unique_id=830243002]
 process_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -20,37 +20,42 @@ theme = ExtResource("1_ip2kf")
 theme_override_styles/panel = SubResource("StyleBoxFlat_efvuy")
 script = ExtResource("1_efvuy")
 
-[node name="CenterContainer" type="CenterContainer" parent="."]
+[node name="CenterContainer" type="CenterContainer" parent="." unique_id=791808873]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer" unique_id=1333458381]
 layout_mode = 2
 theme_override_constants/separation = 20
 alignment = 1
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="CenterContainer/VBoxContainer" unique_id=258427779]
 layout_mode = 2
 
-[node name="FastestScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" instance=ExtResource("1_o5uv4")]
+[node name="FastestScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" unique_id=2050026796 instance=ExtResource("1_o5uv4")]
 unique_name_in_owner = true
 layout_mode = 2
 collection = "fastest"
 
-[node name="PerfectScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" instance=ExtResource("1_o5uv4")]
+[node name="PerfectScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" unique_id=1073709727 instance=ExtResource("1_o5uv4")]
 unique_name_in_owner = true
 layout_mode = 2
 collection = "perfect"
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+[node name="Label" type="Label" parent="CenterContainer/VBoxContainer" unique_id=1438529514]
+layout_mode = 2
+text = "SCOREBOARD_NOTE"
+horizontal_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer" unique_id=1157690349]
 layout_mode = 2
 alignment = 1
 
-[node name="Back" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+[node name="Back" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer" unique_id=1201287045]
 custom_minimum_size = Vector2(300, 50)
 layout_mode = 2
 text = "SCOREBOARD_BACK"
 
-[node name="Refresh" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+[node name="Refresh" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer" unique_id=2089603711]
 custom_minimum_size = Vector2(300, 50)
 layout_mode = 2
 text = "SCOREBOARD_REFRESH"

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=8 format=3 uid="uid://ooknv238745j"]
+[gd_scene format=3 uid="uid://ooknv238745j"]
 
 [ext_resource type="Script" uid="uid://cxvhsdqap7w1b" path="res://addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.gd" id="1_35c2h"]
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_ine7w"]
-[ext_resource type="FontFile" uid="uid://bq0vin2knt0or" path="res://addons/escoria-ui-return-monkey-island/fonts/SpaceMono-Regular.ttf" id="2_bn406"]
+[ext_resource type="FontFile" uid="uid://dhyn6bujb7ojt" path="res://addons/escoria-ui-return-monkey-island/fonts/SpaceMono-Regular.ttf" id="2_bn406"]
 [ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_hgepf"]
 [ext_resource type="Script" uid="uid://doqt8bqgwakt" path="res://addons/tattomoosa.spinner/spinner.gd" id="4_bn406"]
 
@@ -11,24 +11,24 @@ bg_color = Color(0.2520276, 0.25202766, 0.25202754, 1)
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_hgepf"]
 
-[node name="ScoreBoardPanel" type="PanelContainer"]
+[node name="ScoreBoardPanel" type="PanelContainer" unique_id=1226283770]
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = ExtResource("1_ine7w")
 theme_override_styles/panel = SubResource("StyleBoxFlat_ine7w")
 script = ExtResource("1_35c2h")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1439125339]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=1775609242]
 layout_mode = 2
 
-[node name="Title" type="Label" parent="MarginContainer/VBoxContainer"]
+[node name="Title" type="Label" parent="MarginContainer/VBoxContainer" unique_id=1758609088]
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_fonts/font = ExtResource("2_bn406")
@@ -37,77 +37,77 @@ text = "SCOREBOARD__TITLE"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="Scores" type="VBoxContainer" parent="MarginContainer/VBoxContainer"]
+[node name="Scores" type="VBoxContainer" parent="MarginContainer/VBoxContainer" unique_id=1960109158]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(600, 280)
 layout_mode = 2
 
-[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=1506435371]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 scroll_active = false
 horizontal_alignment = 1
 
-[node name="RichTextLabel2" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel2" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=1402701024]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel3" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel3" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=1118602221]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel4" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel4" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=1383405201]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel5" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel5" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=2069491774]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel6" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel6" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=617358034]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel7" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel7" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=732847535]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel8" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel8" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=148594354]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel9" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel9" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=1373487450]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="RichTextLabel10" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+[node name="RichTextLabel10" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores" unique_id=236600753]
 layout_mode = 2
 text = "PLAYER_NAME - TIME - DATE"
 fit_content = true
 horizontal_alignment = 1
 
-[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer" unique_id=560491193]
 layout_mode = 2
 alignment = 1
 
-[node name="PrevButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="PrevButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer" unique_id=1717649073]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -116,7 +116,7 @@ text = "< "
 script = ExtResource("2_hgepf")
 metadata/_custom_type_script = "uid://elqkwjm0r5c7"
 
-[node name="NextButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="NextButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer" unique_id=1987958270]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -124,8 +124,7 @@ text = ">"
 script = ExtResource("2_hgepf")
 metadata/_custom_type_script = "uid://elqkwjm0r5c7"
 
-[node name="Spinner" type="Range" parent="."]
-_import_path = NodePath("")
+[node name="Spinner" type="Range" parent="." unique_id=1013872042]
 unique_name_in_owner = true
 process_mode = 0
 process_priority = 0

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.gd

@@ -6,88 +6,42 @@ signal score_submitted()
 const CHARACTER_LIMIT: int = 32
 const ALLOWED_CHARACTERS = "[à-ÿÀ-ŸA-Za-z0-9 _-]"
 
-var perfect = false
 var collection: String
 
 @onready var input_name: LineEdit = %InputName
-@onready var total_time: Label = %TotalTime
-@onready var pos: Label = %Position
-@onready var achievement_count: Label = %AchievementCount
-@onready var unlocked_achievements_container: VBoxContainer = %UnlockedAchievementsContainer
 @onready var submit_button: RTMIMenuButton = %SubmitButton
 @onready var spinner: Spinner = %Spinner
-
+@onready var summary_panel: RTMIAchievementSummaryPanel =  %SummaryPanel
 
 func _ready() -> void:
-	_fill()
 	input_name.text_changed.connect(_on_input_name_changed)
 	input_name.grab_focus()
-
-
-func show():
-	super.show()
-
+	summary_panel.show_position()
+	check_perfect()
+	check_score()
 
 func _input(event: InputEvent) -> void:
 	if event.is_action_pressed("ui_enter"):
 		_on_submit_button_up()
 
-
-func _fill():
-	_clear()
-	total_time.text = gymkhana.score_manager.format_time(gymkhana.achievement_manager.played_time)
-	var achievements = gymkhana.achievement_manager.get_achievements()
-	var unlocked = 0
-	for achievement_key in achievements:
-		var label = Label.new()
-		label.text = tr(gymkhana.achievement_manager.generate_achievement_literal(
-			achievement_key, "title"
-		))
-		label.add_theme_color_override("font_color", Color.DIM_GRAY)
-		if achievements.get(achievement_key):
-			label.add_theme_color_override("font_color", Color.GREEN)
-			unlocked += 1
-		unlocked_achievements_container.add_child(label)
-
-	achievement_count.text = "%s / %s" % [unlocked, achievements.size()]
-
-	if unlocked == achievements.size():
-		submit_button.text = tr("SUBMIT_PERFECT_SCORE")
-		perfect = true
-
-	collection = gymkhana.score_manager.PERFECT if perfect else gymkhana.score_manager.FASTEST
-	check_score()
-
-
-func check_score():
-	if perfect:
+func check_perfect():
+	if gymkhana.achievement_manager.is_perfect_score():
 		escoria.game_scene.launch_confetti()
 		escoria.globals_manager.set_global("turno_cocina_perfect_score", true)
-
-
+		submit_button.text = tr("SUBMIT_PERFECT_SCORE")
+	
+func check_score():
 	var played_time = floor(randf() * 1000)
+	collection = gymkhana.score_manager.PERFECT if gymkhana.achievement_manager.is_perfect_score() else gymkhana.score_manager.FASTEST
+
 	var pos_int = await gymkhana.score_manager.calculate_score_position(collection, gymkhana.achievement_manager.played_time)
-	pos.text = "#" + str(pos_int + 1)
+	summary_panel.score_position = pos_int + 1
+	
 
 
-func _clear() -> void:
-	for child in unlocked_achievements_container.get_children():
-		unlocked_achievements_container.remove_child(child)
-		child.queue_free()
-
-
-func _get_all_achievements() -> Array:
-	var unlocked_achievements: Array = []
-	var all_achievements = gymkhana.achievement_manager.get_achievements()
-	for achievement in all_achievements:
-		if all_achievements.get(achievement) == true:
-			unlocked_achievements.append(achievement)
-	return unlocked_achievements
-
 
 func _on_input_name_changed(_new_text: String):
 	var valid = _validate_name()
-
 	if not valid:
 		_set_label_error()
 		return

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.tscn

@@ -1,128 +1,37 @@
-[gd_scene load_steps=5 format=3 uid="uid://ch5d4emoxq6t4"]
+[gd_scene format=3 uid="uid://ch5d4emoxq6t4"]
 
 [ext_resource type="Script" uid="uid://wor3bvk7tdh0" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.gd" id="1_vcqj7"]
+[ext_resource type="PackedScene" uid="uid://cbq03pmsdusib" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn" id="2_0xx2m"]
 [ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_3d1qx"]
 [ext_resource type="Script" uid="uid://doqt8bqgwakt" path="res://addons/tattomoosa.spinner/spinner.gd" id="3_co5jd"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_co5jd"]
 
-[node name="AchievementSummary" type="PanelContainer"]
+[node name="AchievementSummary" type="PanelContainer" unique_id=1022120618]
 custom_minimum_size = Vector2(300, 0)
 offset_right = 40.0
 offset_bottom = 40.0
 script = ExtResource("1_vcqj7")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1770779536]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=494525638]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="TotalTimeLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_font_sizes/font_size = 20
-text = "TOTAL_TIME"
-horizontal_alignment = 1
-
-[node name="TotalTime" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer"]
+[node name="SummaryPanel" parent="MarginContainer/VBoxContainer" unique_id=711130259 instance=ExtResource("2_0xx2m")]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_font_sizes/font_size = 24
-text = "0h 00m 00s"
-horizontal_alignment = 1
-vertical_alignment = 2
 
-[node name="VBoxContainer2" type="VBoxContainer" parent="MarginContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="PositionLabel" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2"]
-layout_mode = 2
-theme_override_font_sizes/font_size = 20
-text = "POSITION"
-horizontal_alignment = 1
-
-[node name="Position" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2"]
-unique_name_in_owner = true
-layout_mode = 2
-theme_override_font_sizes/font_size = 24
-text = "-"
-horizontal_alignment = 1
-vertical_alignment = 2
-
-[node name="HSeparator" type="HSeparator" parent="MarginContainer/VBoxContainer"]
+[node name="HSeparator3" type="HSeparator" parent="MarginContainer/VBoxContainer" unique_id=1904613054]
 layout_mode = 2
 theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
 
-[node name="MarginContainer2" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="HBoxContainer2" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="AchievementTitle" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
-layout_mode = 2
-theme_override_font_sizes/font_size = 12
-text = "ACHIEVEMENT_SUMMARY"
-
-[node name="AchievementCount" type="Label" parent="MarginContainer/VBoxContainer/HBoxContainer2"]
-unique_name_in_owner = true
-layout_mode = 2
-size_flags_horizontal = 3
-theme_override_font_sizes/font_size = 12
-text = "1 / 7"
-horizontal_alignment = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/margin_top = 10
-theme_override_constants/margin_bottom = 10
-
-[node name="UnlockedAchievementsContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/MarginContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-theme_override_constants/separation = 4
-
-[node name="Label" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="Label2" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="Label3" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="Label4" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="Label5" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="Label6" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/UnlockedAchievementsContainer"]
-layout_mode = 2
-text = "ACHIEVEMENT TEXT PLACEHOLDER"
-
-[node name="HSeparator3" type="HSeparator" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
-
-[node name="InputName" type="LineEdit" parent="MarginContainer/VBoxContainer"]
+[node name="InputName" type="LineEdit" parent="MarginContainer/VBoxContainer" unique_id=1081665581]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 60)
 layout_mode = 2
@@ -130,11 +39,11 @@ placeholder_text = "NAME_PLACEHOLDER"
 clear_button_enabled = true
 caret_blink = true
 
-[node name="HSeparator2" type="HSeparator" parent="MarginContainer/VBoxContainer"]
+[node name="HSeparator2" type="HSeparator" parent="MarginContainer/VBoxContainer" unique_id=1861984637]
 layout_mode = 2
 theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
 
-[node name="SubmitButton" type="Button" parent="MarginContainer/VBoxContainer"]
+[node name="SubmitButton" type="Button" parent="MarginContainer/VBoxContainer" unique_id=2008334679]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 60)
 layout_mode = 2
@@ -142,8 +51,7 @@ text = "SUBMIT_SCORE"
 script = ExtResource("2_3d1qx")
 metadata/_custom_type_script = "uid://elqkwjm0r5c7"
 
-[node name="Spinner" type="Range" parent="MarginContainer/VBoxContainer/SubmitButton"]
-_import_path = NodePath("")
+[node name="Spinner" type="Range" parent="MarginContainer/VBoxContainer/SubmitButton" unique_id=1492484498]
 unique_name_in_owner = true
 process_mode = 0
 process_priority = 0
@@ -185,6 +93,7 @@ grow_vertical = 2
 rotation = 0.0
 scale = Vector2(1, 1)
 pivot_offset = Vector2(0, 0)
+pivot_offset_ratio = Vector2(0, 0)
 size_flags_horizontal = 1
 size_flags_vertical = 1
 size_flags_stretch_ratio = 1.0

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd

@@ -0,0 +1,48 @@
+class_name RTMIAchievementSummaryPanel
+extends VBoxContainer
+
+@onready var total_time: Label = %TotalTime
+@onready var pos: Label = %Position
+@onready var achievement_count: Label = %AchievementCount
+@onready var unlocked_achievements_container: VBoxContainer = %UnlockedAchievementsContainer
+
+var score_position: int = 0:
+	set(new_value):
+		score_position = new_value
+		%Position.text = "#%d" % new_value
+		
+
+func _ready() -> void:
+	_fill()
+
+func refresh() -> void:
+	_fill()
+
+func _fill():
+	_clear()
+	total_time.text = RTMIScoreManager.format_time(gymkhana.achievement_manager.played_time)
+	var achievements = gymkhana.achievement_manager.get_achievements()
+	for achievement_key in achievements:
+		var label = Label.new()
+		label.text = tr(gymkhana.achievement_manager.generate_achievement_literal(
+			achievement_key, "title"
+		))
+		label.add_theme_color_override("font_color", Color.DIM_GRAY)
+		if achievements.get(achievement_key):
+			label.add_theme_color_override("font_color", Color.GREEN)
+		unlocked_achievements_container.add_child(label)
+
+	achievement_count.text = "%s / %s" % [gymkhana.achievement_manager.get_unlocked_achievements_total(), achievements.size()]
+
+	
+func _clear() -> void:
+	for child in unlocked_achievements_container.get_children():
+		unlocked_achievements_container.remove_child(child)
+		child.queue_free()
+
+func show_position() -> void:
+	%PositionContainer.show()
+
+
+func hide_position() -> void:
+	%PositionContainer.hide()

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd.uid

@@ -0,0 +1 @@
+uid://b7llgro3vx5rr

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn

@@ -0,0 +1,105 @@
+[gd_scene format=3 uid="uid://cbq03pmsdusib"]
+
+[ext_resource type="Script" uid="uid://b7llgro3vx5rr" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd" id="1_cgp0k"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_co5jd"]
+
+[node name="SummaryPanel" type="VBoxContainer" unique_id=1540824004]
+script = ExtResource("1_cgp0k")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="." unique_id=73660583]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer" unique_id=960020049]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="TotalTimeLabel" type="Label" parent="HBoxContainer/VBoxContainer" unique_id=2138042544]
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "TOTAL_TIME"
+horizontal_alignment = 1
+
+[node name="TotalTime" type="Label" parent="HBoxContainer/VBoxContainer" unique_id=1216269417]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 24
+text = "0h 00m 00s"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="PositionContainer" type="VBoxContainer" parent="HBoxContainer" unique_id=841248032]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="PositionLabel" type="Label" parent="HBoxContainer/PositionContainer" unique_id=1515312832]
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "POSITION"
+horizontal_alignment = 1
+
+[node name="Position" type="Label" parent="HBoxContainer/PositionContainer" unique_id=1908844204]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 24
+text = "-"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="HSeparator" type="HSeparator" parent="." unique_id=1916012969]
+layout_mode = 2
+theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
+
+[node name="MarginContainer2" type="MarginContainer" parent="." unique_id=1085828523]
+layout_mode = 2
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="." unique_id=1670072793]
+layout_mode = 2
+
+[node name="AchievementTitle" type="Label" parent="HBoxContainer2" unique_id=1355150017]
+layout_mode = 2
+theme_override_font_sizes/font_size = 12
+text = "ACHIEVEMENT_SUMMARY"
+
+[node name="AchievementCount" type="Label" parent="HBoxContainer2" unique_id=609833971]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 12
+text = "1 / 7"
+horizontal_alignment = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1402890863]
+layout_mode = 2
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="UnlockedAchievementsContainer" type="VBoxContainer" parent="MarginContainer" unique_id=1379287534]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="Label" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=326703026]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label2" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=1558950852]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label3" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=90444976]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label4" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=1591076394]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label5" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=2105711930]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label6" type="Label" parent="MarginContainer/UnlockedAchievementsContainer" unique_id=952804367]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"

addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd

@@ -9,15 +9,15 @@ class_name ESCActionManagerMonkey
 # - action: The action verb to set
 func set_current_action(action: String):
 	# MODIFIED FOR RETURN TO MONKEY UI
-	if (action != current_action) && (action_state != ACTION_INPUT_STATE.AWAITING_TARGET_ITEM):
+	if (action != current_action) && (action_state != ActionInputState.AWAITING_TARGET_ITEM):
 		clear_current_tool()
 
 	current_action = action
 
-	if action_state == ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM:
-		set_action_input_state(ACTION_INPUT_STATE.AWAITING_ITEM)
-	elif action_state == ACTION_INPUT_STATE.AWAITING_VERB:
-		set_action_input_state(ACTION_INPUT_STATE.AWAITING_VERB_CONFIRMATION)
+	if action_state == ActionInputState.AWAITING_VERB_OR_ITEM:
+		set_action_input_state(ActionInputState.AWAITING_ITEM)
+	elif action_state == ActionInputState.AWAITING_VERB:
+		set_action_input_state(ActionInputState.AWAITING_VERB_CONFIRMATION)
 
 	action_changed.emit()
 
@@ -43,21 +43,20 @@ func _get_event_to_queue(
 
 	escoria.logger.info(
 		self,
-		"Checking if action '%s' on '%s' is valid..." % [action, target]
+		"Checking if action '%s' on '%s' is valid..." % [action, target.global_id if target is ESCObject else target]
 	)
 
 	var event_to_return = null
 
-	# If we're using an action which item requires to combine
+	# If the action makes this item wait for a second target object.
 	if target.node is ESCItem \
-		and (action in target.node.combine_when_selected_action_is_in
+		and (action in target.node.actions_requiring_target_object
 		# MODIFIED FOR RETURN TO MONKEY UI
 			or combine_with):
-			# or (combine_with && action in combine_with.node.combine_when_selected_action_is_in)):
 
 		# Check if object is in inventory or is not required to be in inventory to be used
 		if escoria.inventory_manager.inventory_has(target.global_id) or not target.node.use_from_inventory_only:
-			# Player has item in inventory, we check the element to use on
+			# We check the element to use on
 			if combine_with:
 				var do_combine = true
 				if combine_with.node is ESCItem \
@@ -68,28 +67,19 @@ func _get_event_to_queue(
 					do_combine = false
 
 				if do_combine:
-					var action_name = action
-					if combine_with.global_id:
-						action_name += " " + combine_with.global_id
-					
-					var combine_name = action
-					if combine_with.global_id:
-						combine_name += " " + target.global_id
-
-					if _has_event_with_target(target.events, action_name, combine_with.global_id):
-						event_to_return = target.events[action_name]
-
-					elif _has_event_with_target(combine_with.events, combine_name, target.global_id)\
+					if target.has_event_with_target(action, combine_with.global_id):
+						event_to_return = target.get_event_with_target(action, combine_with.global_id)
+					elif combine_with.has_event_with_target(action, target.global_id)\
 							and not combine_with.node.combine_is_one_way:
 
-						event_to_return = combine_with.events[combine_name]
+						event_to_return = combine_with.get_event_with_target(action, target.global_id)
 					else:
 						# Check to see if there isn't a "fallback" action to
 						# run before we declare this a failure.
 						if escoria.action_default_script \
-							and escoria.action_default_script.events.has(action):
+							and escoria.action_default_script.has_event_with_target(action):
 
-							event_to_return = escoria.action_default_script.events[action]
+							event_to_return = escoria.action_default_script.get_event_with_target(action)
 						else:
 							var errors = [
 								"Attempted to execute action '%s' between item %s and item %s" % [
@@ -127,29 +117,26 @@ func _get_event_to_queue(
 								combine_with.global_id
 							]
 					)
-			else:
-				escoria.logger.warn(
-					self,
-					"Invalid action on item: " +
-					"Trying to run action '%s' on object %s, " %
-					[
-						action,
-						target.node.global_id
-					]
-					+ "but item must be in inventory."
-				)
+		else:
+			escoria.logger.warn(
+				self,
+				"Invalid action on item: " +
+				"Trying to run action '%s' on object %s, " %
+				[
+					action,
+					target.node.global_id
+				]
+				+ "but item must be in inventory."
+			)
 	else:
-		if _check_target_has_proper_action(target, action):
-#			##SAVEGAME
-#			if target.events[action].is_completed:
-#				target.events[action].is_completed = false
-#				target.events[action].from_statement_id = 0
-			event_to_return = target.events[action]
+		if target.has_event_with_target(action):
+			# We only deal with the action here as long as it doesn't have a target associated with it.
+			event_to_return = target.get_event_with_target(action)
 		elif escoria.action_default_script \
-			and escoria.action_default_script.events.has(action):
+			and escoria.action_default_script.has_event_with_target(action):
 
 			# If there's a "fallback" action to run, return it
-			event_to_return = escoria.action_default_script.events[action]
+			event_to_return = escoria.action_default_script.get_event_with_target(action)
 		else:
 			escoria.logger.warn(
 				self,
@@ -163,41 +150,27 @@ func _get_event_to_queue(
 	return event_to_return
 
 
-# Event handler when an object/item was clicked
-#
-# #### Parameters
-#
-# - obj: Object that was left clicked
-# - event: Input event that was received
-# - default_action: if true, run the inventory default action
+## Event handler called when an object/item is clicked.[br]
+## [br]
+## #### Parameters[br]
+## [br]
+## | Name | Type | Description | Required? |[br]
+## |:-----|:-----|:------------|:----------|[br]
+## |obj|`ESCObject`|Object that was left clicked.|yes|[br]
+## |event|`InputEvent`|Input event that was received.|yes|[br]
+## |default_action|`bool`|If `true`, run the inventory default action.|no|[br]
+## [br]
+## #### Returns[br]
+## [br]
+## Returns nothing.
 func perform_inputevent_on_object(
 	obj: ESCObject,
 	event: InputEvent,
 	default_action: bool = false
-):
-	"""
-	This algorithm:
-	- validates the requested action
-	- grabs the corresponding event for the action, if available
-	- makes the player move to the clicked object location, if needed
-	(if it is located in the room for example) and wait for reaching.
-	- when reached, performs an action depending on current defined action
-		* no current action defined: do nothing else
-		* current action defined:
-			* item requires no combination: perform the current action
-			  on the item
-			* item requires combination: check the status of the combination
-			  A combination requires 3 elements to fulfill:
-				1/ a verb action
-				2/ a first "tool" (item to use)
-				3/ a second "tool" (item to use ON)
-			  Whatever the user inputs to fulfill the combination (this is
-			  determined by gamedev in his game.gd script)
-				- combination not fulfilled: no not perform until fulfilled
-				- combination fulfilled: perform the combination.
-		* else do nothing, except if default_action is requested.
-		  In this case, perform the default_action on the item.
-	"""
+) -> void:
+	# This validates the requested action, resolves the corresponding event,
+	# moves the player when needed, and only performs targeted item actions
+	# after verb + source item + target item have all been selected.
 
 	escoria.logger.info(
 		self,
@@ -208,32 +181,34 @@ func perform_inputevent_on_object(
 	# (because object is inactive for example)
 	var dont_interact = false
 
-	# We need to have the new action input state BEFORE initiating the player
-	# move so we determine now if the object clicked will require a combination
+	# We need to have the new action input state BEFORE initiating the player
+	# move so we determine now if the object clicked requires a target object
 	# depending on the used action verb.
 	var tool_just_set = _set_tool_and_action(obj, default_action)
 	# MODIFIED FOR RETURN TO MONKEY UI
-	var need_combine = _check_item_needs_combine_obj(obj)
+	# var requires_target_object = _check_item_requires_target_object()
+	var requires_target_object = _check_item_requires_target_object_RTMI(obj)
+	# END MODIFIED FOR RETURN TO MONKEY UI
 
 	# If the clicked item is not in the inventory and the current tool was not set,
 	# then this is our first item, make it the tool.
 	if (not escoria.inventory_manager.inventory_has(obj.global_id) and not current_tool) \
-			or (current_tool and not need_combine):
+			or (current_tool and not requires_target_object):
 		current_tool = obj
-	# Else, if we have a tool and combination required, this is our second item,
+	# Else, if we have a tool and a target is required, this is our second item,
 	# make it the target.
-	elif need_combine and not tool_just_set:
+	elif requires_target_object and not tool_just_set:
 		current_target = obj
 
 	# Update the action input state
-	if action_state == ACTION_INPUT_STATE.AWAITING_TARGET_ITEM and current_target:
-		set_action_input_state(ACTION_INPUT_STATE.COMPLETED)
-	elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and \
-			not need_combine:
-		set_action_input_state(ACTION_INPUT_STATE.COMPLETED)
-	elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and \
-			need_combine and not tool_just_set:
-		set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM)
+	if action_state == ActionInputState.AWAITING_TARGET_ITEM and current_target:
+		set_action_input_state(ActionInputState.COMPLETED)
+	elif action_state == ActionInputState.AWAITING_ITEM and \
+			not requires_target_object:
+		set_action_input_state(ActionInputState.COMPLETED)
+	elif action_state == ActionInputState.AWAITING_ITEM and \
+			requires_target_object and not tool_just_set:
+		set_action_input_state(ActionInputState.AWAITING_TARGET_ITEM)
 
 	var event_to_queue: ESCGrammarStmts.Event = null
 
@@ -246,18 +221,19 @@ func perform_inputevent_on_object(
 	# If so, and if the object is not in the inventory, we need to run the arrived action.
 	elif current_action in ["", ACTION_WALK] and not escoria.inventory_manager.inventory_has(obj.global_id):
 		event_to_queue = _get_event_to_queue(ACTION_ARRIVED, obj)
-	# If the current action is set and different from "walk"/unset, we need to check for combinations.
+	# If the current action is set and different from "walk"/unset, check for targeted actions.
 	elif not current_action in ["", ACTION_WALK]:
-		# If clicked object needs a combination, and current target is set, then perform the combination.
-		if need_combine and current_target:
+		# If the selected tool requires a target and a target is set, run the targeted action.
+		if requires_target_object and current_target:
 			event_to_queue = _get_event_to_queue(current_action, current_tool, current_target)
-		# If clicked object needs a combination then we need to wait for the target.
-		elif need_combine:
-			set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM)
+		# If the selected tool requires a target, wait for the player to choose one.
+		elif requires_target_object:
+			set_action_input_state(ActionInputState.AWAITING_TARGET_ITEM)
 			# If object is in inventory make it current tool.
 			if escoria.inventory_manager.inventory_has(obj.global_id):
 				current_tool = obj
-		# If clicked object doesn't need a combination, then we simply run the action.
+			return
+			# If clicked object doesn't need a target, then we simply run the action.
 		else:
 			event_to_queue = _get_event_to_queue(current_action, obj)
 
@@ -266,7 +242,7 @@ func perform_inputevent_on_object(
 	# player walking towards the destination.
 	if current_action and not event_to_queue:
 		# MODIFIED FOR RETURN TO MONKEY UI
-		if action_state != ACTION_INPUT_STATE.AWAITING_TARGET_ITEM:
+		if action_state != ActionInputState.AWAITING_TARGET_ITEM:
 			clear_current_action()
 		action_finished.emit()
 		return
@@ -277,7 +253,7 @@ func perform_inputevent_on_object(
 		var destination_position: Vector2 = escoria.main.current_scene.player \
 				.global_position
 
-		# If clicked object not in inventory, player walks towards it
+		# If clicked object not in inventory, player walks towards it
 		if not obj.node is ESCPlayer and \
 			not escoria.inventory_manager.inventory_has(obj.global_id) and \
 			not _telekinetic_applies_to(event_to_queue):
@@ -306,8 +282,8 @@ func perform_inputevent_on_object(
 				"Player could not reach destination coordinates %s. "  % str(destination_position) \
 					+ "Any requested action for %s will not fire." % obj.global_id
 			)
-			if escoria.event_manager.EVENT_CANT_REACH in obj.events:
-				escoria.event_manager.queue_event(obj.events[escoria.event_manager.EVENT_CANT_REACH])
+			if obj.has_event_with_target(escoria.event_manager.EVENT_CANT_REACH):
+				escoria.event_manager.queue_event(obj.get_event_with_target(escoria.event_manager.EVENT_CANT_REACH))
 			else:
 				escoria.logger.info(
 					self,
@@ -320,15 +296,18 @@ func perform_inputevent_on_object(
 	if not dont_interact and event_to_queue:
 		_run_event(event_to_queue)
 
-# Prepare the "obj" object for current_action: if required, set the object as
-# current tool.
-#
-# #### Parameters
-#
-# - obj: the ESCObject to prepare
-# - default_action: if true, the default action set on the item is used
-#
-# *Returns* True if the tool was set in this function
+## Prepare the "obj" object for current_action: if required, set the object as current tool.[br]
+## [br]
+## #### Parameters[br]
+## [br]
+## | Name | Type | Description | Required? |[br]
+## |:-----|:-----|:------------|:----------|[br]
+## |obj|`ESCObject`|the ESCObject to prepare.|yes|[br]
+## |default_action|`bool`|if true, the default action set on the item is used.|yes|[br]
+## [br]
+## #### Returns[br]
+## [br]
+## Returns nothing.
 func _set_tool_and_action(obj: ESCObject, default_action: bool):
 	var tool_just_set: bool = false
 	# Check if current_action and current_tool are already set
@@ -343,12 +322,13 @@ func _set_tool_and_action(obj: ESCObject, default_action: bool):
 			current_action = obj.node.default_action_inventory
 		else:
 			current_action = obj.node.default_action
-	elif current_action in obj.node.combine_when_selected_action_is_in:
+	elif current_action in obj.node.actions_requiring_target_object:
 		current_tool = obj
 		tool_just_set = true
 	return tool_just_set
 
 
+# ADDED FOR RETURN TO MONKEY UI
 func is_target_for_tool(tool: ESCItem, target: ESCItem, action: String):
 	var target_tooltips = target.custom_data.get("target_tooltips")
 	if target_tooltips == null:
@@ -361,25 +341,30 @@ func is_target_for_tool(tool: ESCItem, target: ESCItem, action: String):
 	return tool.global_id in action_target_tooltips
 
 
-# Checks if object requires a combination with another, according to
-# currently selected action verb (or check with default action of the item).
-#
-# *Returns* True if current action on "obj" requires a combination
-	# MODIFIED FOR RETURN TO MONKEY UI
-func _check_item_needs_combine_obj(obj: ESCObject) -> bool:
+## Checks if the current tool requires a target object for the selected action verb.[br]
+## [br]
+## #### Parameters[br]
+## [br]
+## None.
+## [br]
+## #### Returns[br]
+## [br]
+## Returns a `bool` value. (`bool`)
+func _check_item_requires_target_object_RTMI(obj: ESCObject) -> bool:
 	return current_action \
 			and current_tool \
-			and (current_action in current_tool.node.combine_when_selected_action_is_in
+			and (current_action in current_tool.node.actions_requiring_target_object
 	# MODIFIED FOR RETURN TO MONKEY UI
 			or is_target_for_tool(current_tool.node, obj.node, current_action))
 
 
+# ADDED FOR RETURN TO MONKEY UI
 func has_actions(current_target_object):
 	if(current_target_object == null):
 		return
 
 	var item_in_inventory = escoria.inventory_manager.inventory_has(current_target_object.global_id)
-	var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+	var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 
 	var action1_text = gymkhana.tooltip_manager.get_target_tooltip(current_target_object, "action3") if waiting_for_target_item else get_tooltip_from_current_target("action3",current_target_object) if item_in_inventory else get_tooltip_from_current_target("action1",current_target_object)
 	if(action1_text != ""):
@@ -390,13 +375,10 @@ func has_actions(current_target_object):
 			return true
 	return false
 
+# ADDED FOR RETURN TO MONKEY UI
 func get_tooltip_from_current_target(verb,current_target_object):
 	return gymkhana.tooltip_manager.getTooltip(current_target_object.global_id, verb)
 
-func _telekinetic_applies_to(event: ESCGrammarStmts.Event) -> bool:
-	return super(event) if event != null else false
-
-# MODIFIED FOR RETURN TO MONKEY UI
 ## Sets the current state of action input.[br]
 ## [br]
 ## #### Parameters[br]
@@ -404,4 +386,5 @@ func _telekinetic_applies_to(event: ESCGrammarStmts.Event) -> bool:
 ## - p_state: the action input state to set.
 func set_action_input_state(p_state) -> void:
 	action_state = p_state
+# MODIFIED FOR RETURN TO MONKEY UI
 	action_input_state_changed.emit(p_state)

addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres

@@ -1,6 +1,16 @@
 [gd_resource type="FontFile" format=3 uid="uid://d1ctari2iol5l"]
 
 [resource]
+font_stretch = 100
+cache/0/variation_coordinates = {}
+cache/0/face_index = 0
+cache/0/embolden = 0.0
+cache/0/transform = Transform2D(1, 0, 0, 1, 0, 0)
+cache/0/spacing_top = 0
+cache/0/spacing_bottom = 0
+cache/0/spacing_space = 0
+cache/0/spacing_glyph = 0
+cache/0/baseline_offset = 0.0
 cache/0/16/0/ascent = 0.0
 cache/0/16/0/descent = 0.0
 cache/0/16/0/underline_position = 0.0

addons/escoria-ui-return-monkey-island/game.gd

@@ -60,13 +60,13 @@ const ESC_UI_CHANGE_VERB_ACTION = "esc_change_verb"
 @export var language_selector: RTMILanguageSelector
 @export var confetti: RTMIConfetti
 @export var tools: Container
+@export var achievement_summary: RTMIAchievementSummaryMenu
 
 # Tracks the mouse's current position onscreen.
 var _current_mouse_pos = Vector2.ZERO
 
 
 func _init():
-
 	gymkhana.item_count_manager = ESCItemCountManager.new()
 	gymkhana.tooltip_manager = ESCTootltipManager.new()
 	gymkhana.global_observer = RTMIGlobalObserver.new()
@@ -80,10 +80,12 @@ func _init():
 	gymkhana.warm_esc_cache()
 
 	# Override for ashes interpreter, fixes global lookup.
-	escoria.interpreter_factory = (
-		preload("res://addons/escoria-ui-return-monkey-island/overrides/esc_interpreter_factory.gd")
-		. new()
-	)
+	# Todo: remove
+	#escoria.interpreter_factory = (
+	#	preload("res://addons/escoria-ui-return-monkey-island/overrides/esc_interpreter_factory.gd")
+	#	. new()
+	#)
+
 
 	if ProjectSettings.get_setting(RTMIUiSettings.DEBUG_ENABLED):
 		gymkhana.dev_tools_registry.register(
@@ -210,14 +212,14 @@ func click_on_bg(position: Vector2) -> void:
 	var current_state = escoria.action_manager.action_state
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_VERB_OR_ITEM
 	):
 		gymkhana.cursor_manager.clear_cursor()
 
 	# If we are using an inventory item reset mouse cursor and cancel action
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		escoria.action_manager.clear_current_tool()
 		gymkhana.cursor_manager.clear_cursor()
@@ -267,7 +269,6 @@ func element_focused(element_id: String) -> void:
 		tooltip_node.set_target(target_obj.tooltip_name)
 		tooltip_node.set_target_object(target_obj)
 
-
 		if escoria.action_manager.has_actions(target_obj):
 			if target_obj is ESCItemWithTooltip:
 				if target_obj.is_interactive:
@@ -292,7 +293,7 @@ func click_on_item(item_global_id: String, event: InputEvent, action: String) ->
 	# If we are using an inventory item reset mouse cursor and use inventory actions (change action1 for action3 and action2 for action4)
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		gymkhana.cursor_manager.clear_cursor()
 		action = ACTION3 if action == ACTION1 else ACTION4
@@ -343,7 +344,7 @@ func click_on_inventory_item(item_global_id: String, event: InputEvent, action:
 		gymkhana.cursor_manager.clear_cursor()
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		gymkhana.cursor_manager.clear_cursor()
 
@@ -366,7 +367,7 @@ func click_on_inventory_item(item_global_id: String, event: InputEvent, action:
 
 	# Hide tooltip if some action is being performed
 	# Disabled: leaves the tooltips hidden. ToDo: check if has other implications.
-	#if escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.COMPLETED:
+	#if escoria.action_manager.action_state == ESCActionManager.ActionInputState.COMPLETED:
 	#	$tooltip_layer/tooltip.setHidden()
 
 
@@ -443,6 +444,11 @@ func unpause_game():
 		escoria.main.current_scene.game.show_ui()
 		escoria.main.current_scene.show()
 		escoria.set_game_paused(false)
+	if achievement_summary.visible:
+		achievement_summary.visible = false
+	if %highscores.visible:
+		%highscores.visible = false
+
 	gymkhana.music_manager.resume()
 	gymkhana.achievement_manager.resume_tracking_time()
 
@@ -571,6 +577,7 @@ func _on_MenuButton_pressed() -> void:
 	else:
 		pause_game()
 
+
 # Clears the tooltip content (if an ESCTooltip node exists in UI)
 # MODIFIED FOR RTMIUI
 func clear_tooltip():
@@ -617,6 +624,7 @@ func _on_say_finished() -> void:
 	await get_tree().create_timer(0.01).timeout
 	update_highlights()
 
+
 func _is_input_all():
 	return escoria.inputs_manager.input_mode == ESCInputsManager.INPUT_ALL
 
@@ -671,5 +679,11 @@ func update_highlights():
 				if room_child is ESCItemWithTooltip:
 					room_child.get_component("outline").update_highlight()
 
+
 func launch_confetti():
 	confetti.launch()
+
+
+func show_achievement_summary() -> void:
+	achievement_summary.show()
+	achievement_summary.refresh()

addons/escoria-ui-return-monkey-island/game.tscn

@@ -1,30 +1,31 @@
-[gd_scene load_steps=32 format=3 uid="uid://cabos3cse6b71"]
+[gd_scene format=3 uid="uid://cabos3cse6b71"]
 
 [ext_resource type="PackedScene" uid="uid://bl50queikqfjc" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" id="1"]
-[ext_resource type="Script" path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" id="2"]
+[ext_resource type="Script" uid="uid://dfl7khtlretr7" path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" id="2"]
 [ext_resource type="Script" uid="uid://cyg3662v0vtcl" path="res://addons/escoria-ui-return-monkey-island/shaders/black_and_white_shader.gd" id="2_o34rc"]
 [ext_resource type="Shader" uid="uid://bgopfs5nlgkcu" path="res://addons/escoria-ui-return-monkey-island/shaders/black_and_white.gdshader" id="2_ssxmx"]
 [ext_resource type="PackedScene" uid="uid://dmw5gicuenj53" path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" id="3"]
 [ext_resource type="PackedScene" uid="uid://d2kogebvoxy51" path="res://addons/escoria-ui-return-monkey-island/rtmi_rich_tooltip.tscn" id="4"]
 [ext_resource type="PackedScene" uid="uid://c7mjom1gqkjwv" path="res://addons/escoria-ui-return-monkey-island/ui/confetti.tscn" id="4_ixq7a"]
 [ext_resource type="Script" uid="uid://lkc4isk3g0rj" path="res://addons/escoria-ui-return-monkey-island/game.gd" id="5"]
-[ext_resource type="Texture2D" uid="uid://ce2rx8nm1s6gh" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"]
+[ext_resource type="Texture2D" uid="uid://i1xdb3c0dbxp" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"]
 [ext_resource type="PackedScene" uid="uid://d3wdxi18u52c5" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" id="7"]
 [ext_resource type="PackedScene" uid="uid://yc6r8t73rwrc" path="res://addons/escoria-ui-return-monkey-island/tools/dev/dev_tools.tscn" id="7_qk4ex"]
 [ext_resource type="PackedScene" uid="uid://dl7w8oqk1rmhw" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" id="8"]
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="9"]
 [ext_resource type="PackedScene" uid="uid://ctg3fukoficqk" path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" id="12"]
-[ext_resource type="Texture2D" uid="uid://cy3eeo64v6ddw" path="res://addons/escoria-ui-return-monkey-island/icons/fullscreen_hover.svg" id="12_te176"]
-[ext_resource type="Texture2D" uid="uid://dghklsdy5nmcg" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"]
+[ext_resource type="Texture2D" uid="uid://c7eexk5ooys2h" path="res://addons/escoria-ui-return-monkey-island/icons/fullscreen_hover.svg" id="12_te176"]
+[ext_resource type="Texture2D" uid="uid://lvnobveihglb" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"]
 [ext_resource type="Script" uid="uid://do70qpvafu5my" path="res://addons/escoria-ui-return-monkey-island/ui/full_screen_button.gd" id="13_6rlck"]
-[ext_resource type="Texture2D" uid="uid://b35fk7ltvp1hc" path="res://addons/escoria-ui-return-monkey-island/icons/menu.svg" id="13_we0hb"]
+[ext_resource type="Texture2D" uid="uid://b6hr6bmfsa2fi" path="res://addons/escoria-ui-return-monkey-island/icons/menu.svg" id="13_we0hb"]
 [ext_resource type="Script" uid="uid://chas0xyx88njl" path="res://addons/escoria-ui-return-monkey-island/buttons/music_button.gd" id="14"]
-[ext_resource type="Texture2D" uid="uid://d0fbiaksfmg7j" path="res://addons/escoria-ui-return-monkey-island/icons/exit_fullscreen.svg" id="14_c6byj"]
-[ext_resource type="Texture2D" uid="uid://c6hw4fs6aoydo" path="res://addons/escoria-ui-return-monkey-island/icons/menu_hover.svg" id="14_parhr"]
-[ext_resource type="Texture2D" uid="uid://d2sehci16hioi" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"]
-[ext_resource type="Texture2D" uid="uid://y2hfekr163su" path="res://addons/escoria-ui-return-monkey-island/icons/exit_fullscreen_hover.svg" id="15_j7gr8"]
-[ext_resource type="Texture2D" uid="uid://e2xk0aimdte" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"]
-[ext_resource type="Texture2D" uid="uid://nsthsaybnd71" path="res://addons/escoria-ui-return-monkey-island/icons/fullscreen.svg" id="18_ixq7a"]
+[ext_resource type="Texture2D" uid="uid://bjrjfk27c4yk6" path="res://addons/escoria-ui-return-monkey-island/icons/exit_fullscreen.svg" id="14_c6byj"]
+[ext_resource type="Texture2D" uid="uid://dolavgprg34eu" path="res://addons/escoria-ui-return-monkey-island/icons/menu_hover.svg" id="14_parhr"]
+[ext_resource type="Texture2D" uid="uid://cg3ysxxjx68tk" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"]
+[ext_resource type="Texture2D" uid="uid://cfduemwr2v4pk" path="res://addons/escoria-ui-return-monkey-island/icons/exit_fullscreen_hover.svg" id="15_j7gr8"]
+[ext_resource type="Texture2D" uid="uid://did1oddwlvlsk" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"]
+[ext_resource type="Texture2D" uid="uid://bqfod54xm1kxf" path="res://addons/escoria-ui-return-monkey-island/icons/fullscreen.svg" id="18_ixq7a"]
+[ext_resource type="PackedScene" uid="uid://bcu6ik8qq0dl6" path="res://addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.tscn" id="18_j7gr8"]
 [ext_resource type="PackedScene" uid="uid://d3kgkl2r5xe4d" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.tscn" id="18_ssxmx"]
 [ext_resource type="PackedScene" uid="uid://c0066wpl3qky4" path="res://addons/escoria-ui-return-monkey-island/menus/language_selector/language_selector.tscn" id="19_we0hb"]
 [ext_resource type="Shader" uid="uid://iehp1eakxyak" path="res://addons/escoria-ui-return-monkey-island/shaders/vignette.gdshader" id="20_parhr"]
@@ -41,7 +42,7 @@ shader_parameter/vignette_strength = 0.9
 shader_parameter/dither_strength = 0.03
 shader_parameter/vignette_color = Color(0, 0, 0, 1)
 
-[node name="game" type="Node2D" node_paths=PackedStringArray("inventory_ui", "rtmi_tooltip_node", "dev_tools_node", "video_player", "language_selector", "confetti")]
+[node name="game" type="Node2D" unique_id=130800361 node_paths=PackedStringArray("inventory_ui", "rtmi_tooltip_node", "dev_tools_node", "video_player", "language_selector", "confetti", "achievement_summary")]
 script = ExtResource("5")
 inventory_ui = NodePath("game_layer/ui_layer/Inventory")
 rtmi_tooltip_node = NodePath("game_layer/tooltip_layer/tooltip")
@@ -49,18 +50,19 @@ dev_tools_node = NodePath("game_layer/ui_layer/DevTools")
 video_player = NodePath("menu_layer/video_player")
 language_selector = NodePath("menu_layer/language_selector")
 confetti = NodePath("CanvasLayer/Confetti")
+achievement_summary = NodePath("menu_layer/AchievementsMenu")
 main_menu = NodePath("menu_layer/main_menu")
 pause_menu = NodePath("menu_layer/pause_menu")
 mouse_tooltip_margin = 70.0
 editor_debug_mode = 1
 
-[node name="black_and_white_shader" type="CanvasLayer" parent="."]
+[node name="black_and_white_shader" type="CanvasLayer" parent="." unique_id=231483138]
 unique_name_in_owner = true
 layer = 4
 visible = false
 script = ExtResource("2_o34rc")
 
-[node name="ColorRect" type="ColorRect" parent="black_and_white_shader"]
+[node name="ColorRect" type="ColorRect" parent="black_and_white_shader" unique_id=1496845968]
 material = SubResource("ShaderMaterial_p0ek8")
 anchors_preset = 15
 anchor_right = 1.0
@@ -68,37 +70,37 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="CanvasLayer" type="CanvasLayer" parent="."]
+[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=61468640]
 layer = 4
 
-[node name="Confetti" parent="CanvasLayer" instance=ExtResource("4_ixq7a")]
+[node name="Confetti" parent="CanvasLayer" unique_id=1262545730 instance=ExtResource("4_ixq7a")]
 
-[node name="Vignette" type="CanvasLayer" parent="."]
+[node name="Vignette" type="CanvasLayer" parent="." unique_id=1645733813]
 process_mode = 4
 
-[node name="ColorRect" type="ColorRect" parent="Vignette"]
+[node name="ColorRect" type="ColorRect" parent="Vignette" unique_id=769138142]
 material = SubResource("ShaderMaterial_qk4ex")
 custom_minimum_size = Vector2(1280, 720)
 color = Color(0, 0, 0, 1)
 
-[node name="camera" parent="." instance=ExtResource("3")]
+[node name="camera" parent="." unique_id=1976476569 instance=ExtResource("3")]
 
-[node name="game_layer" type="CanvasLayer" parent="."]
+[node name="game_layer" type="CanvasLayer" parent="." unique_id=2003323273]
 
-[node name="dialog_layer" type="CanvasLayer" parent="game_layer"]
+[node name="dialog_layer" type="CanvasLayer" parent="game_layer" unique_id=1693878716]
 unique_name_in_owner = true
 layer = 2
 
-[node name="ESCDialogsPlayer" type="Control" parent="game_layer/dialog_layer"]
+[node name="ESCDialogsPlayer" type="Control" parent="game_layer/dialog_layer" unique_id=2131046272]
 layout_mode = 3
 anchors_preset = 0
 theme = ExtResource("9")
 script = ExtResource("2")
 
-[node name="tooltip_layer" type="CanvasLayer" parent="game_layer"]
+[node name="tooltip_layer" type="CanvasLayer" parent="game_layer" unique_id=1576050136]
 layer = 4
 
-[node name="tooltip" parent="game_layer/tooltip_layer" instance=ExtResource("4")]
+[node name="tooltip" parent="game_layer/tooltip_layer" unique_id=400903406 instance=ExtResource("4")]
 z_index = 10
 color = Color(1, 1, 1, 1)
 offset_from_cursor_action1 = Vector2(0, 60)
@@ -107,13 +109,13 @@ offset_from_cursor_action3 = Vector2(0, 60)
 offset_from_cursor_action4 = Vector2(0, -20)
 debug_mode = true
 
-[node name="ui_layer" type="CanvasLayer" parent="game_layer"]
+[node name="ui_layer" type="CanvasLayer" parent="game_layer" unique_id=105114148]
 layer = 2
 
-[node name="DevTools" parent="game_layer/ui_layer" instance=ExtResource("7_qk4ex")]
+[node name="DevTools" parent="game_layer/ui_layer" unique_id=1410502742 instance=ExtResource("7_qk4ex")]
 visible = false
 
-[node name="Inventory" parent="game_layer/ui_layer" instance=ExtResource("1")]
+[node name="Inventory" parent="game_layer/ui_layer" unique_id=538017545 instance=ExtResource("1")]
 anchors_preset = 7
 anchor_top = 1.0
 anchor_bottom = 1.0
@@ -124,31 +126,34 @@ offset_bottom = 0.0
 grow_vertical = 0
 pivot_offset = Vector2(845, 116)
 
-[node name="AchievementNotifications" parent="game_layer/ui_layer" instance=ExtResource("18_ssxmx")]
+[node name="AchievementNotifications" parent="game_layer/ui_layer" unique_id=1272169002 instance=ExtResource("18_ssxmx")]
 
-[node name="menu_layer" type="CanvasLayer" parent="."]
+[node name="menu_layer" type="CanvasLayer" parent="." unique_id=1581631536]
 layer = 8
 
-[node name="pause_menu" parent="menu_layer" instance=ExtResource("8")]
+[node name="pause_menu" parent="menu_layer" unique_id=350673656 instance=ExtResource("8")]
 visible = false
 
-[node name="main_menu" parent="menu_layer" instance=ExtResource("7")]
+[node name="main_menu" parent="menu_layer" unique_id=1230003276 instance=ExtResource("7")]
 visible = false
 
-[node name="video_player" parent="menu_layer" instance=ExtResource("12")]
+[node name="video_player" parent="menu_layer" unique_id=1186347573 instance=ExtResource("12")]
 visible = false
 
-[node name="language_selector" parent="menu_layer" instance=ExtResource("19_we0hb")]
+[node name="language_selector" parent="menu_layer" unique_id=397460291 instance=ExtResource("19_we0hb")]
 visible = false
 
-[node name="highscores" parent="menu_layer" instance=ExtResource("23_p0ek8")]
+[node name="highscores" parent="menu_layer" unique_id=343863689 instance=ExtResource("23_p0ek8")]
 unique_name_in_owner = true
 visible = false
 
-[node name="buttons_layer" type="CanvasLayer" parent="."]
+[node name="AchievementsMenu" parent="menu_layer" unique_id=1837433215 instance=ExtResource("18_j7gr8")]
+visible = false
+
+[node name="buttons_layer" type="CanvasLayer" parent="." unique_id=349265229]
 layer = 10
 
-[node name="Tools" type="PanelContainer" parent="buttons_layer"]
+[node name="Tools" type="PanelContainer" parent="buttons_layer" unique_id=503270897]
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
@@ -157,14 +162,14 @@ offset_bottom = 84.0
 grow_horizontal = 0
 theme = ExtResource("9")
 
-[node name="MarginContainer" type="MarginContainer" parent="buttons_layer/Tools"]
+[node name="MarginContainer" type="MarginContainer" parent="buttons_layer/Tools" unique_id=1276506036]
 layout_mode = 2
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="buttons_layer/Tools/MarginContainer"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="buttons_layer/Tools/MarginContainer" unique_id=1609302463]
 layout_mode = 2
 alignment = 2
 
-[node name="FullScreenButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2"]
+[node name="FullScreenButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2" unique_id=319984114]
 process_mode = 3
 layout_mode = 2
 texture_normal = ExtResource("18_ixq7a")
@@ -175,7 +180,7 @@ fullscreen_active_hover_texture = ExtResource("15_j7gr8")
 fullscreen_default_texture = ExtResource("18_ixq7a")
 fullscreen_default_hover_texture = ExtResource("12_te176")
 
-[node name="MusicButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2"]
+[node name="MusicButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2" unique_id=672655453]
 process_mode = 3
 custom_minimum_size = Vector2(64, 0)
 layout_mode = 2
@@ -185,7 +190,7 @@ music_enabled_hover_texture = ExtResource("13")
 music_disabled_texture = ExtResource("16")
 music_disabled_hover_texture = ExtResource("15")
 
-[node name="MenuButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2"]
+[node name="MenuButton" type="TextureButton" parent="buttons_layer/Tools/MarginContainer/HBoxContainer2" unique_id=1372578230]
 process_mode = 3
 layout_mode = 2
 texture_normal = ExtResource("13_we0hb")

addons/escoria-ui-return-monkey-island/gymkhana_autoload.gd

@@ -103,9 +103,3 @@ func warm_esc_cache() -> void:
 	for file in files:
 		# We need to use the compiler from the escoria singelton for the cache to work.
 		escoria.esc_compiler.load_esc_file(file)
-
-func toogle_fullscreen():
-	pass
-
-func set_fullscreen(value: bool):
-	pass

addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn

@@ -1,10 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://bl50queikqfjc"]
+[gd_scene format=3 uid="uid://bl50queikqfjc"]
 
 [ext_resource type="Script" uid="uid://1hedqas3odoy" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" id="1"]
 [ext_resource type="Theme" uid="uid://23n73qci0qc3" path="res://addons/escoria-ui-return-monkey-island/theme/inventory_ui.tres" id="1_a1nc4"]
 [ext_resource type="Script" uid="uid://245b34c8nyex" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_container.gd" id="3_a1nc4"]
 
-[node name="Inventory" type="PanelContainer"]
+[node name="Inventory" type="PanelContainer" unique_id=1523244532]
 custom_minimum_size = Vector2(1280, 142)
 anchors_preset = 8
 anchor_left = 0.5
@@ -23,17 +23,17 @@ theme = ExtResource("1_a1nc4")
 script = ExtResource("1")
 inventory_ui_container = NodePath("MarginContainer/ScrollContainer/container")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=380743206]
 layout_mode = 2
 size_flags_vertical = 4
 
-[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer" unique_id=1360665009]
 unique_name_in_owner = true
 clip_contents = false
 layout_mode = 2
 size_flags_vertical = 4
 vertical_scroll_mode = 0
 
-[node name="container" type="HBoxContainer" parent="MarginContainer/ScrollContainer"]
+[node name="container" type="HBoxContainer" parent="MarginContainer/ScrollContainer" unique_id=382028328]
 layout_mode = 2
 script = ExtResource("3_a1nc4")

addons/escoria-ui-return-monkey-island/inventory/rtmi_inventory_button.gd

@@ -57,7 +57,7 @@ func set_texture(texture: Texture):
 func update_highlight():
 	if (
 		escoria.action_manager.action_state
-		!= escoria.action_manager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		!= escoria.action_manager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		highlight(_is_hovered)
 		return

addons/escoria-ui-return-monkey-island/item_components/esc_item_component_outline.gd

@@ -51,12 +51,12 @@ func update_highlight():
 	# No tool selected
 	if (
 		escoria.action_manager.action_state
-		<= escoria.action_manager.ACTION_INPUT_STATE.AWAITING_ITEM
+		<= escoria.action_manager.ActionInputState.AWAITING_ITEM
 	):
 		highlight(gymkhana.is_hint_active or gymkhana.is_item_under_mouse(get_global_id()))
 		return
 
-	#if escoria.action_manager.action_state != escoria.action_manager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM:
+	#if escoria.action_manager.action_state != escoria.action_manager.ActionInputState.AWAITING_TARGET_ITEM:
 	#	highlight(false)
 	#	return
 

addons/escoria-ui-return-monkey-island/menus/language_selector/language_selector.tscn

@@ -1,10 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://c0066wpl3qky4"]
+[gd_scene format=3 uid="uid://c0066wpl3qky4"]
 
 [ext_resource type="Script" uid="uid://bb2dncmckwtj2" path="res://addons/escoria-ui-return-monkey-island/menus/language_selector/language_selector.gd" id="1_rfy64"]
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_ygmpa"]
-[ext_resource type="Texture2D" uid="uid://d0ta8viehhtdj" path="res://addons/escoria-ui-return-monkey-island/icons/translation.svg" id="2_502ci"]
+[ext_resource type="Texture2D" uid="uid://0tm1n8gdb70w" path="res://addons/escoria-ui-return-monkey-island/icons/translation.svg" id="2_502ci"]
 
-[node name="language_selector" type="Control"]
+[node name="language_selector" type="Control" unique_id=2098203740]
 clip_contents = true
 layout_mode = 3
 anchors_preset = 15
@@ -15,7 +15,7 @@ grow_vertical = 2
 theme = ExtResource("1_ygmpa")
 script = ExtResource("1_rfy64")
 
-[node name="Panel" type="Panel" parent="."]
+[node name="Panel" type="Panel" parent="." unique_id=180681449]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -25,7 +25,7 @@ grow_vertical = 2
 scale = Vector2(1.02084, 1)
 theme = ExtResource("1_ygmpa")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1285838128]
 layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
@@ -41,12 +41,12 @@ scale = Vector2(0.92, 0.92)
 theme_override_constants/separation = 100
 alignment = 1
 
-[node name="TextureRect" type="TextureRect" parent="VBoxContainer"]
+[node name="TextureRect" type="TextureRect" parent="VBoxContainer" unique_id=35842988]
 layout_mode = 2
 texture = ExtResource("2_502ci")
 stretch_mode = 3
 
-[node name="languageItems" type="VBoxContainer" parent="VBoxContainer"]
+[node name="languageItems" type="VBoxContainer" parent="VBoxContainer" unique_id=503710355]
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_constants/separation = 10

addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=8 format=3 uid="uid://d3wdxi18u52c5"]
+[gd_scene format=3 uid="uid://d3wdxi18u52c5"]
 
 [ext_resource type="Script" uid="uid://cnlvmkxk41x6j" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" id="1"]
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_6gi1c"]
 [ext_resource type="Script" uid="uid://dop3j41n1qvjf" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button_with_save_feature.gd" id="2"]
-[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://bjes6xx8moy0o" path="res://gymkhana/logo-small.png" id="3"]
 [ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="4"]
 [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"]
 [ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="5_4i6cp"]
 
-[node name="main_menu" type="Control"]
+[node name="main_menu" type="Control" unique_id=330096635]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -18,16 +18,16 @@ grow_vertical = 2
 theme = ExtResource("1_6gi1c")
 script = ExtResource("1")
 
-[node name="Panel" type="Panel" parent="."]
+[node name="Panel" type="Panel" parent="." unique_id=1047264071]
 layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 
-[node name="load_game" parent="." instance=ExtResource("5")]
+[node name="load_game" parent="." unique_id=879830339 instance=ExtResource("5")]
 visible = false
 layout_mode = 1
 
-[node name="options" parent="." instance=ExtResource("4")]
+[node name="options" parent="." unique_id=25946521 instance=ExtResource("4")]
 visible = false
 layout_mode = 1
 anchors_preset = 8
@@ -36,12 +36,12 @@ anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 
-[node name="main" type="Control" parent="."]
+[node name="main" type="Control" parent="." unique_id=1867028033]
 anchors_preset = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 
-[node name="main" type="VBoxContainer" parent="main"]
+[node name="main" type="VBoxContainer" parent="main" unique_id=1996796050]
 layout_mode = 0
 anchor_left = 0.5
 anchor_right = 0.5
@@ -51,22 +51,22 @@ offset_right = 308.0
 theme_override_constants/separation = 50
 alignment = 1
 
-[node name="TextureRect" type="TextureRect" parent="main/main"]
+[node name="TextureRect" type="TextureRect" parent="main/main" unique_id=1414029146]
 layout_mode = 2
 texture = ExtResource("3")
 
-[node name="buttons" type="VBoxContainer" parent="main/main"]
+[node name="buttons" type="VBoxContainer" parent="main/main" unique_id=939909384]
 layout_mode = 2
 theme_override_constants/separation = 10
 
-[node name="new_game" type="Button" parent="main/main/buttons"]
+[node name="new_game" type="Button" parent="main/main/buttons" unique_id=859971914]
 custom_minimum_size = Vector2(0, 130)
 layout_mode = 2
 size_flags_vertical = 3
 text = "NEW_GAME"
 script = ExtResource("5_4i6cp")
 
-[node name="highscores" type="Button" parent="main/main/buttons"]
+[node name="highscores" type="Button" parent="main/main/buttons" unique_id=1734847587]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 theme = ExtResource("1_6gi1c")
@@ -74,26 +74,26 @@ text = "HIGHSCORES"
 script = ExtResource("5_4i6cp")
 metadata/_custom_type_script = "uid://elqkwjm0r5c7"
 
-[node name="load_game" type="Button" parent="main/main/buttons"]
+[node name="load_game" type="Button" parent="main/main/buttons" unique_id=2114925835]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 text = "LOAD_GAME"
 script = ExtResource("2")
 
-[node name="options" type="Button" parent="main/main/buttons"]
+[node name="options" type="Button" parent="main/main/buttons" unique_id=698672371]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 text = "OPTIONS"
 script = ExtResource("5_4i6cp")
 
-[node name="quit" type="Button" parent="main/main/buttons"]
-custom_minimum_size = Vector2(0, 40)
+[node name="quit" type="Button" parent="main/main/buttons" unique_id=571557977]
 unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 text = "QUIT"
 script = ExtResource("5_4i6cp")
 
-[node name="MarginContainer" type="MarginContainer" parent="main"]
+[node name="MarginContainer" type="MarginContainer" parent="main" unique_id=1478487683]
 layout_mode = 1
 anchors_preset = 2
 anchor_top = 1.0
@@ -104,7 +104,7 @@ grow_vertical = 0
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="Version" type="Label" parent="main/MarginContainer"]
+[node name="Version" type="Label" parent="main/MarginContainer" unique_id=1529939867]
 unique_name_in_owner = true
 layout_mode = 2
 theme_override_font_sizes/font_size = 10

addons/escoria-ui-return-monkey-island/menus/options/options.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://csxvnrljbqkr8"]
+[gd_scene format=3 uid="uid://csxvnrljbqkr8"]
 
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_h0rhj"]
 [ext_resource type="Script" uid="uid://bjl2eag8hh30h" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.gd" id="4"]
 
-[node name="options" type="Control"]
+[node name="options" type="Control" unique_id=722380441]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -13,13 +13,13 @@ grow_vertical = 2
 theme = ExtResource("1_h0rhj")
 script = ExtResource("4")
 
-[node name="Panel" type="Panel" parent="."]
+[node name="Panel" type="Panel" parent="." unique_id=1826142134]
 layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 theme = ExtResource("1_h0rhj")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=730241121]
 layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
@@ -34,7 +34,7 @@ grow_horizontal = 2
 grow_vertical = 2
 alignment = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer" unique_id=1882807235]
 layout_mode = 2
 size_flags_horizontal = 6
 theme_override_constants/margin_left = 20
@@ -42,7 +42,7 @@ theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
-[node name="options" type="GridContainer" parent="VBoxContainer/MarginContainer"]
+[node name="options" type="GridContainer" parent="VBoxContainer/MarginContainer" unique_id=698859927]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(400, 0)
 layout_mode = 2
@@ -50,93 +50,93 @@ size_flags_vertical = 6
 theme_override_constants/h_separation = 40
 columns = 2
 
-[node name="language_selector_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="language_selector_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1260226857]
 layout_mode = 2
 text = "OPTIONS_LANGUAGE"
 
-[node name="language_selector" type="OptionButton" parent="VBoxContainer/MarginContainer/options"]
+[node name="language_selector" type="OptionButton" parent="VBoxContainer/MarginContainer/options" unique_id=633642067]
 layout_mode = 2
 alignment = 1
 
-[node name="general_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="general_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1881164635]
 layout_mode = 2
 text = "GENERAL_VOLUME"
 
-[node name="general_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
+[node name="general_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options" unique_id=1605707729]
 layout_mode = 2
 size_flags_horizontal = 3
 max_value = 1.0
 step = 0.001
 
-[node name="sound_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="sound_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1266400781]
 layout_mode = 2
 text = "SOUND_VOLUME"
 
-[node name="sound_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
+[node name="sound_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options" unique_id=2070101523]
 layout_mode = 2
 size_flags_horizontal = 3
 max_value = 1.0
 step = 0.001
 
-[node name="music_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="music_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1337829726]
 layout_mode = 2
 text = "MUSIC_VOLUME"
 
-[node name="music_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
+[node name="music_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options" unique_id=1664991907]
 layout_mode = 2
 size_flags_horizontal = 3
 max_value = 1.0
 step = 0.001
 
-[node name="speech_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="speech_volume_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1016732490]
 layout_mode = 2
 text = "SPEECH_VOLUME"
 
-[node name="speech_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
+[node name="speech_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options" unique_id=194256922]
 layout_mode = 2
 size_flags_horizontal = 3
 max_value = 1.0
 step = 0.001
 
-[node name="fullscreen_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="fullscreen_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1888179670]
 layout_mode = 2
 text = "FULLSCREEN"
 
-[node name="fullscreen" type="CheckButton" parent="VBoxContainer/MarginContainer/options"]
+[node name="fullscreen" type="CheckButton" parent="VBoxContainer/MarginContainer/options" unique_id=1991980595]
 layout_mode = 2
 
-[node name="video_subtitles_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="video_subtitles_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1757387054]
 layout_mode = 2
 text = "VIDEO_SUBTITLES"
 
-[node name="video_subtitles" type="CheckButton" parent="VBoxContainer/MarginContainer/options"]
+[node name="video_subtitles" type="CheckButton" parent="VBoxContainer/MarginContainer/options" unique_id=1606468487]
 layout_mode = 2
 
-[node name="click_to_continue_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="click_to_continue_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=405509089]
 layout_mode = 2
 text = "CLICK_TO_CONTINUE"
 
-[node name="click_to_continue" type="CheckButton" parent="VBoxContainer/MarginContainer/options"]
+[node name="click_to_continue" type="CheckButton" parent="VBoxContainer/MarginContainer/options" unique_id=287979840]
 layout_mode = 2
 
-[node name="slow_text_mode_label" type="Label" parent="VBoxContainer/MarginContainer/options"]
+[node name="slow_text_mode_label" type="Label" parent="VBoxContainer/MarginContainer/options" unique_id=1179898979]
 layout_mode = 2
 text = "SLOW_TEXT_MODE"
 
-[node name="slow_text_mode" type="CheckButton" parent="VBoxContainer/MarginContainer/options"]
+[node name="slow_text_mode" type="CheckButton" parent="VBoxContainer/MarginContainer/options" unique_id=1042929734]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer" unique_id=1646386406]
 layout_mode = 2
 theme_override_constants/separation = 36
 alignment = 1
 
-[node name="back" type="Button" parent="VBoxContainer/HBoxContainer"]
+[node name="back" type="Button" parent="VBoxContainer/HBoxContainer" unique_id=1312805371]
 custom_minimum_size = Vector2(150, 40)
 layout_mode = 2
 text = "OPTIONS_BACK"
 
-[node name="apply" type="Button" parent="VBoxContainer/HBoxContainer"]
+[node name="apply" type="Button" parent="VBoxContainer/HBoxContainer" unique_id=1767470489]
 custom_minimum_size = Vector2(150, 40)
 layout_mode = 2
 text = "APPLY"

addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd

@@ -8,8 +8,6 @@ func _ready():
 	escoria.game_scene.hide_ui()
 	hide()
 
-	gymkhana.achievement_manager.time_updated.connect(_on_time_updated)
-
 	if OS.get_name() == "Web":
 		%quit.visible = false
 
@@ -95,3 +93,7 @@ func _on_time_updated(current_time):
 
 func _on_highscores_button_up() -> void:
 	escoria.game_scene.show_highscores()
+
+
+func _on_achievements_pressed() -> void:
+	escoria.game_scene.show_achievement_summary()

addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=9 format=3 uid="uid://dl7w8oqk1rmhw"]
+[gd_scene format=3 uid="uid://dl7w8oqk1rmhw"]
 
 [ext_resource type="Script" uid="uid://ctu22fcrvjv4t" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" id="1"]
 [ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_e0gqa"]
 [ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="2"]
-[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://bjes6xx8moy0o" path="res://gymkhana/logo-small.png" id="3"]
 [ext_resource type="PackedScene" uid="uid://cj440t8pub603" path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" id="4"]
 [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"]
 [ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="6_31lra"]
 [ext_resource type="Script" uid="uid://dop3j41n1qvjf" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button_with_save_feature.gd" id="7_e0gqa"]
 
-[node name="pause_menu" type="Control"]
+[node name="pause_menu" type="Control" unique_id=662420895]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -19,7 +19,7 @@ grow_vertical = 2
 theme = ExtResource("1_e0gqa")
 script = ExtResource("1")
 
-[node name="Panel" type="Panel" parent="."]
+[node name="Panel" type="Panel" parent="." unique_id=772111723]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -27,15 +27,15 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="save_game" parent="." instance=ExtResource("4")]
+[node name="save_game" parent="." unique_id=1475911417 instance=ExtResource("4")]
 visible = false
 layout_mode = 1
 
-[node name="load_game" parent="." instance=ExtResource("5")]
+[node name="load_game" parent="." unique_id=1952471196 instance=ExtResource("5")]
 visible = false
 layout_mode = 1
 
-[node name="options" parent="." instance=ExtResource("2")]
+[node name="options" parent="." unique_id=1868221783 instance=ExtResource("2")]
 visible = false
 layout_mode = 1
 anchors_preset = 8
@@ -44,7 +44,7 @@ anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=131648976]
 layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
@@ -59,35 +59,29 @@ grow_vertical = 2
 theme_override_constants/separation = 16
 alignment = 1
 
-[node name="TextureRect" type="TextureRect" parent="VBoxContainer"]
+[node name="TextureRect" type="TextureRect" parent="VBoxContainer" unique_id=344974481]
 layout_mode = 2
 texture = ExtResource("3")
 stretch_mode = 3
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
-layout_mode = 2
-
-[node name="CurrentTimeLabel" type="Label" parent="VBoxContainer/HBoxContainer"]
-layout_mode = 2
-text = "CURRENT_PLAYING_TIME"
-
-[node name="CurrentTime" type="Label" parent="VBoxContainer/HBoxContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-text = "1min 20s"
-
-[node name="menuitems" type="VBoxContainer" parent="VBoxContainer"]
+[node name="menuitems" type="VBoxContainer" parent="VBoxContainer" unique_id=1415339225]
 layout_mode = 2
 theme_override_constants/separation = 10
 
-[node name="continue" type="Button" parent="VBoxContainer/menuitems"]
+[node name="continue" type="Button" parent="VBoxContainer/menuitems" unique_id=1152652420]
 custom_minimum_size = Vector2(0, 100)
 layout_mode = 2
 size_flags_vertical = 3
 text = "CONTINUE_GAME"
 script = ExtResource("6_31lra")
 
-[node name="highscores" type="Button" parent="VBoxContainer/menuitems"]
+[node name="achievements" type="Button" parent="VBoxContainer/menuitems" unique_id=1814161439]
+layout_mode = 2
+text = "ACHIEVEMENTS"
+script = ExtResource("6_31lra")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[node name="highscores" type="Button" parent="VBoxContainer/menuitems" unique_id=144449671]
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 theme = ExtResource("1_e0gqa")
@@ -95,36 +89,36 @@ text = "HIGHSCORES"
 script = ExtResource("6_31lra")
 metadata/_custom_type_script = "uid://elqkwjm0r5c7"
 
-[node name="new_game" type="Button" parent="VBoxContainer/menuitems"]
+[node name="new_game" type="Button" parent="VBoxContainer/menuitems" unique_id=1503091843]
 custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 size_flags_vertical = 3
 text = "NEW_GAME"
 script = ExtResource("6_31lra")
 
-[node name="save_game" type="Button" parent="VBoxContainer/menuitems"]
+[node name="save_game" type="Button" parent="VBoxContainer/menuitems" unique_id=981727743]
 custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 size_flags_vertical = 3
 text = "SAVE_GAME"
 script = ExtResource("7_e0gqa")
 
-[node name="load_game" type="Button" parent="VBoxContainer/menuitems"]
+[node name="load_game" type="Button" parent="VBoxContainer/menuitems" unique_id=580692322]
 custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 size_flags_vertical = 3
 text = "LOAD_GAME"
 script = ExtResource("7_e0gqa")
 
-[node name="options" type="Button" parent="VBoxContainer/menuitems"]
+[node name="options" type="Button" parent="VBoxContainer/menuitems" unique_id=139819141]
 custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 text = "OPTIONS"
 script = ExtResource("6_31lra")
 
-[node name="quit" type="Button" parent="VBoxContainer/menuitems"]
-custom_minimum_size = Vector2(0, 30)
+[node name="quit" type="Button" parent="VBoxContainer/menuitems" unique_id=1314409999]
 unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 30)
 layout_mode = 2
 size_flags_vertical = 3
 text = "QUIT"
@@ -134,6 +128,7 @@ script = ExtResource("6_31lra")
 [connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"]
 [connection signal="back_button_pressed" from="options" to="." method="_on_options_back_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/menuitems/continue" to="." method="_on_continue_pressed"]
+[connection signal="pressed" from="VBoxContainer/menuitems/achievements" to="." method="_on_achievements_pressed"]
 [connection signal="button_up" from="VBoxContainer/menuitems/highscores" to="." method="_on_highscores_button_up"]
 [connection signal="pressed" from="VBoxContainer/menuitems/new_game" to="." method="_on_new_game_pressed"]
 [connection signal="pressed" from="VBoxContainer/menuitems/save_game" to="." method="_on_save_game_pressed"]

addons/escoria-ui-return-monkey-island/overrides/esc_interpreter_factory.gd.remove

@@ -4,7 +4,7 @@ class_name RTMIInterpreterFactory
 
 
 ## Produces an interpreter as a singleton.
-func create_interpreter() -> ESCInterpreter:
+func create_interpreter(channel_name: String = "") -> ESCInterpreter:
 	if not _interpreter:
 		_interpreter = load("res://addons/escoria-ui-return-monkey-island/overrides/esc_interpreter.gd").new(ESCCompiler.load_commands(), ESCCompiler.load_globals()) as ESCInterpreter
 		return _interpreter

addons/escoria-ui-return-monkey-island/rtmi_cursor_manager.gd

@@ -69,7 +69,7 @@ func clear_cursor():
 		return
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		return
 	Input.set_custom_mouse_cursor(CURSORS["arrow"], Input.CURSOR_ARROW)
@@ -107,7 +107,7 @@ func handle_input_mode_change(_new_mode):
 func handle_item_cursor(item: ESCItemWithTooltip):
 	if (
 		escoria.action_manager.action_state
-		== ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		== ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 	):
 		return
 

addons/escoria-ui-return-monkey-island/rtmi_rich_tooltip.gd

@@ -158,7 +158,7 @@ func update_tooltip_text():
 	if current_target_object.is_interactive and escoria.current_state == escoria.GAME_STATE.DEFAULT \
 			and escoria.inputs_manager.input_mode == escoria.inputs_manager.INPUT_ALL:
 		var item_in_inventory = escoria.inventory_manager.inventory_has(current_target_object.global_id)
-		var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
+		var waiting_for_target_item = escoria.action_manager.action_state == ESCActionManager.ActionInputState.AWAITING_TARGET_ITEM
 
 		left_click_text = gymkhana.tooltip_manager.get_target_tooltip(current_target_object, "action3") if waiting_for_target_item else get_tooltip_from_current_target("action3") if item_in_inventory else get_tooltip_from_current_target("action1")
 		right_click_text = gymkhana.tooltip_manager.get_target_tooltip(current_target_object, "action4") if waiting_for_target_item else get_tooltip_from_current_target("action4") if item_in_inventory else get_tooltip_from_current_target("action2")

addons/escoria-ui-return-monkey-island/rtmi_rich_tooltip.tscn

@@ -1,18 +1,18 @@
-[gd_scene load_steps=5 format=3 uid="uid://d2kogebvoxy51"]
+[gd_scene format=3 uid="uid://d2kogebvoxy51"]
 
 [ext_resource type="Script" uid="uid://b7sdsky8ovx75" path="res://addons/escoria-ui-return-monkey-island/rtmi_rich_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://chjcs048ughsb" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" id="2"]
-[ext_resource type="Texture2D" uid="uid://cn1fjp4q7b5e0" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://b24at5tbg5kva" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://dpbp4rn2a8in5" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" id="3"]
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="4"]
 
-[node name="tooltipManager" type="Node2D"]
+[node name="tooltipManager" type="Node2D" unique_id=81687918]
 script = ExtResource("1")
 
-[node name="tooltip1" type="Node2D" parent="."]
+[node name="tooltip1" type="Node2D" parent="." unique_id=21049390]
 auto_translate_mode = 1
 visible = false
 
-[node name="label" type="Label" parent="tooltip1"]
+[node name="label" type="Label" parent="tooltip1" unique_id=1217273684]
 offset_left = 9.0
 offset_top = -6.0
 offset_right = 119.0
@@ -20,15 +20,15 @@ offset_bottom = 8.0
 theme = ExtResource("4")
 text = "Text place holder"
 
-[node name="icon" type="Sprite2D" parent="tooltip1"]
+[node name="icon" type="Sprite2D" parent="tooltip1" unique_id=141879879]
 position = Vector2(1, 8)
 scale = Vector2(0.583333, 0.583333)
 texture = ExtResource("3")
 
-[node name="tooltip2" type="Node2D" parent="."]
+[node name="tooltip2" type="Node2D" parent="." unique_id=1095469836]
 visible = false
 
-[node name="label" type="Label" parent="tooltip2"]
+[node name="label" type="Label" parent="tooltip2" unique_id=2060408439]
 offset_left = 9.0
 offset_top = 35.0
 offset_right = 144.0
@@ -36,7 +36,7 @@ offset_bottom = 64.0
 theme = ExtResource("4")
 text = "Text place holder"
 
-[node name="icon" type="Sprite2D" parent="tooltip2"]
+[node name="icon" type="Sprite2D" parent="tooltip2" unique_id=1384393958]
 position = Vector2(1, 49.5)
 scale = Vector2(0.583333, 0.583333)
 texture = ExtResource("2")

addons/escoria-ui-return-monkey-island/shaders/shadermaterial_outline_green5px.tres

@@ -1,4 +1,4 @@
-[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bredlcniiy5bp"]
+[gd_resource type="ShaderMaterial" format=3 uid="uid://bredlcniiy5bp"]
 
 [ext_resource type="Shader" uid="uid://crapjow6genqs" path="res://addons/escoria-ui-return-monkey-island/shaders/outline.gdshader" id="1_2bktm"]
 

addons/escoria-ui-return-monkey-island/theme.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://dvpaon5mw2w8l"]
+[gd_resource type="Theme" format=3 uid="uid://dvpaon5mw2w8l"]
 
 [sub_resource type="StyleBoxFlat" id="1"]
 content_margin_left = 8.0

addons/escoria-ui-return-monkey-island/theme/inventory_ui.tres

@@ -1,8 +1,7 @@
-[gd_resource type="Theme" load_steps=2 format=3 uid="uid://23n73qci0qc3"]
+[gd_resource type="Theme" format=3 uid="uid://23n73qci0qc3"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3hnbv"]
 bg_color = Color(0, 0, 0, 1)
-shadow_size = 16
 
 [resource]
 MarginContainer/constants/margin_bottom = 8

addons/escoria-ui-return-monkey-island/theme/menu.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=12 format=3 uid="uid://djtwqnfbbt5t8"]
+[gd_resource type="Theme" format=3 uid="uid://djtwqnfbbt5t8"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_aw8ss"]
 

addons/escoria-ui-return-monkey-island/theme/ui.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=6 format=3 uid="uid://bf2eet52fueam"]
+[gd_resource type="Theme" format=3 uid="uid://bf2eet52fueam"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6h504"]
 

addons/escoria-ui-return-monkey-island/tools/dev/current_target.tscn

@@ -1,19 +1,19 @@
-[gd_scene load_steps=2 format=3 uid="uid://cutktdrt58uec"]
+[gd_scene format=3 uid="uid://cutktdrt58uec"]
 
 [ext_resource type="Script" uid="uid://bjfoexbcnmqwi" path="res://addons/escoria-ui-return-monkey-island/tools/dev/current_target.gd" id="1_6ag0u"]
 
-[node name="CurrentTarget" type="Control"]
+[node name="CurrentTarget" type="Control" unique_id=2109023394]
 layout_mode = 3
 anchors_preset = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_6ag0u")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1602238125]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=1576196354]
 unique_name_in_owner = true
 layout_mode = 2

addons/escoria-ui-return-monkey-island/tools/dev/dev_tools.tscn

@@ -1,10 +1,10 @@
-[gd_scene load_steps=3 format=3 uid="uid://yc6r8t73rwrc"]
+[gd_scene format=3 uid="uid://yc6r8t73rwrc"]
 
 [ext_resource type="Script" uid="uid://co3lr1fo4jcio" path="res://addons/escoria-ui-return-monkey-island/tools/dev/dev_tools.gd" id="1_081at"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_v60c2"]
 
-[node name="DevTools" type="PanelContainer" node_paths=PackedStringArray("toolButtonContainer")]
+[node name="DevTools" type="PanelContainer" unique_id=511443433 node_paths=PackedStringArray("toolButtonContainer")]
 custom_minimum_size = Vector2(1280, 0)
 offset_right = 40.0
 offset_bottom = 40.0
@@ -14,22 +14,22 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_v60c2")
 script = ExtResource("1_081at")
 toolButtonContainer = NodePath("MarginContainer/VBoxContainer/Toolbar")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=106376600]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=334936625]
 layout_mode = 2
 
-[node name="Toolbar" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+[node name="Toolbar" type="HBoxContainer" parent="MarginContainer/VBoxContainer" unique_id=1400879619]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 20)
 layout_mode = 2
 
-[node name="ToolContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+[node name="ToolContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer" unique_id=1887968344]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3

addons/escoria-ui-return-monkey-island/tools/dev/global_inspector.tscn

@@ -1,31 +1,31 @@
-[gd_scene load_steps=2 format=3 uid="uid://dq6oyy5g2m03m"]
+[gd_scene format=3 uid="uid://dq6oyy5g2m03m"]
 
 [ext_resource type="Script" uid="uid://bxon8pf4raeid" path="res://addons/escoria-ui-return-monkey-island/tools/dev/global_inspector.gd" id="1_uoyvf"]
 
-[node name="GlobalInspector" type="Control"]
+[node name="GlobalInspector" type="Control" unique_id=833786549]
 layout_mode = 3
 anchors_preset = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_uoyvf")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=904594193]
 layout_mode = 0
 offset_right = 4.0
 offset_bottom = 404.0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=1634923725]
 layout_mode = 2
 theme_override_constants/margin_left = 2
 theme_override_constants/margin_top = 2
 theme_override_constants/margin_right = 2
 theme_override_constants/margin_bottom = 2
 
-[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer" unique_id=2045861521]
 custom_minimum_size = Vector2(0, 400)
 layout_mode = 2
 horizontal_scroll_mode = 0
 
-[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/ScrollContainer"]
+[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/ScrollContainer" unique_id=1699954358]
 unique_name_in_owner = true
 layout_mode = 2

addons/escoria-ui-return-monkey-island/tools/dev/globals_watcher.tscn

@@ -1,43 +1,43 @@
-[gd_scene load_steps=2 format=3 uid="uid://ciyttd4u8lpfa"]
+[gd_scene format=3 uid="uid://ciyttd4u8lpfa"]
 
 [ext_resource type="Script" uid="uid://bpcta3oc84rhu" path="res://addons/escoria-ui-return-monkey-island/tools/dev/globals_watcher.gd" id="1_42y5j"]
 
-[node name="GlobalsWatcher" type="Control"]
+[node name="GlobalsWatcher" type="Control" unique_id=83345225]
 layout_mode = 3
 anchors_preset = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_42y5j")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=160962831]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=1217621129]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer" unique_id=2084562487]
 layout_mode = 2
 
-[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=2110501512]
 custom_minimum_size = Vector2(0, 400)
 layout_mode = 2
 horizontal_scroll_mode = 0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer" unique_id=2089133595]
 layout_mode = 2
 theme_override_constants/margin_left = 5
 theme_override_constants/margin_top = 5
 theme_override_constants/margin_right = 5
 theme_override_constants/margin_bottom = 5
 
-[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer"]
+[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer" unique_id=974959197]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="ClearButton" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"]
+[node name="ClearButton" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=2097681178]
 layout_mode = 2
 text = "Clear
 "

addons/escoria-ui-return-monkey-island/tools/dev/hover_stack.tscn

@@ -1,23 +1,23 @@
-[gd_scene load_steps=2 format=3 uid="uid://cj6cavodk6mfm"]
+[gd_scene format=3 uid="uid://cj6cavodk6mfm"]
 
 [ext_resource type="Script" uid="uid://bmc1r33pdmnya" path="res://addons/escoria-ui-return-monkey-island/tools/dev/hover_stack.gd" id="1_e0m7x"]
 
-[node name="hover_stack_layer" type="CanvasLayer"]
+[node name="hover_stack_layer" type="CanvasLayer" unique_id=29603644]
 script = ExtResource("1_e0m7x")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=630392466]
 offset_top = 32.0
 offset_right = 167.0
 offset_bottom = 84.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="title" type="RichTextLabel" parent="VBoxContainer"]
+[node name="title" type="RichTextLabel" parent="VBoxContainer" unique_id=1976116164]
 layout_mode = 2
 size_flags_vertical = 3
 bbcode_enabled = true
 text = "Hover stack"
 
-[node name="hover_stack" type="VBoxContainer" parent="VBoxContainer"]
+[node name="hover_stack" type="VBoxContainer" parent="VBoxContainer" unique_id=1237072312]
 layout_mode = 2
 size_flags_vertical = 3

addons/escoria-ui-return-monkey-island/tools/dev/room_objects.tscn

@@ -1,25 +1,25 @@
-[gd_scene load_steps=2 format=3 uid="uid://bl33soqb4k8ga"]
+[gd_scene format=3 uid="uid://bl33soqb4k8ga"]
 
 [ext_resource type="Script" uid="uid://dlkrkp2w2nhv0" path="res://addons/escoria-ui-return-monkey-island/tools/dev/room_objects.gd" id="1_ob0i5"]
 
-[node name="RoomObjects" type="PanelContainer"]
+[node name="RoomObjects" type="PanelContainer" unique_id=1593232290]
 offset_right = 400.0
 offset_bottom = 420.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_ob0i5")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=2054568884]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer" unique_id=574127819]
 custom_minimum_size = Vector2(0, 400)
 layout_mode = 2
 
-[node name="ObjectContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"]
+[node name="ObjectContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer" unique_id=1051461600]
 unique_name_in_owner = true
 layout_mode = 2

addons/escoria-ui-return-monkey-island/tools/dev/ui/ui_escoria_variable.tscn

@@ -1,13 +1,13 @@
-[gd_scene load_steps=2 format=3 uid="uid://kp203obry7ij"]
+[gd_scene format=3 uid="uid://kp203obry7ij"]
 
 [ext_resource type="Script" uid="uid://bqvsgtqhafuci" path="res://addons/escoria-ui-return-monkey-island/tools/dev/ui/ui_escoria_variable.gd" id="1_fdv5b"]
 
-[node name="Variable" type="HBoxContainer"]
+[node name="Variable" type="HBoxContainer" unique_id=924484818]
 offset_right = 454.0
 offset_bottom = 23.0
 script = ExtResource("1_fdv5b")
 
-[node name="Name" type="Label" parent="."]
+[node name="Name" type="Label" parent="." unique_id=830919537]
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 mouse_filter = 1
@@ -17,7 +17,7 @@ vertical_alignment = 1
 clip_text = true
 text_overrun_behavior = 3
 
-[node name="Value" type="Label" parent="."]
+[node name="Value" type="Label" parent="." unique_id=21337990]
 clip_contents = true
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2

addons/escoria-ui-return-monkey-island/ui/confetti.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=5 format=3 uid="uid://c7mjom1gqkjwv"]
+[gd_scene format=3 uid="uid://c7mjom1gqkjwv"]
 
 [ext_resource type="Script" uid="uid://s1s08sgq8te7" path="res://addons/escoria-ui-return-monkey-island/ui/confetti.gd" id="1_5ccud"]
-[ext_resource type="Texture2D" uid="uid://1gbwusfgagys" path="res://addons/escoria-ui-return-monkey-island/images/confetti.svg" id="1_akxxl"]
+[ext_resource type="Texture2D" uid="uid://byl5kiwtg8smr" path="res://addons/escoria-ui-return-monkey-island/images/confetti.svg" id="1_akxxl"]
 
 [sub_resource type="Curve" id="Curve_akxxl"]
 _limits = [-360.0, 360.0, 0.0, 1.0]
@@ -12,15 +12,15 @@ point_count = 3
 offsets = PackedFloat32Array(0.12351544, 0.31591448, 0.4631829, 0.6128266, 0.7672209, 0.89548695, 0.94299287, 1)
 colors = PackedColorArray(1, 0, 0.016666412, 1, 0.98333335, 1, 0, 1, 0, 1, 0.3166666, 1, 0, 0.7999997, 1, 1, 0.3166666, 0, 1, 1, 0.8333335, 0, 1, 1, 1, 0, 0.016666412, 1, 1, 1, 1, 1)
 
-[node name="Confetti" type="Node2D"]
+[node name="Confetti" type="Node2D" unique_id=208318676]
 script = ExtResource("1_5ccud")
 
-[node name="CPUParticles2D" type="CPUParticles2D" parent="."]
+[node name="CPUParticles2D" type="CPUParticles2D" parent="." unique_id=862590433]
 position = Vector2(416, -42)
 emitting = false
 amount = 40
 texture = ExtResource("1_akxxl")
-lifetime = 1.9000000000000001
+lifetime = 1.9
 one_shot = true
 emission_shape = 3
 emission_rect_extents = Vector2(640, 1)
@@ -33,12 +33,12 @@ angle_min = -166.2
 angle_max = 160.0
 color_initial_ramp = SubResource("Gradient_akxxl")
 
-[node name="CPUParticles2D2" type="CPUParticles2D" parent="."]
+[node name="CPUParticles2D2" type="CPUParticles2D" parent="." unique_id=1738582618]
 position = Vector2(948, -39)
 emitting = false
 amount = 40
 texture = ExtResource("1_akxxl")
-lifetime = 1.9000000000000001
+lifetime = 1.9
 one_shot = true
 emission_shape = 3
 emission_rect_extents = Vector2(640, 1)

addons/escoria-ui-return-monkey-island/video_player/video_player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://ctg3fukoficqk"]
+[gd_scene format=3 uid="uid://ctg3fukoficqk"]
 
 [ext_resource type="Script" uid="uid://ckl3iy3v3v68s" path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.gd" id="1"]
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="1_384st"]
@@ -9,7 +9,7 @@ bg_color = Color(0, 0, 0, 0.627451)
 
 [sub_resource type="Shortcut" id="3"]
 
-[node name="video_player" type="Control"]
+[node name="video_player" type="Control" unique_id=721754448]
 layout_mode = 3
 anchors_preset = 0
 offset_right = 1280.0
@@ -17,18 +17,18 @@ offset_bottom = 720.0
 theme = ExtResource("1_384st")
 script = ExtResource("1")
 
-[node name="ColorRect" type="ColorRect" parent="."]
+[node name="ColorRect" type="ColorRect" parent="." unique_id=228349139]
 layout_mode = 0
 offset_right = 1280.0
 offset_bottom = 720.0
 color = Color(0, 0, 0, 1)
 
-[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."]
+[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="." unique_id=1109958251]
 layout_mode = 0
 offset_right = 1280.0
 offset_bottom = 720.0
 
-[node name="SubtitlesLabel" type="RichTextLabel" parent="VideoStreamPlayer"]
+[node name="SubtitlesLabel" type="RichTextLabel" parent="VideoStreamPlayer" unique_id=1460567908]
 visible = false
 layout_mode = 1
 anchors_preset = 12
@@ -48,7 +48,7 @@ vertical_alignment = 1
 script = ExtResource("SubtitlesLabel")
 metadata/_custom_type_script = "uid://dnjyb6nrg1s02"
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1932184009]
 layout_mode = 1
 anchors_preset = 3
 anchor_left = 1.0
@@ -60,18 +60,17 @@ offset_top = -40.0
 grow_horizontal = 0
 grow_vertical = 0
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=200354457]
 layout_mode = 2
 
-[node name="Skip" type="Button" parent="PanelContainer/MarginContainer"]
+[node name="Skip" type="Button" parent="PanelContainer/MarginContainer" unique_id=1731582084]
 layout_mode = 2
 shortcut = SubResource("3")
 shortcut_in_tooltip = false
 text = "SKIP_VIDEO"
 
-[node name="CursorTimer" type="Timer" parent="."]
+[node name="CursorTimer" type="Timer" parent="." unique_id=1315023991]
 unique_name_in_owner = true
-wait_time = 1.0
 one_shot = true
 
 [connection signal="finished" from="VideoStreamPlayer" to="." method="_on_VideoPlayer_finished"]

addons/gdUnit4

@@ -0,0 +1 @@
+../../escoria-demo-game/addons/gdUnit4

api.cfg.debug

@@ -4,5 +4,5 @@ project_id="68fff7ac0029558ca82c"
 database_id="68fff91900295af283bf"
 
 [score_submit]
-url="https://gymkhana.functions.app.fosil.eu"
+url="https://gymkhana.fosil.eu/submit-score"
 key="API_KEY_PLACEHOLDER"

apply_patches.sh

@@ -9,9 +9,13 @@ DEFAULT_DESTINATION_PATH="../escoria-demo-game"
 DESTINATION_PATH="${1:-$DEFAULT_DESTINATION_PATH}"
 
 REMOTE_PATCHES=(
-  "https://patch-diff.githubusercontent.com/raw/godot-escoria/escoria-demo-game/pull/777.patch"
+  https://patch-diff.githubusercontent.com/raw/godot-escoria/escoria-demo-game/pull/793.patch # Todo: update PR
+  https://patch-diff.githubusercontent.com/raw/godot-escoria/escoria-demo-game/pull/1240.patch
+  https://patch-diff.githubusercontent.com/raw/godot-escoria/escoria-demo-game/pull/1241.patch
 )
 
+WORKING_COMMIT="421acd5b59c61e2dc0b62fab0c4ff3a4d059c833"
+
 PROJECT_PATH=$PWD
 
 echo -e 
@@ -26,25 +30,20 @@ echo -e
 echo -e "${BLUE}Cleaning and updating the repo${NOCOLOR}"
 echo -e ==========================
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [ "$BRANCH" != "main" ]
-then
-  echo -e ${RED}Not on main branch. Aborting. ${NOCOLOR}
-  echo -e
-  exit 0
-fi
-
 
 git clean -fx 
 git reset --hard
-git pull origin main
+
+git fetch
+git pull origin $WORKING_COMMIT
+git checkout $WORKING_COMMIT
 
 echo -e
 echo -e "${BLUE}Applying remote patches...${NOCOLOR}"
 echo -e ==========================
 for REMOTE_PATCH in "${REMOTE_PATCHES[@]}"; do
 	echo -e "Patch: ${ORANGE}$REMOTE_PATCH${NOCOLOR}"
-	curl $REMOTE_PATCH | git apply -v --index
+	curl $REMOTE_PATCH | git apply -v --reject --index
 done
 
 echo -e
@@ -52,9 +51,14 @@ echo -e "${BLUE}Applying local patches...${NOCOLOR}"
 echo -e ==========================
 for FILE in $PROJECT_PATH/patches/*; do
 	echo -e "Patch: ${ORANGE}$FILE${NOCOLOR}"
-	git apply -v --index $FILE
+	git apply -v --reject --index $FILE
 done
 
 
+echo -e
+echo -e "${BLUE}Rejected files...${NOCOLOR}"
+echo -e ==========================
+find -name "*.rej"
+
 popd > /dev/null
 echo -e "${BLUE}Done!🎉${NOCOLOR}"

build.sh

@@ -37,27 +37,38 @@ PLATFORMS=(
 	"amd"
 	"arm"
 	"web"
+	"web-multi"
+	"win"
 )
 
 declare -A PLATFORM_NAMES
 PLATFORM_NAMES["amd"]=$EXPORT_NAME
 PLATFORM_NAMES["arm"]=$EXPORT_NAME
 PLATFORM_NAMES["web"]="index"
+PLATFORM_NAMES["web-multi"]="index"
+PLATFORM_NAMES["win"]=$EXPORT_NAME
 
 declare -A PLATFORM_EXTENSIONS
 PLATFORM_EXTENSIONS["amd"]=".x86_64.appimage"
 PLATFORM_EXTENSIONS["arm"]=".arm_64.appimage"
 PLATFORM_EXTENSIONS["web"]=".html"
+PLATFORM_EXTENSIONS["web-multi"]=".html"
+PLATFORM_EXTENSIONS["win"]=".exe"
 
 declare -A PLATFORM_EXPORTS
 PLATFORM_EXPORTS["amd"]="Linux"
 PLATFORM_EXPORTS["arm"]="LinuxARM"
 PLATFORM_EXPORTS["web"]="Web"
+PLATFORM_EXPORTS["web-multi"]="WebThread"
+PLATFORM_EXPORTS["win"]="Windows"
 
 declare -A PLATFORM_OVERRIDES
 PLATFORM_OVERRIDES["amd"]="debug"
 PLATFORM_OVERRIDES["arm"]="debug"
 PLATFORM_OVERRIDES["web"]="web"
+PLATFORM_OVERRIDES["web-multi"]="web"
+PLATFORM_OVERRIDES["win"]="debug"
+
 
 CURRENT_EXPORT_DIR=$EXPORT_DIR/release
 
@@ -77,8 +88,7 @@ for TYPE in "${BUILD_TYPES[@]}"; do
 		
 		cp $PROJECT_PATH/override.cfg.${PLATFORM_OVERRIDES[$PLATFORM]} $PROJECT_PATH/override.cfg
 		echo "escoria/main/game_version=\"$VERSION\"" >> $PROJECT_PATH/override.cfg
-		
-		if [ "$PLATFORM" == "web" ]; then CURRENT_EXPORT_NAME=${PLATFORM_NAMES[$PLATFORM]}; else CURRENT_EXPORT_NAME=$CURRENT_EXPORT_NAME; fi
+		if [[ "$PLATFORM" == *"web"* ]]; then CURRENT_EXPORT_NAME=${PLATFORM_NAMES[$PLATFORM]}; else CURRENT_EXPORT_NAME=$CURRENT_EXPORT_NAME; fi
 		godot --headless $STD_OUTPUT --export-$TYPE "${PLATFORM_EXPORTS[$PLATFORM]}" "$CURRENT_EXPORT_DIR/$PLATFORM/$CURRENT_EXPORT_NAME${PLATFORM_EXTENSIONS[$PLATFORM]}"
 	done
 
@@ -86,6 +96,12 @@ for TYPE in "${BUILD_TYPES[@]}"; do
 	tar cfz ../web-$TYPE.tar.gz . 
 	zip ../web-$TYPE.zip *
 	cd $PROJECT_PATH
+	cd $CURRENT_EXPORT_DIR/web-multi
+	tar cfz ../web-multi-$TYPE.tar.gz . 
+	zip ../web-multi-$TYPE.zip *
+
+	cd $PROJECT_PATH
+
 done
 
 rm $PROJECT_PATH/override.cfg

default_env.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Environment" load_steps=2 format=3 uid="uid://b826eo66vqyyg"]
+[gd_resource type="Environment" format=3 uid="uid://b826eo66vqyyg"]
 
 [sub_resource type="Sky" id="1"]
 

export_presets.cfg

@@ -139,3 +139,372 @@ texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
 texture_format/no_bptc_fallbacks=true
+
+[preset.3]
+
+name="WebThread"
+platform="Web"
+runnable=false
+advanced_options=false
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter="*.esc, *.csv, *.ncsv, *.cfg, *.srt"
+exclude_filter="*.xcf, saves/*, scripts/*,vscode-extension-ashes/*"
+export_path="build/web-multi/index.html"
+patches=PackedStringArray()
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.3.options]
+
+custom_template/debug=""
+custom_template/release=""
+variant/extensions_support=false
+variant/thread_support=true
+vram_texture_compression/for_desktop=true
+vram_texture_compression/for_mobile=false
+html/export_icon=true
+html/custom_html_shell="res://platform/web/full-size.html"
+html/head_include=""
+html/canvas_resize_policy=2
+html/focus_canvas_on_start=true
+html/experimental_virtual_keyboard=false
+progressive_web_app/enabled=true
+progressive_web_app/ensure_cross_origin_isolation_headers=true
+progressive_web_app/offline_page=""
+progressive_web_app/display=0
+progressive_web_app/orientation=1
+progressive_web_app/icon_144x144=""
+progressive_web_app/icon_180x180=""
+progressive_web_app/icon_512x512=""
+progressive_web_app/background_color=Color(0, 0, 0, 1)
+threads/emscripten_pool_size=8
+threads/godot_pool_size=4
+
+[preset.4]
+
+name="Windows"
+platform="Windows Desktop"
+runnable=true
+advanced_options=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter="*.esc, *.csv, *.ncsv, *.cfg, *.srt"
+exclude_filter="*.xcf, saves/*, scripts/*,vscode-extension-ashes/*"
+export_path=""
+patches=PackedStringArray()
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.4.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+binary_format/embed_pck=true
+texture_format/s3tc_bptc=true
+texture_format/etc2_astc=false
+shader_baker/enabled=true
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon="uid://d22lbvlnub5a7"
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name="Uliwood"
+application/product_name="Las Gymkhanikas de Uli"
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+application/export_angle=0
+application/export_d3d12=0
+application/d3d12_agility_sdk_multiarch=true
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force '{temp_dir}'"
+
+[preset.5]
+
+name="mac"
+platform="macOS"
+runnable=true
+advanced_options=false
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+patches=PackedStringArray()
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.5.options]
+
+export/distribution_type=1
+binary_format/architecture="universal"
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+application/icon="uid://d22lbvlnub5a7"
+application/icon_interpolation=4
+application/bundle_identifier="org.uliwood.gymkhana"
+application/signature=""
+application/app_category="Games"
+application/short_version=""
+application/version=""
+application/copyright=""
+application/copyright_localized={}
+application/min_macos_version_x86_64="10.12"
+application/min_macos_version_arm64="11.00"
+application/export_angle=0
+display/high_res=true
+shader_baker/enabled=true
+application/additional_plist_content=""
+xcode/platform_build="14C18"
+xcode/sdk_version="13.1"
+xcode/sdk_build="22C55"
+xcode/sdk_name="macosx13.1"
+xcode/xcode_version="1420"
+xcode/xcode_build="14C18"
+codesign/codesign=0
+codesign/installer_identity=""
+codesign/apple_team_id=""
+codesign/identity=""
+codesign/entitlements/custom_file=""
+codesign/entitlements/allow_jit_code_execution=false
+codesign/entitlements/allow_unsigned_executable_memory=false
+codesign/entitlements/allow_dyld_environment_variables=false
+codesign/entitlements/disable_library_validation=false
+codesign/entitlements/audio_input=false
+codesign/entitlements/camera=false
+codesign/entitlements/location=false
+codesign/entitlements/address_book=false
+codesign/entitlements/calendars=false
+codesign/entitlements/photos_library=false
+codesign/entitlements/apple_events=false
+codesign/entitlements/debugging=false
+codesign/entitlements/app_sandbox/enabled=false
+codesign/entitlements/app_sandbox/network_server=false
+codesign/entitlements/app_sandbox/network_client=false
+codesign/entitlements/app_sandbox/device_usb=false
+codesign/entitlements/app_sandbox/device_bluetooth=false
+codesign/entitlements/app_sandbox/files_downloads=0
+codesign/entitlements/app_sandbox/files_pictures=0
+codesign/entitlements/app_sandbox/files_music=0
+codesign/entitlements/app_sandbox/files_movies=0
+codesign/entitlements/app_sandbox/files_user_selected=0
+codesign/entitlements/app_sandbox/helper_executables=[]
+codesign/entitlements/additional=""
+codesign/custom_options=PackedStringArray()
+notarization/notarization=0
+privacy/microphone_usage_description=""
+privacy/microphone_usage_description_localized={}
+privacy/camera_usage_description=""
+privacy/camera_usage_description_localized={}
+privacy/location_usage_description=""
+privacy/location_usage_description_localized={}
+privacy/address_book_usage_description=""
+privacy/address_book_usage_description_localized={}
+privacy/calendar_usage_description=""
+privacy/calendar_usage_description_localized={}
+privacy/photos_library_usage_description=""
+privacy/photos_library_usage_description_localized={}
+privacy/desktop_folder_usage_description=""
+privacy/desktop_folder_usage_description_localized={}
+privacy/documents_folder_usage_description=""
+privacy/documents_folder_usage_description_localized={}
+privacy/downloads_folder_usage_description=""
+privacy/downloads_folder_usage_description_localized={}
+privacy/network_volumes_usage_description=""
+privacy/network_volumes_usage_description_localized={}
+privacy/removable_volumes_usage_description=""
+privacy/removable_volumes_usage_description_localized={}
+privacy/tracking_enabled=false
+privacy/tracking_domains=PackedStringArray()
+privacy/collected_data/name/collected=false
+privacy/collected_data/name/linked_to_user=false
+privacy/collected_data/name/used_for_tracking=false
+privacy/collected_data/name/collection_purposes=0
+privacy/collected_data/email_address/collected=false
+privacy/collected_data/email_address/linked_to_user=false
+privacy/collected_data/email_address/used_for_tracking=false
+privacy/collected_data/email_address/collection_purposes=0
+privacy/collected_data/phone_number/collected=false
+privacy/collected_data/phone_number/linked_to_user=false
+privacy/collected_data/phone_number/used_for_tracking=false
+privacy/collected_data/phone_number/collection_purposes=0
+privacy/collected_data/physical_address/collected=false
+privacy/collected_data/physical_address/linked_to_user=false
+privacy/collected_data/physical_address/used_for_tracking=false
+privacy/collected_data/physical_address/collection_purposes=0
+privacy/collected_data/other_contact_info/collected=false
+privacy/collected_data/other_contact_info/linked_to_user=false
+privacy/collected_data/other_contact_info/used_for_tracking=false
+privacy/collected_data/other_contact_info/collection_purposes=0
+privacy/collected_data/health/collected=false
+privacy/collected_data/health/linked_to_user=false
+privacy/collected_data/health/used_for_tracking=false
+privacy/collected_data/health/collection_purposes=0
+privacy/collected_data/fitness/collected=false
+privacy/collected_data/fitness/linked_to_user=false
+privacy/collected_data/fitness/used_for_tracking=false
+privacy/collected_data/fitness/collection_purposes=0
+privacy/collected_data/payment_info/collected=false
+privacy/collected_data/payment_info/linked_to_user=false
+privacy/collected_data/payment_info/used_for_tracking=false
+privacy/collected_data/payment_info/collection_purposes=0
+privacy/collected_data/credit_info/collected=false
+privacy/collected_data/credit_info/linked_to_user=false
+privacy/collected_data/credit_info/used_for_tracking=false
+privacy/collected_data/credit_info/collection_purposes=0
+privacy/collected_data/other_financial_info/collected=false
+privacy/collected_data/other_financial_info/linked_to_user=false
+privacy/collected_data/other_financial_info/used_for_tracking=false
+privacy/collected_data/other_financial_info/collection_purposes=0
+privacy/collected_data/precise_location/collected=false
+privacy/collected_data/precise_location/linked_to_user=false
+privacy/collected_data/precise_location/used_for_tracking=false
+privacy/collected_data/precise_location/collection_purposes=0
+privacy/collected_data/coarse_location/collected=false
+privacy/collected_data/coarse_location/linked_to_user=false
+privacy/collected_data/coarse_location/used_for_tracking=false
+privacy/collected_data/coarse_location/collection_purposes=0
+privacy/collected_data/sensitive_info/collected=false
+privacy/collected_data/sensitive_info/linked_to_user=false
+privacy/collected_data/sensitive_info/used_for_tracking=false
+privacy/collected_data/sensitive_info/collection_purposes=0
+privacy/collected_data/contacts/collected=false
+privacy/collected_data/contacts/linked_to_user=false
+privacy/collected_data/contacts/used_for_tracking=false
+privacy/collected_data/contacts/collection_purposes=0
+privacy/collected_data/emails_or_text_messages/collected=false
+privacy/collected_data/emails_or_text_messages/linked_to_user=false
+privacy/collected_data/emails_or_text_messages/used_for_tracking=false
+privacy/collected_data/emails_or_text_messages/collection_purposes=0
+privacy/collected_data/photos_or_videos/collected=false
+privacy/collected_data/photos_or_videos/linked_to_user=false
+privacy/collected_data/photos_or_videos/used_for_tracking=false
+privacy/collected_data/photos_or_videos/collection_purposes=0
+privacy/collected_data/audio_data/collected=false
+privacy/collected_data/audio_data/linked_to_user=false
+privacy/collected_data/audio_data/used_for_tracking=false
+privacy/collected_data/audio_data/collection_purposes=0
+privacy/collected_data/gameplay_content/collected=false
+privacy/collected_data/gameplay_content/linked_to_user=false
+privacy/collected_data/gameplay_content/used_for_tracking=false
+privacy/collected_data/gameplay_content/collection_purposes=0
+privacy/collected_data/customer_support/collected=false
+privacy/collected_data/customer_support/linked_to_user=false
+privacy/collected_data/customer_support/used_for_tracking=false
+privacy/collected_data/customer_support/collection_purposes=0
+privacy/collected_data/other_user_content/collected=false
+privacy/collected_data/other_user_content/linked_to_user=false
+privacy/collected_data/other_user_content/used_for_tracking=false
+privacy/collected_data/other_user_content/collection_purposes=0
+privacy/collected_data/browsing_history/collected=false
+privacy/collected_data/browsing_history/linked_to_user=false
+privacy/collected_data/browsing_history/used_for_tracking=false
+privacy/collected_data/browsing_history/collection_purposes=0
+privacy/collected_data/search_hhistory/collected=false
+privacy/collected_data/search_hhistory/linked_to_user=false
+privacy/collected_data/search_hhistory/used_for_tracking=false
+privacy/collected_data/search_hhistory/collection_purposes=0
+privacy/collected_data/user_id/collected=false
+privacy/collected_data/user_id/linked_to_user=false
+privacy/collected_data/user_id/used_for_tracking=false
+privacy/collected_data/user_id/collection_purposes=0
+privacy/collected_data/device_id/collected=false
+privacy/collected_data/device_id/linked_to_user=false
+privacy/collected_data/device_id/used_for_tracking=false
+privacy/collected_data/device_id/collection_purposes=0
+privacy/collected_data/purchase_history/collected=false
+privacy/collected_data/purchase_history/linked_to_user=false
+privacy/collected_data/purchase_history/used_for_tracking=false
+privacy/collected_data/purchase_history/collection_purposes=0
+privacy/collected_data/product_interaction/collected=false
+privacy/collected_data/product_interaction/linked_to_user=false
+privacy/collected_data/product_interaction/used_for_tracking=false
+privacy/collected_data/product_interaction/collection_purposes=0
+privacy/collected_data/advertising_data/collected=false
+privacy/collected_data/advertising_data/linked_to_user=false
+privacy/collected_data/advertising_data/used_for_tracking=false
+privacy/collected_data/advertising_data/collection_purposes=0
+privacy/collected_data/other_usage_data/collected=false
+privacy/collected_data/other_usage_data/linked_to_user=false
+privacy/collected_data/other_usage_data/used_for_tracking=false
+privacy/collected_data/other_usage_data/collection_purposes=0
+privacy/collected_data/crash_data/collected=false
+privacy/collected_data/crash_data/linked_to_user=false
+privacy/collected_data/crash_data/used_for_tracking=false
+privacy/collected_data/crash_data/collection_purposes=0
+privacy/collected_data/performance_data/collected=false
+privacy/collected_data/performance_data/linked_to_user=false
+privacy/collected_data/performance_data/used_for_tracking=false
+privacy/collected_data/performance_data/collection_purposes=0
+privacy/collected_data/other_diagnostic_data/collected=false
+privacy/collected_data/other_diagnostic_data/linked_to_user=false
+privacy/collected_data/other_diagnostic_data/used_for_tracking=false
+privacy/collected_data/other_diagnostic_data/collection_purposes=0
+privacy/collected_data/environment_scanning/collected=false
+privacy/collected_data/environment_scanning/linked_to_user=false
+privacy/collected_data/environment_scanning/used_for_tracking=false
+privacy/collected_data/environment_scanning/collection_purposes=0
+privacy/collected_data/hands/collected=false
+privacy/collected_data/hands/linked_to_user=false
+privacy/collected_data/hands/used_for_tracking=false
+privacy/collected_data/hands/collection_purposes=0
+privacy/collected_data/head/collected=false
+privacy/collected_data/head/linked_to_user=false
+privacy/collected_data/head/used_for_tracking=false
+privacy/collected_data/head/collection_purposes=0
+privacy/collected_data/other_data_types/collected=false
+privacy/collected_data/other_data_types/linked_to_user=false
+privacy/collected_data/other_data_types/used_for_tracking=false
+privacy/collected_data/other_data_types/collection_purposes=0
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""

gdlintrc

@@ -0,0 +1,51 @@
+class-definitions-order:
+- tools
+- classnames
+- extends
+- docstrings
+- signals
+- enums
+- consts
+- staticvars
+- exports
+- pubvars
+- prvvars
+- onreadypubvars
+- onreadyprvvars
+- others
+class-load-variable-name: (([A-Z][a-z0-9]*)+|_?[a-z][a-z0-9]*(_[a-z0-9]+)*)
+class-name: ([A-Z][a-z0-9]*)+
+class-variable-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+comparison-with-itself: null
+constant-name: _?[A-Z][A-Z0-9]*(_[A-Z0-9]+)*
+disable:
+  - max-line-length
+  - max-public-methods
+  - max-returns
+  - max-file-lines
+duplicated-load: null
+enum-element-name: '[A-Z][A-Z0-9]*(_[A-Z0-9]+)*'
+enum-name: ([A-Z][a-z0-9]*)+
+excluded_directories: !!set
+  .git: null
+expression-not-assigned: null
+function-argument-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+function-arguments-number: 10
+function-name: (_on_([A-Z][a-z0-9]*)+(_[a-z0-9]+)*|_?[a-z][a-z0-9]*(_[a-z0-9]+)*)
+function-preload-variable-name: ([A-Z][a-z0-9]*)+
+function-variable-name: '[a-z][a-z0-9]*(_[a-z0-9]+)*'
+load-constant-name: (([A-Z][a-z0-9]*)+|_?[A-Z][A-Z0-9]*(_[A-Z0-9]+)*)
+loop-variable-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+max-file-lines: 1000
+max-line-length: 120
+max-public-methods: 20
+max-returns: 6
+mixed-tabs-and-spaces: null
+no-elif-return: null
+no-else-return: null
+signal-name: '[a-z][a-z0-9]*(_[a-z0-9]+)*'
+sub-class-name: _?([A-Z][a-z0-9]*)+
+tab-characters: 1
+trailing-whitespace: null
+unnecessary-pass: null
+unused-argument: null

gymkhana/characters/eneko/eneko_smoking.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=25 format=3 uid="uid://wx76bqug4qy8"]
+[gd_scene format=3 uid="uid://wx76bqug4qy8"]
 
 [ext_resource type="Resource" uid="uid://c4lhcwvjqx5ty" path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" id="1"]
 [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="2"]
-[ext_resource type="Texture2D" uid="uid://b5tiy166u24sb" path="res://gymkhana/characters/eneko/smoking_animation/smoking_speak_misc-Sheet.png" id="4_v5laa"]
-[ext_resource type="Texture2D" uid="uid://d3ovigeeolnsg" path="res://gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://vpdxu1e1vw6c" path="res://gymkhana/characters/eneko/smoking_animation/smoking_speak_misc-Sheet.png" id="4_v5laa"]
+[ext_resource type="Texture2D" uid="uid://b66ybtfii3282" path="res://gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png" id="7"]
 [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="19_maw5o"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_hasbv"]
@@ -150,7 +150,7 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="ESCPlayerWithTooltip2" type="Area2D"]
+[node name="ESCPlayerWithTooltip2" type="Area2D" unique_id=980632620]
 process_mode = 1
 script = ExtResource("2")
 selectable = true
@@ -159,7 +159,7 @@ global_id = "eneko_smoking"
 esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
 is_movable = true
 dialog_color = Color(0.584314, 0.490196, 0.270588, 1)
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 animations = ExtResource("1")
 custom_data = {
 "target_tooltips": {
@@ -177,17 +177,17 @@ custom_data = {
 }
 animations = ExtResource("1")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=272155972]
 position = Vector2(32.625, -50.56)
 scale = Vector2(0.8, 0.8)
 sprite_frames = SubResource("1")
 animation = &"they_live"
 flip_h = true
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=570587227]
 polygon = PackedVector2Array(-5, 6, -4, 22, -7, 32, -10, 39, -6, 43, 7, 43, 12, 35, 14, 25, 12, 12, 10, -25, 31, -38, 32, 37, 48, 37, 49, 28, 46, 22, 50, -1, 51, -35, 57, -39, 57, -72, 58, -74, 70, -68, 76, -69, 79, -76, 78, -81, 72, -89, 67, -104, 56, -114, 47, -115, 45, -120, 46, -140, 38, -145, 34, -146, 28, -144, 24, -139, 22, -129, 24, -122, 23, -119, 17, -114, 5, -109, -7, -80, -7, -62, 4, -58, 5, -53, -7, -34)
 
-[node name="ESCDialogLocation" type="Marker2D" parent="."]
+[node name="ESCDialogLocation" type="Marker2D" parent="." unique_id=1656254012]
 position = Vector2(35, -270)
 script = ExtResource("19_maw5o")
 metadata/_custom_type_script = "uid://85bledusisk1"

gymkhana/characters/eneko/eneko_smoking_animatios.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://c4lhcwvjqx5ty"]
+[gd_resource type="Resource" script_class="ESCAnimationResource" format=3 uid="uid://c4lhcwvjqx5ty"]
 
 [ext_resource type="Script" uid="uid://sksvt0n8gle2" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
 [ext_resource type="Script" uid="uid://bxc3dll30x8tl" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
@@ -18,7 +18,7 @@ animation = "speak"
 
 [resource]
 script = ExtResource("1")
-dir_angles = [SubResource("1")]
-directions = [SubResource("2")]
-idles = [SubResource("2")]
-speaks = [SubResource("3")]
+dir_angles = Array[ExtResource("2")]([SubResource("1")])
+directions = Array[ExtResource("3")]([SubResource("2")])
+idles = Array[ExtResource("3")]([SubResource("2")])
+speaks = Array[ExtResource("3")]([SubResource("3")])

gymkhana/characters/oier/oier.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=31 format=3 uid="uid://cjmsexhyhi4vs"]
+[gd_scene format=3 uid="uid://cjmsexhyhi4vs"]
 
 [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="1"]
 [ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"]
-[ext_resource type="Texture2D" uid="uid://hbgs4s08lvq3" path="res://gymkhana/characters/oier/oier-animations-Sheet-17f.png" id="3_10x32"]
-[ext_resource type="Texture2D" uid="uid://l08nca0o3u5k" path="res://gymkhana/characters/oier/oier-animations-talks-Sheet-8f.png" id="4_b64d8"]
+[ext_resource type="Texture2D" uid="uid://cord3l4f2cado" path="res://gymkhana/characters/oier/oier-animations-Sheet-17f.png" id="3_10x32"]
+[ext_resource type="Texture2D" uid="uid://dhqnjxo4jur1a" path="res://gymkhana/characters/oier/oier-animations-talks-Sheet-8f.png" id="4_b64d8"]
 [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="5_10x32"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_c4eys"]
@@ -234,7 +234,7 @@ animations = [{
 radius = 53.0
 height = 208.0
 
-[node name="ESCPlayerWithTooltip" type="Area2D"]
+[node name="ESCPlayerWithTooltip" type="Area2D" unique_id=1176527755]
 process_mode = 1
 position = Vector2(-5, 0)
 script = ExtResource("1")
@@ -243,22 +243,22 @@ esc_script = "res://gymkhana/characters/oier/oier.esc"
 is_movable = true
 dialog_color = Color(0.321569, 0.662745, 0.301961, 1)
 default_action = "action1"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_interactive = false
 animations = ExtResource("3")
 animations = ExtResource("3")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=627189828]
 position = Vector2(0, -155)
 scale = Vector2(0.389246, 0.389247)
 sprite_frames = SubResource("20")
 animation = &"idle_down"
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=718097506]
 position = Vector2(5, -151)
 shape = SubResource("21")
 
-[node name="ESCDialogLocation" type="Marker2D" parent="."]
+[node name="ESCDialogLocation" type="Marker2D" parent="." unique_id=505698658]
 position = Vector2(1, -452)
 script = ExtResource("5_10x32")
 metadata/_custom_type_script = "uid://85bledusisk1"

gymkhana/characters/oier/oier_animations.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=36 format=3 uid="uid://cyjo7aq0e4hbe"]
+[gd_resource type="Resource" script_class="ESCAnimationResource" format=3 uid="uid://cyjo7aq0e4hbe"]
 
 [ext_resource type="Script" uid="uid://sksvt0n8gle2" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
 [ext_resource type="Script" uid="uid://bxc3dll30x8tl" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
@@ -145,7 +145,7 @@ animation = "idle_up"
 
 [resource]
 script = ExtResource("1")
-dir_angles = [SubResource("1"), SubResource("2"), SubResource("3"), SubResource("4"), SubResource("5"), SubResource("6"), SubResource("7"), SubResource("8")]
-directions = [SubResource("9"), SubResource("10"), SubResource("11"), SubResource("12"), SubResource("13"), SubResource("14"), SubResource("15"), SubResource("16")]
-idles = [SubResource("17"), SubResource("18"), SubResource("19"), SubResource("20"), SubResource("21"), SubResource("22"), SubResource("23"), SubResource("24")]
-speaks = [SubResource("25"), SubResource("26"), SubResource("27"), SubResource("28"), SubResource("29"), SubResource("30"), SubResource("31"), SubResource("32")]
+dir_angles = Array[ExtResource("2")]([SubResource("1"), SubResource("2"), SubResource("3"), SubResource("4"), SubResource("5"), SubResource("6"), SubResource("7"), SubResource("8")])
+directions = Array[ExtResource("3")]([SubResource("9"), SubResource("10"), SubResource("11"), SubResource("12"), SubResource("13"), SubResource("14"), SubResource("15"), SubResource("16")])
+idles = Array[ExtResource("3")]([SubResource("17"), SubResource("18"), SubResource("19"), SubResource("20"), SubResource("21"), SubResource("22"), SubResource("23"), SubResource("24")])
+speaks = Array[ExtResource("3")]([SubResource("25"), SubResource("26"), SubResource("27"), SubResource("28"), SubResource("29"), SubResource("30"), SubResource("31"), SubResource("32")])

gymkhana/items/turno_cocina_ajo.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=3 format=3 uid="uid://84h4l81cuwdv"]
+[gd_scene format=3 uid="uid://84h4l81cuwdv"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://cueb8gkqhbads" path="res://gymkhana/items/assets/turno_cocina_ajo.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://h10gbl56mvgm" path="res://gymkhana/items/assets/turno_cocina_ajo.png" id="2"]
 
-[node name="turno_cocina_ajo" type="Area2D"]
+[node name="turno_cocina_ajo" type="Area2D" unique_id=130430618]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_ajo"
 esc_script = "res://gymkhana/items/turno_cocina_ajo.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -20,9 +20,9 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1825870502]
 scale = Vector2(0.101548, 0.101548)
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=901811806]
 polygon = PackedVector2Array(-7, -6, 7, -6, 7, 6, -7, 6)

gymkhana/items/turno_cocina_bol.tscn

@@ -1,16 +1,16 @@
-[gd_scene load_steps=3 format=3 uid="uid://cpeqaymxabewi"]
+[gd_scene format=3 uid="uid://cpeqaymxabewi"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://nktfki1vvj7h" path="res://gymkhana/items/assets/turno_cocina_bol_inventario.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://cimlusyuhaymy" path="res://gymkhana/items/assets/turno_cocina_bol_inventario.png" id="2"]
 
-[node name="turno_cocina_bol" type="Area2D"]
+[node name="turno_cocina_bol" type="Area2D" unique_id=320318253]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_bol"
-interaction_angle = 270
 esc_script = "res://gymkhana/items/turno_cocina_bol.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
+interaction_angle = 270
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {

gymkhana/items/turno_cocina_bol_lentejas.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://b05fu1g1rlt0o"]
+[gd_scene format=3 uid="uid://b05fu1g1rlt0o"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://bq46ru3fgwkbi" path="res://gymkhana/items/assets/turno_cocina_bol_lentejas.png" id="2"]
@@ -7,12 +7,12 @@
 [sub_resource type="RectangleShape2D" id="1"]
 size = Vector2(45, 25)
 
-[node name="turno_cocina_bol_lentejas" type="Area2D"]
+[node name="turno_cocina_bol_lentejas" type="Area2D" unique_id=1542336401]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_bol_lentejas"
 esc_script = "res://gymkhana/items/turno_cocina_bol_lentejas.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -22,15 +22,15 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1019638787]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1156397303]
 position = Vector2(-1.5, -0.5)
 shape = SubResource("1")
 
-[node name="ESCLocation" type="Marker2D" parent="."]
+[node name="ESCLocation" type="Marker2D" parent="." unique_id=1263716279]
 position = Vector2(-51, 69)
 script = ExtResource("3")

gymkhana/items/turno_cocina_carton.tscn

@@ -1,35 +1,35 @@
-[gd_scene load_steps=4 format=3 uid="uid://dyejne0ibag68"]
+[gd_scene format=3 uid="uid://dyejne0ibag68"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://b1tkxje3qhmgq" path="res://gymkhana/items/assets/turno_cocina_carton.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://btuoafmqvytpw" path="res://gymkhana/items/assets/turno_cocina_carton_inventario.png" id="3"]
 
-[node name="turno_cocina_carton" type="Area2D"]
+[node name="turno_cocina_carton" type="Area2D" unique_id=1525245254]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_carton"
-interaction_angle = 90
 esc_script = "res://gymkhana/items/turno_cocina_carton.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
+interaction_angle = 90
 inventory_texture = ExtResource("3")
 inventory_texture_hovered = ExtResource("3")
 custom_data = {
+"target_tooltips": {
+"action3": {
+"turno_cocina_mechero": "tooltip_turno_cocina_carton_action3_turno_cocina_mechero"
+}
+},
 "tooltips": {
 "action1": "tooltip_common_look",
 "action2": "tooltip_common_pick",
 "action3": "tooltip_common_look",
 "action4": "tooltip_common_use"
-},
-"target_tooltips": {
-"action3" : {
-"turno_cocina_mechero": "tooltip_turno_cocina_carton_action3_turno_cocina_mechero"
-}
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=110897651]
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=1554871376]
 polygon = PackedVector2Array(-23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17)

gymkhana/items/turno_cocina_carton_encendido.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=3 format=3 uid="uid://6xkiwvpg2xb"]
+[gd_scene format=3 uid="uid://6xkiwvpg2xb"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://bhrsef7b6tlql" path="res://gymkhana/items/assets/turno_cocina_carton_encendido.png" id="2"]
 
-[node name="turno_cocina_carton_encendido" type="Area2D"]
+[node name="turno_cocina_carton_encendido" type="Area2D" unique_id=771948570]
 process_mode = 1
 rotation = 1.11177
 script = ExtResource("1")
 global_id = "turno_cocina_carton_encendido"
 esc_script = "res://gymkhana/items/turno_cocina_carton_encendido.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -19,10 +19,10 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=616744290]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=2027602002]
 polygon = PackedVector2Array(-13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12)

gymkhana/items/turno_cocina_cuchillo.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=3 format=3 uid="uid://2xsjq7rgjcl"]
+[gd_scene format=3 uid="uid://2xsjq7rgjcl"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://dl1up18eayld2" path="res://gymkhana/items/assets/turno_cocina_cuchillo.png" id="2"]
 
-[node name="turno_cocina_cuchillo" type="Area2D"]
+[node name="turno_cocina_cuchillo" type="Area2D" unique_id=1321636963]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_cuchillo"
 esc_script = "res://gymkhana/items/turno_cocina_cuchillo.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {

gymkhana/items/turno_cocina_cuerno.tscn

@@ -1,17 +1,17 @@
-[gd_scene load_steps=4 format=3 uid="uid://igj2f3midaad"]
+[gd_scene format=3 uid="uid://igj2f3midaad"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://chaasyiqk1kts" path="res://gymkhana/items/assets/turno_cocina_cuerno.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://bq0ujnuqii7c1" path="res://gymkhana/items/assets/turno_cocina_cuerno_inventario.png" id="3"]
 
-[node name="turno_cocina_cuerno" type="Area2D"]
+[node name="turno_cocina_cuerno" type="Area2D" unique_id=1991265464]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_cuerno"
-interaction_angle = 90
 esc_script = "res://gymkhana/items/turno_cocina_cuerno.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
+interaction_angle = 90
 inventory_texture = ExtResource("3")
 inventory_texture_hovered = ExtResource("3")
 custom_data = {
@@ -23,9 +23,9 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1787318922]
 position = Vector2(8.125, -8.125)
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=1614770480]
 polygon = PackedVector2Array(-11, -22, -11, -32, -10, -42, -7, -46, 0, -49, 3, -49, 9, -48, 13, -43, 12, -33, 7, -24, 5, -13, 5, -4, 7, 4, 11, 13, 16, 19, 23, 24, 28, 27, 27, 32, 24, 33, 18, 32, 11, 28, 3, 22, -3, 15, -8, 5, -10, -4, -11, -15)

gymkhana/items/turno_cocina_frontal.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://bxwikger8m82p"]
+[gd_scene format=3 uid="uid://bxwikger8m82p"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://kurhc3jflkha" path="res://gymkhana/items/assets/turno_cocina_frontal.png" id="2"]
@@ -7,12 +7,12 @@
 [sub_resource type="RectangleShape2D" id="1"]
 size = Vector2(45, 25)
 
-[node name="turno_cocina_frontal" type="Area2D"]
+[node name="turno_cocina_frontal" type="Area2D" unique_id=1980057617]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_frontal"
 esc_script = "res://gymkhana/items/turno_cocina_frontal.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -22,15 +22,15 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1709320359]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=456855465]
 position = Vector2(-1.5, -0.5)
 shape = SubResource("1")
 
-[node name="ESCLocation" type="Marker2D" parent="."]
+[node name="ESCLocation" type="Marker2D" parent="." unique_id=81489409]
 position = Vector2(-51, 69)
 script = ExtResource("3")

gymkhana/items/turno_cocina_libro_de_cocina.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=3 format=3 uid="uid://bnf0ylqtnajms"]
+[gd_scene format=3 uid="uid://bnf0ylqtnajms"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://bru8nsre4hcyk" path="res://gymkhana/items/assets/turno_cocina_libro_de_cocina.png" id="2"]
 
-[node name="turno_cocina_libro_de_cocina" type="Area2D"]
+[node name="turno_cocina_libro_de_cocina" type="Area2D" unique_id=734664992]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_libro_de_cocina"
 esc_script = "res://gymkhana/items/turno_cocina_libro_de_cocina.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {

gymkhana/items/turno_cocina_madera.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=3 format=3 uid="uid://cbsyjat8xvwfx"]
+[gd_scene format=3 uid="uid://cbsyjat8xvwfx"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://dctxp6dviho3m" path="res://gymkhana/items/assets/turno_cocina_madera.png" id="2"]
 
-[node name="turno_cocina_madera" type="Area2D"]
+[node name="turno_cocina_madera" type="Area2D" unique_id=1321539605]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_madera"
 esc_script = "res://gymkhana/items/turno_cocina_madera.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {

gymkhana/items/turno_cocina_mechero.tscn

@@ -1,16 +1,16 @@
-[gd_scene load_steps=3 format=3 uid="uid://bxjtxquhseqdp"]
+[gd_scene format=3 uid="uid://bxjtxquhseqdp"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://kktjxrw5lpwm" path="res://gymkhana/items/assets/turno_cocina_mechero.png" id="2"]
 
-[node name="turno_cocina_mechero" type="Area2D"]
+[node name="turno_cocina_mechero" type="Area2D" unique_id=2086312918]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_mechero"
-interaction_angle = 270
 esc_script = "res://gymkhana/items/turno_cocina_mechero.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
+interaction_angle = 270
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -22,10 +22,10 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=681389545]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=431154856]
 polygon = PackedVector2Array(-15, -29, 3, -33, 10, 30, -3, 32)

gymkhana/items/turno_cocina_olla_llena.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://d1ust40cvfjtw"]
+[gd_scene format=3 uid="uid://d1ust40cvfjtw"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://cr0uwu64o57f4" path="res://gymkhana/items/assets/turno_cocina_olla_inv_con_agua.png" id="2"]
@@ -7,46 +7,46 @@
 [ext_resource type="Script" uid="uid://con0lpnpm1118" path="res://gymkhana/items/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" id="5"]
 [ext_resource type="Script" uid="uid://db4ghc5f2fhb2" path="res://addons/escoria-ui-return-monkey-island/item_components/esc_item_component_global_observer.gd" id="6_fo2yn"]
 
-[node name="turno_cocina_olla_llena" type="Area2D"]
+[node name="turno_cocina_olla_llena" type="Area2D" unique_id=733803965]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_olla_llena"
 esc_script = "res://gymkhana/items/turno_cocina_olla_llena.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
-"tooltips": {
-"action1": "tooltip_common_look_inside",
-"action2": "tooltip_olla_llena_action2",
-"action3": "tooltip_common_look",
-"action4": "tooltip_common_use"
-},
 "target_tooltips": {
-"action3" : {
+"action3": {
 "turno_cocina_ajo": "tooltip_turno_cocina_olla_llena_action3_drop_in",
 "turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_llena_action3_drop_in",
 "turno_cocina_madera": "tooltip_turno_cocina_olla_llena_action3_turno_cocina_madera",
 "turno_cocina_patata": "tooltip_turno_cocina_olla_llena_action3_drop_in",
 "turno_cocina_romero": "tooltip_turno_cocina_olla_llena_action3_drop_in"
 }
+},
+"tooltips": {
+"action1": "tooltip_common_look_inside",
+"action2": "tooltip_olla_llena_action2",
+"action3": "tooltip_common_look",
+"action4": "tooltip_common_use"
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=140449509]
 texture = ExtResource("3")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=1347015208]
 polygon = PackedVector2Array(-59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54)
 
-[node name="SmokeParticles" parent="." instance=ExtResource("4")]
+[node name="SmokeParticles" parent="." unique_id=713519402 instance=ExtResource("4")]
 script = ExtResource("5")
 
-[node name="ESCItemComponentGlobalBooleanObserverVisible" type="Node" parent="."]
+[node name="ESCItemComponentGlobalBooleanObserverVisible" type="Node" parent="." unique_id=953129974]
 script = ExtResource("6_fo2yn")
 targeted_global_variable = "turno_cocina_economica_con_olla"
 targeted_property = 1
 
-[node name="ESCItemComponentGlobalBooleanObserverActive" type="Node" parent="."]
+[node name="ESCItemComponentGlobalBooleanObserverActive" type="Node" parent="." unique_id=374952645]
 script = ExtResource("6_fo2yn")
 targeted_global_variable = "turno_cocina_economica_con_olla"

gymkhana/items/turno_cocina_olla_vacia.tscn

@@ -1,37 +1,37 @@
-[gd_scene load_steps=4 format=3 uid="uid://dgucic2086suo"]
+[gd_scene format=3 uid="uid://dgucic2086suo"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://3hyhyeq3t3wp" path="res://gymkhana/items/assets/turno_cocina_olla_inv_vacia.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://4rdcph1cuu8y" path="res://gymkhana/items/assets/turno_cocina_olla.png" id="3"]
 
-[node name="turno_cocina_olla_vacia" type="Area2D"]
+[node name="turno_cocina_olla_vacia" type="Area2D" unique_id=166519416]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_olla_vacia"
 esc_script = "res://gymkhana/items/turno_cocina_olla_vacia.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
-"tooltips": {
-"action1": "tooltip_common_look",
-"action2": "tooltip_common_pick",
-"action3": "tooltip_common_look",
-"action4": "tooltip_common_use"
-},
 "target_tooltips": {
-"action3" : {
+"action3": {
 "turno_cocina_ajo": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
 "turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
 "turno_cocina_patata": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
 "turno_cocina_romero": "tooltip_turno_cocina_olla_vacia_action3_drop_in"
 }
+},
+"tooltips": {
+"action1": "tooltip_common_look",
+"action2": "tooltip_common_pick",
+"action3": "tooltip_common_look",
+"action4": "tooltip_common_use"
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1213357852]
 texture = ExtResource("3")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=2095055703]
 polygon = PackedVector2Array(-59, 41, -59, -44, -63, -48, -62, -52, -59, -54, -49, -58, -34, -60, -16, -62, 1, -61, 21, -60, 44, -57, 57, -53, 61, -47, 58, -41, 56, -29, 62, -29, 64, -27, 58, -25, 56, -21, 53, 33, 50, 44, 44, 52, 33, 55, 12, 59, -12, 59, -40, 56, -54, 50)

gymkhana/items/turno_cocina_patata.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://d3kv08rpj3upm"]
+[gd_scene format=3 uid="uid://d3kv08rpj3upm"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://brspvt17l2bsg" path="res://gymkhana/items/assets/turno_cocina_patata.png" id="2"]
@@ -7,14 +7,14 @@
 [sub_resource type="RectangleShape2D" id="1"]
 size = Vector2(45, 25)
 
-[node name="turno_cocina_patata" type="Area2D"]
+[node name="turno_cocina_patata" type="Area2D" unique_id=97260732]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_patata"
 esc_script = "res://gymkhana/items/turno_cocina_patata.esc"
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
-combine_when_selected_action_is_in = PackedStringArray("action4")
 custom_data = {
 "count_textures": [{
 "start": 1,
@@ -29,29 +29,29 @@ custom_data = {
 "start": 4,
 "texture": "res://gymkhana/items/assets/turno_cocina_cuatro_patatas.png"
 }],
-"tooltips": {
-"action3": "tooltip_turno_cocina_patata_action3",
-"action4": "tooltip_common_use"
-},
 "target_tooltips": {
-"action3" : {
+"action3": {
 "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_action3_turno_cocina_cuchillo"
 },
 "action4": {
 "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_action4_turno_cocina_cuchillo"
 }
+},
+"tooltips": {
+"action3": "tooltip_turno_cocina_patata_action3",
+"action4": "tooltip_common_use"
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1905995317]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=146814208]
 position = Vector2(-1.5, -0.5)
 shape = SubResource("1")
 
-[node name="ESCLocation" type="Marker2D" parent="."]
+[node name="ESCLocation" type="Marker2D" parent="." unique_id=1388076134]
 position = Vector2(-51, 69)
 script = ExtResource("3")

gymkhana/items/turno_cocina_patata_grande.tscn

@@ -1,30 +1,30 @@
-[gd_scene load_steps=3 format=3 uid="uid://b3owsy6kidijt"]
+[gd_scene format=3 uid="uid://b3owsy6kidijt"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://cqynnnrnmqura" path="res://gymkhana/items/assets/turno_cocina_patata_grande.png" id="2"]
 
-[node name="turno_cocina_patata_grande" type="Area2D"]
+[node name="turno_cocina_patata_grande" type="Area2D" unique_id=446276515]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = null
 global_id = "turno_cocina_patata_grande"
 esc_script = "res://gymkhana/items/turno_cocina_patata_grande.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
-"tooltips": {
-"action1": "tooltip_common_look",
-"action2": "tooltip_turno_cocina_patata_grande_action2",
-"action3": "tooltip_common_look",
-"action4": "tooltip_common_use"
-},
 "target_tooltips": {
-"action3" : {
+"action3": {
 "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_grande_action3_turno_cocina_cuchillo"
 },
 "action4": {
 "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_grande_action4_turno_cocina_cuchillo"
 }
+},
+"tooltips": {
+"action1": "tooltip_common_look",
+"action2": "tooltip_turno_cocina_patata_grande_action2",
+"action3": "tooltip_common_look",
+"action4": "tooltip_common_use"
 }
 }

gymkhana/items/turno_cocina_pegatina.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=3 format=3 uid="uid://b5vlbiy057rdr"]
+[gd_scene format=3 uid="uid://b5vlbiy057rdr"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://djh4t3gqa673a" path="res://gymkhana/items/assets/turno_cocina_pegatina.png" id="2"]
 
-[node name="turno_cocina_pegatina" type="Area2D"]
+[node name="turno_cocina_pegatina" type="Area2D" unique_id=1767726467]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_pegatina"
 esc_script = "res://gymkhana/items/turno_cocina_pegatina.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -17,10 +17,10 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=929095992]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="." unique_id=1641473566]
 polygon = PackedVector2Array(-15, -29, 3, -33, 10, 30, -3, 32)

gymkhana/items/turno_cocina_peso.tscn

@@ -1,33 +1,33 @@
-[gd_scene load_steps=4 format=3 uid="uid://cwlq5pqwktbul"]
+[gd_scene format=3 uid="uid://cwlq5pqwktbul"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://w0rtwecb3qgi" path="res://gymkhana/items/assets/turno_cocina_peso.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://dxq5ki4r48l50" path="res://gymkhana/items/assets/turno_cocina_peso_inventario.png" id="3"]
 
-[node name="turno_cocina_peso" type="Area2D"]
+[node name="turno_cocina_peso" type="Area2D" unique_id=176092335]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_peso"
 esc_script = "res://gymkhana/items/turno_cocina_peso.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("3")
 inventory_texture_hovered = ExtResource("3")
 custom_data = {
+"target_tooltips": {
+"action3": {
+"turno_cocina_bol": "tooltip_cocina_peso_action3_bol"
+}
+},
 "tooltips": {
 "action1": "tooltip_common_whats_this",
 "action2": "tooltip_common_pick",
 "action3": "tooltip_common_look",
 "action4": "tooltip_common_use"
-},
-"target_tooltips": {
-"action3" : {
-"turno_cocina_bol": "tooltip_cocina_peso_action3_bol"
-}
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=699585405]
 rotation = -0.0698132
 scale = Vector2(0.18, 0.18)
 texture = ExtResource("2")

gymkhana/items/turno_cocina_peso_bol.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://dw8gujjmgq7g2"]
+[gd_scene format=3 uid="uid://dw8gujjmgq7g2"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://s5qx8djxqeb8" path="res://gymkhana/items/assets/turno_cocina_peso_bol.png" id="2"]
@@ -7,12 +7,12 @@
 [sub_resource type="RectangleShape2D" id="1"]
 size = Vector2(45, 25)
 
-[node name="turno_cocina_peso_bol" type="Area2D"]
+[node name="turno_cocina_peso_bol" type="Area2D" unique_id=999516529]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_peso_bol"
 esc_script = "res://gymkhana/items/turno_cocina_peso_bol.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -24,15 +24,15 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=980379354]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=668399042]
 position = Vector2(-1.5, -0.5)
 shape = SubResource("1")
 
-[node name="ESCLocation" type="Marker2D" parent="."]
+[node name="ESCLocation" type="Marker2D" parent="." unique_id=2018286262]
 position = Vector2(-51, 69)
 script = ExtResource("3")

gymkhana/items/turno_cocina_peso_usado.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=4 format=3 uid="uid://e12h06462p6d"]
+[gd_scene format=3 uid="uid://e12h06462p6d"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://w0rtwecb3qgi" path="res://gymkhana/items/assets/turno_cocina_peso.png" id="2"]
 [ext_resource type="Texture2D" uid="uid://dxq5ki4r48l50" path="res://gymkhana/items/assets/turno_cocina_peso_inventario.png" id="3"]
 
-[node name="turno_cocina_peso_usado" type="Area2D"]
+[node name="turno_cocina_peso_usado" type="Area2D" unique_id=1404437432]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_peso_usado"
 esc_script = "res://gymkhana/items/turno_cocina_peso_usado.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("3")
 inventory_texture_hovered = ExtResource("3")
 custom_data = {
@@ -18,7 +18,7 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1152175703]
 rotation = -0.0698132
 scale = Vector2(0.18, 0.18)
 texture = ExtResource("2")

gymkhana/items/turno_cocina_romero.tscn

@@ -1,28 +1,28 @@
-[gd_scene load_steps=3 format=3 uid="uid://bu2xpoyifwi5o"]
+[gd_scene format=3 uid="uid://bu2xpoyifwi5o"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
 [ext_resource type="Texture2D" uid="uid://7j1dk8q1ltpg" path="res://gymkhana/items/assets/turno_cocina_romero.png" id="2"]
 
-[node name="turno_cocina_romero" type="Area2D"]
+[node name="turno_cocina_romero" type="Area2D" unique_id=1512663836]
 process_mode = 1
 script = ExtResource("1")
 with_is_picked_component = true
 global_id = "turno_cocina_romero"
-interaction_angle = 270
 esc_script = "res://gymkhana/items/turno_cocina_romero.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
+interaction_angle = 270
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
+"target_tooltips": {
+"action3": {
+"turno_cocina_libro_de_cocina": "tooltip_turno_cocina_romero_action3_turno_cocina_libro_de_cocina"
+}
+},
 "tooltips": {
 "action1": "tooltip_common_look",
 "action2": "tooltip_common_pick",
 "action3": "tooltip_common_whats_this",
 "action4": "tooltip_common_use"
-},
-"target_tooltips": {
-"action3" : {
-"turno_cocina_libro_de_cocina": "tooltip_turno_cocina_romero_action3_turno_cocina_libro_de_cocina"
-}
 }
 }

gymkhana/particles/SmokeParticles.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://d7l30s558mvd"]
+[gd_scene format=3 uid="uid://d7l30s558mvd"]
 
-[ext_resource type="Texture2D" uid="uid://bja20nt6evojq" path="res://gymkhana/particles/assets/smoke.png" id="1"]
+[ext_resource type="Texture2D" uid="uid://cet25u2g3e6lr" path="res://gymkhana/particles/assets/smoke.png" id="1"]
 
 [sub_resource type="Curve" id="1"]
 _limits = [-360.0, 360.0, 0.0, 1.0]
@@ -10,7 +10,7 @@ point_count = 2
 [sub_resource type="Gradient" id="2"]
 colors = PackedColorArray(0.8125, 0.8125, 0.8125, 1, 0.917647, 0.917647, 0.917647, 0)
 
-[node name="SmokeParticles" type="CPUParticles2D"]
+[node name="SmokeParticles" type="CPUParticles2D" unique_id=947114520]
 position = Vector2(-2, -63)
 scale = Vector2(1.48, 1)
 amount = 20

gymkhana/rooms/intro/intro_room.tscn

@@ -1,12 +1,12 @@
-[gd_scene load_steps=18 format=3 uid="uid://bhbg8bu70suwo"]
+[gd_scene format=3 uid="uid://bhbg8bu70suwo"]
 
 [ext_resource type="Script" uid="uid://fnwnfflaoeqp" path="res://addons/escoria-core/game/core-scripts/esc_background.gd" id="1"]
 [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="2"]
 [ext_resource type="Script" uid="uid://dshelmw7y44qg" path="res://addons/escoria-core/game/core-scripts/esc_item.gd" id="3"]
-[ext_resource type="Texture2D" uid="uid://di2xpkabsygn1" path="res://gymkhana/rooms/intro/escoria_background.png" id="4"]
-[ext_resource type="Texture2D" uid="uid://p6qcs64seg82" path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" id="5"]
-[ext_resource type="Texture2D" uid="uid://bkwwtjpsr0dkt" path="res://gymkhana/rooms/intro/escoria-logo-comet.png" id="6"]
-[ext_resource type="Texture2D" uid="uid://dvt4rdq1jiq4q" path="res://gymkhana/rooms/intro/intro_background_space.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://cxr21ova25hh7" path="res://gymkhana/rooms/intro/escoria_background.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://dbdypikn438jh" path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" id="5"]
+[ext_resource type="Texture2D" uid="uid://cn213uhfq5kgm" path="res://gymkhana/rooms/intro/escoria-logo-comet.png" id="6"]
+[ext_resource type="Texture2D" uid="uid://cdp8vrjndg03n" path="res://gymkhana/rooms/intro/intro_background_space.png" id="7"]
 
 [sub_resource type="AtlasTexture" id="1"]
 atlas = ExtResource("5")
@@ -250,13 +250,13 @@ _data = {
 &"intro": SubResource("9")
 }
 
-[node name="ESCRoom" type="Node2D"]
+[node name="ESCRoom" type="Node2D" unique_id=2056990541]
 script = ExtResource("2")
 global_id = "intro_cutscene"
 esc_script = "res://gymkhana/rooms/intro/esc/intro.esc"
 camera_limits = [Rect2(0, 0, 1920, 1080)]
 
-[node name="ESCBackground" type="TextureRect" parent="."]
+[node name="escbackground" type="TextureRect" parent="." unique_id=2143603740]
 offset_right = 1279.0
 offset_bottom = 900.0
 mouse_filter = 2
@@ -265,34 +265,32 @@ expand_mode = 1
 stretch_mode = 1
 script = ExtResource("1")
 
-[node name="IntroBackgroundSpace" type="Sprite2D" parent="."]
+[node name="IntroBackgroundSpace" type="Sprite2D" parent="." unique_id=332684209]
 position = Vector2(641, 451)
 texture = ExtResource("7")
 
-[node name="animated_asteroid" type="AnimatedSprite2D" parent="."]
+[node name="animated_asteroid" type="AnimatedSprite2D" parent="." unique_id=386050383]
 visible = false
 position = Vector2(630, 471)
 sprite_frames = SubResource("7")
 
-[node name="Polygon2D" type="Polygon2D" parent="."]
+[node name="Polygon2D" type="Polygon2D" parent="." unique_id=26456091]
 modulate = Color(1, 1, 1, 0)
 position = Vector2(0, 2)
 polygon = PackedVector2Array(0, 0, 1280, 0, 1280, 900, 0, 900)
 
-[node name="asteroid" type="Sprite2D" parent="."]
+[node name="asteroid" type="Sprite2D" parent="." unique_id=952927644]
 visible = false
 modulate = Color(1, 1, 1, 0)
 position = Vector2(620, 450)
 texture = ExtResource("6")
 
-[node name="ESCItem" type="Area2D" parent="."]
+[node name="ESCItem" type="Area2D" parent="." unique_id=1693776767]
 process_mode = 1
 script = ExtResource("3")
 global_id = "intro_animation_player"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="ESCItem"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="ESCItem" unique_id=81588380]
 root_node = NodePath("../..")
-libraries = {
-&"": SubResource("AnimationLibrary_3ht78")
-}
+libraries/ = SubResource("AnimationLibrary_3ht78")

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -1,24 +1,24 @@
-[gd_scene load_steps=29 format=3 uid="uid://dowbdjo7ka0sq"]
+[gd_scene 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"]
-[ext_resource type="Texture2D" uid="uid://ckdiqb7cmmaqb" path="res://gymkhana/rooms/turno_cocina/cocina/assets/cocina_interior_vista_completa.jpg" id="3_ccj1t"]
+[ext_resource type="Texture2D" uid="uid://c8ytapkbj5t4p" path="res://gymkhana/rooms/turno_cocina/cocina/assets/cocina_interior_vista_completa.jpg" id="3_ccj1t"]
 [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="Texture2D" uid="uid://crhfjda62540d" path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" id="7"]
-[ext_resource type="Texture2D" uid="uid://bss0jcop7w5cx" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" id="8"]
-[ext_resource type="Texture2D" uid="uid://bna12h746ucar" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"]
+[ext_resource type="Texture2D" uid="uid://dttk4c54c6ufs" path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://nlrnictas0eu" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://doeo7lnf3t1qd" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"]
 [ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/turno_cocina_peso.tscn" id="10"]
 [ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/turno_cocina_bol.tscn" id="11"]
 [ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/turno_cocina_olla_llena.tscn" id="12"]
-[ext_resource type="Texture2D" uid="uid://djkmw4bj8siok" path="res://gymkhana/items/assets/turno_cocina_patata.png" id="13"]
+[ext_resource type="Texture2D" uid="uid://brspvt17l2bsg" path="res://gymkhana/items/assets/turno_cocina_patata.png" id="13"]
 [ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/turno_cocina_libro_de_cocina.tscn" id="14"]
-[ext_resource type="Texture2D" uid="uid://chy7hyrqi6imp" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"]
+[ext_resource type="Texture2D" uid="uid://bmjkqon8l3ugn" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"]
 [ext_resource type="Script" uid="uid://db4ghc5f2fhb2" path="res://addons/escoria-ui-return-monkey-island/item_components/esc_item_component_global_observer.gd" id="15_fji2i"]
-[ext_resource type="Texture2D" uid="uid://bebo52w582216" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" id="16"]
-[ext_resource type="Texture2D" uid="uid://c13mgcko6vbd0" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" id="17"]
-[ext_resource type="Texture2D" uid="uid://da2sep4pylffj" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" id="18"]
+[ext_resource type="Texture2D" uid="uid://bud3vtpxlqgms" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" id="16"]
+[ext_resource type="Texture2D" uid="uid://cf252frb2554e" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" id="17"]
+[ext_resource type="Texture2D" uid="uid://kxa0xlct63wu" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" id="18"]
 [ext_resource type="PackedScene" uid="uid://d7l30s558mvd" path="res://gymkhana/particles/SmokeParticles.tscn" id="19"]
 [ext_resource type="PackedScene" uid="uid://igj2f3midaad" path="res://gymkhana/items/turno_cocina_cuerno.tscn" id="20"]
 [ext_resource type="Script" uid="uid://uadel3g82io" path="res://gymkhana/items/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" id="21"]
@@ -57,7 +57,7 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="ESCRoom" type="Node2D"]
+[node name="ESCRoom" type="Node2D" unique_id=1772983912]
 script = ExtResource("1")
 global_id = "cocina"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc"
@@ -65,12 +65,12 @@ player_scene = ExtResource("2")
 camera_limits = [Rect2(0, 0, 2925, 720)]
 editor_debug_mode = 1
 
-[node name="background" type="Sprite2D" parent="."]
+[node name="background" type="Sprite2D" parent="." unique_id=1677709909]
 position = Vector2(1462.5, 289)
 scale = Vector2(0.5351851, 0.5351852)
 texture = ExtResource("3_ccj1t")
 
-[node name="ESCTerrain" type="Node2D" parent="."]
+[node name="ESCTerrain" type="Node2D" parent="." unique_id=662977606]
 position = Vector2(302.5, 0)
 script = ExtResource("4")
 scales = ExtResource("7")
@@ -78,27 +78,27 @@ scale_max = 1.4
 player_speed_multiplier = 1.2
 player_doubleclick_speed_multiplier = 2.0
 
-[node name="Foreground-mesa" type="Sprite2D" parent="ESCTerrain"]
+[node name="Foreground-mesa" type="Sprite2D" parent="ESCTerrain" unique_id=2145783060]
 z_index = 1000
 position = Vector2(1786, 424)
 texture = ExtResource("8")
 
-[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
+[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain" unique_id=969658193]
 navigation_polygon = SubResource("3")
 
-[node name="Foreground-silla" type="Sprite2D" parent="ESCTerrain/NavigationRegion2D"]
+[node name="Foreground-silla" type="Sprite2D" parent="ESCTerrain/NavigationRegion2D" unique_id=282682631]
 z_index = 4096
 position = Vector2(202, 499)
 texture = ExtResource("9")
 
-[node name="puerta_detras" type="Area2D" parent="."]
+[node name="puerta_detras" type="Area2D" parent="." unique_id=113600776]
 process_mode = 1
 position = Vector2(302.5, 0)
 script = ExtResource("6")
 custom_cursor = "north"
 global_id = "cocina_puerta_detras"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -106,24 +106,24 @@ custom_data = {
 }
 }
 
-[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"]
+[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras" unique_id=446710069]
 position = Vector2(1710, -167)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076)
 
-[node name="puerta_detras_start" type="Marker2D" parent="puerta_detras"]
+[node name="puerta_detras_start" type="Marker2D" parent="puerta_detras" unique_id=13337701]
 position = Vector2(1791, 370)
 script = ExtResource("5")
 global_id = "puerta_detras_start"
 
-[node name="puerta_delante" type="Area2D" parent="."]
+[node name="puerta_delante" type="Area2D" parent="." unique_id=656383417]
 process_mode = 1
 position = Vector2(302.5, 0)
 script = ExtResource("6")
 custom_cursor = "east"
 global_id = "cocina_puerta_delante"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -131,47 +131,46 @@ custom_data = {
 }
 }
 
-[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
+[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante" unique_id=955093544]
 position = Vector2(2385, -81)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(44.1165, 551.899, 44.1165, 541.772, 38.9263, 515.443, 36.8501, 487.089, 25.4319, 459.747, 7.7854, 437.468, 10.3804, 161.013, 124.564, 97.2152, 119.89282, 205.56961, 106.39819, 212.65823, 104.322266, 224.81012, 104.322266, 246.07594, 106.39819, 264.3038, 112.626465, 277.46835, 117.81665, 284.55695, 106.398, 457.721, 103.284, 469.873, 83.5615, 487.089, 70.0671, 524.557, 59.6868, 555.949)
 
-[node name="puerta_delante_start" type="Marker2D" parent="puerta_delante"]
+[node name="puerta_delante_start" type="Marker2D" parent="puerta_delante" unique_id=502955466]
 position = Vector2(2379, 526)
 script = ExtResource("5")
 global_id = "puerta_delante_start"
 is_start_location = true
 
-[node name="turno_cocina_peso" parent="." instance=ExtResource("10")]
+[node name="turno_cocina_peso" parent="." unique_id=794245951 instance=ExtResource("10")]
 position = Vector2(2505, 160)
 scale = Vector2(0.880435, 0.88735)
 
-[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
+[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso" unique_id=801826097]
 position = Vector2(15.9014, -11.2695)
 polygon = PackedVector2Array(-2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694)
 
-[node name="turno_cocina_peso_location" type="Marker2D" parent="turno_cocina_peso"]
+[node name="turno_cocina_peso_location" type="Marker2D" parent="turno_cocina_peso" unique_id=1954514472]
 position = Vector2(-3.40724, 268.214)
 script = ExtResource("5")
 
-[node name="turno_cocina_bol" parent="." instance=ExtResource("11")]
+[node name="turno_cocina_bol" parent="." unique_id=1140559479 instance=ExtResource("11")]
 position = Vector2(1505, 160)
 scale = Vector2(0.880435, 0.88735)
 
-[node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"]
+[node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol" unique_id=173002548]
 position = Vector2(169.235, 210.74)
 polygon = PackedVector2Array(-7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234)
 
-[node name="turno_cocina_bol_location" type="Marker2D" parent="turno_cocina_bol"]
+[node name="turno_cocina_bol_location" type="Marker2D" parent="turno_cocina_bol" unique_id=332847272]
 position = Vector2(198.765, 339.212)
 script = ExtResource("5")
 
-[node name="turno_cocina_pan" parent="." instance=ExtResource("11")]
+[node name="turno_cocina_pan" parent="." unique_id=490782280 instance=ExtResource("11")]
 position = Vector2(1505, 160)
 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()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look",
@@ -179,21 +178,21 @@ custom_data = {
 }
 }
 
-[node name="turno_cocina_pan_collision" type="CollisionPolygon2D" parent="turno_cocina_pan"]
+[node name="turno_cocina_pan_collision" type="CollisionPolygon2D" parent="turno_cocina_pan" unique_id=1341915043]
 position = Vector2(590.712, 122.292)
 scale = Vector2(1.02084, 1.32813)
 polygon = PackedVector2Array(-14.7654, -1.12695, -14.7654, 7.88867, -48.8394, 7.88867, -48.8394, -1.12695)
 
-[node name="turno_cocina_pan_location" type="Marker2D" parent="turno_cocina_pan"]
+[node name="turno_cocina_pan_location" type="Marker2D" parent="turno_cocina_pan" unique_id=1605331784]
 position = Vector2(603.111, 223.136)
 script = ExtResource("5")
 
-[node name="fregadero_der" type="Area2D" parent="."]
+[node name="fregadero_der" type="Area2D" parent="." unique_id=270682733]
 process_mode = 1
 script = ExtResource("6")
 global_id = "cocina_fregadero_der"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "target_tooltips": {
 "action3": {
@@ -207,19 +206,19 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der" unique_id=1099512381]
 polygon = PackedVector2Array(2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286)
 
-[node name="ESCLocation" type="Marker2D" parent="fregadero_der"]
+[node name="ESCLocation" type="Marker2D" parent="fregadero_der" unique_id=1084965645]
 position = Vector2(2370, 395)
 script = ExtResource("5")
 
-[node name="fregadero_izq" type="Area2D" parent="."]
+[node name="fregadero_izq" type="Area2D" parent="." unique_id=368152005]
 process_mode = 1
 script = ExtResource("6")
 global_id = "cocina_fregadero_izq"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "target_tooltips": {
 "action3": {
@@ -233,19 +232,19 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq" unique_id=122654795]
 polygon = PackedVector2Array(1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273)
 
-[node name="ESCLocation" type="Marker2D" parent="fregadero_izq"]
+[node name="ESCLocation" type="Marker2D" parent="fregadero_izq" unique_id=279571271]
 position = Vector2(1855, 400)
 script = ExtResource("5")
 
-[node name="cuchillos" type="Area2D" parent="."]
+[node name="cuchillos" type="Area2D" parent="." unique_id=689215470]
 process_mode = 1
 script = ExtResource("6")
 global_id = "cocina_cuchillos"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "target_tooltips": {
 "action3": {
@@ -258,20 +257,20 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos" unique_id=1787039976]
 position = Vector2(1452, -245)
 polygon = PackedVector2Array(469, 375, 454, 391, 508, 399, 530, 385)
 
-[node name="ESCLocation" type="Marker2D" parent="cuchillos"]
+[node name="ESCLocation" type="Marker2D" parent="cuchillos" unique_id=179641974]
 position = Vector2(1987, 370)
 script = ExtResource("5")
 
-[node name="debajo_sofa" type="Area2D" parent="."]
+[node name="debajo_sofa" type="Area2D" parent="." unique_id=1144213401]
 process_mode = 1
 script = ExtResource("6")
 global_id = "cocina_debajo_sofa"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc"
-combine_when_selected_action_is_in = PackedStringArray("action4")
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "target_tooltips": {
 "action3": {
@@ -284,19 +283,19 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa" unique_id=126073393]
 polygon = PackedVector2Array(466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386)
 
-[node name="ESCLocation" type="Marker2D" parent="debajo_sofa"]
+[node name="ESCLocation" type="Marker2D" parent="debajo_sofa" unique_id=640566192]
 position = Vector2(420, 494)
 script = ExtResource("5")
 
-[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="debajo_sofa"]
+[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="debajo_sofa" unique_id=1001277885]
 script = ExtResource("15_fji2i")
 targeted_global_variable = "cocina_debajo_sofa_picked"
 inverted = true
 
-[node name="cocina_patata" type="Area2D" parent="."]
+[node name="cocina_patata" type="Area2D" parent="." unique_id=429194559]
 process_mode = 1
 z_index = 1001
 position = Vector2(2202, 343)
@@ -305,7 +304,7 @@ scale = Vector2(0.5, 0.5)
 script = ExtResource("6")
 global_id = "cocina_patata"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 interaction_angle = 180
 inventory_texture = ExtResource("13")
 inventory_texture_hovered = ExtResource("13")
@@ -316,32 +315,32 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="cocina_patata"]
+[node name="Sprite2D" type="Sprite2D" parent="cocina_patata" unique_id=690246474]
 position = Vector2(-2, 0)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("13")
 
-[node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"]
+[node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata" unique_id=967864251]
 z_index = 1001
 position = Vector2(9.0867, -13.5233)
 polygon = PackedVector2Array(4.29102, 2.70483, 14.7856, 9.76636, 12.1133, 19.4026, 2.26636, 24.9736, -21.0713, 26.8035, -35.9553, 20.6005, -35.7446, 12.3569, -30.2866, 7.64404, -23.436, 5.39294, -16.0503, 1.2146, -5.34521, 0.0324707)
 
-[node name="turno_cocina_patata_location" type="Marker2D" parent="cocina_patata"]
+[node name="turno_cocina_patata_location" type="Marker2D" parent="cocina_patata" unique_id=2039046916]
 position = Vector2(93.1357, 65.3632)
 script = ExtResource("5")
 
-[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="cocina_patata"]
+[node name="ESCItemComponentGlobalBooleanObserver" type="Node" parent="cocina_patata" unique_id=670284995]
 script = ExtResource("15_fji2i")
 targeted_global_variable = "cocina_patata_picked"
 inverted = true
 
-[node name="turno_cocina_economica" type="Area2D" parent="."]
+[node name="turno_cocina_economica" type="Area2D" parent="." unique_id=712113012]
 process_mode = 1
 position = Vector2(1299, 506)
 script = ExtResource("6")
 global_id = "turno_cocina_economica"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/economica.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 interaction_angle = 90
 custom_data = {
 "target_tooltips": {
@@ -360,32 +359,32 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica" unique_id=537044306]
 position = Vector2(-6, -4)
 polygon = PackedVector2Array(-65, -18, -138, 48, -37, 73, 226, 71, 253, -5)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_economica"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_economica" unique_id=1859121270]
 position = Vector2(-182, 205)
 script = ExtResource("5")
 
-[node name="turno_cocina_libro_de_cocina" parent="." instance=ExtResource("14")]
+[node name="turno_cocina_libro_de_cocina" parent="." unique_id=700102731 instance=ExtResource("14")]
 position = Vector2(2547, 244)
 scale = Vector2(1.06318, 1.06318)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina" unique_id=431651333]
 position = Vector2(-16.9304, 145.789)
 script = ExtResource("5")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina" unique_id=1310390621]
 polygon = PackedVector2Array(-44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304)
 
-[node name="turno_cocina_cocina_gas" type="Area2D" parent="."]
+[node name="turno_cocina_cocina_gas" type="Area2D" parent="." unique_id=173967830]
 process_mode = 1
 position = Vector2(2219, 272)
 script = ExtResource("6")
 global_id = "turno_cocina_cocina_gas"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "target_tooltips": {
 "action3": {
@@ -401,73 +400,75 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas" unique_id=231284811]
 z_index = 5
 position = Vector2(2, -33)
 polygon = PackedVector2Array(-17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5)
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="turno_cocina_cocina_gas"]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="turno_cocina_cocina_gas" unique_id=818227110]
 z_as_relative = false
 position = Vector2(9, -8)
 sprite_frames = SubResource("4")
 animation = &"apagada"
 script = ExtResource("26")
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_cocina_gas"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_cocina_gas" unique_id=1497149372]
 position = Vector2(-56, 78)
 script = ExtResource("5")
 
-[node name="turno_cocina_olla_llena" parent="." instance=ExtResource("12")]
+[node name="turno_cocina_olla_llena" parent="." unique_id=1517171765 instance=ExtResource("12")]
 position = Vector2(1281, 491)
 scale = Vector2(1.06318, 1.06318)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena" unique_id=468435906]
 position = Vector2(-160.838, 201.283)
 script = ExtResource("5")
 
-[node name="turno_cocina_cuerno" parent="." instance=ExtResource("20")]
+[node name="turno_cocina_cuerno" parent="." unique_id=865233447 instance=ExtResource("20")]
 position = Vector2(2801, 175)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno" unique_id=878461397]
 position = Vector2(-81, 334)
 script = ExtResource("5")
 
-[node name="SmokeParticles" parent="." instance=ExtResource("19")]
+[node name="SmokeParticles" parent="." unique_id=1746931469 instance=ExtResource("19")]
 position = Vector2(1297, 504)
 scale = Vector2(1.07999, 1)
 script = ExtResource("21")
 
-[node name="turno_cocina_jarra" parent="." instance=ExtResource("22")]
+[node name="turno_cocina_jarra" parent="." unique_id=822995812 instance=ExtResource("22")]
 position = Vector2(1974, 236)
 scale = Vector2(0.880435, 0.88735)
+actions_requiring_target_object = PackedStringArray()
 
-[node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra"]
+[node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra" unique_id=802095650]
 position = Vector2(15.9011, -12.3964)
 polygon = PackedVector2Array(-4.54248, 1.12698, -11.3574, 24.793, -27.2595, 24.7929, -27.2595, 1.12694)
 
-[node name="turno_cocina_jarra_location" type="Marker2D" parent="turno_cocina_jarra"]
+[node name="turno_cocina_jarra_location" type="Marker2D" parent="turno_cocina_jarra" unique_id=1045328201]
 position = Vector2(-55.6546, 169.043)
 script = ExtResource("5")
 
-[node name="turno_cocina_jarra_volcada" parent="." instance=ExtResource("25")]
+[node name="turno_cocina_jarra_volcada" parent="." unique_id=1380184817 instance=ExtResource("25")]
 position = Vector2(1965, 282)
 scale = Vector2(0.880435, 0.88735)
+actions_requiring_target_object = PackedStringArray()
 
-[node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada"]
+[node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada" unique_id=1834034055]
 position = Vector2(18.1726, -12.3964)
 polygon = PackedVector2Array(-4.54272, 12.3965, -6.81445, 16.9043, -14.7651, 19.1582, -20.4441, 22.539, -29.5305, 20.2851, -29.5305, 9.01559, -17.0366, 2.25391)
 
-[node name="turno_cocina_jarra_volcada_location" type="Marker2D" parent="turno_cocina_jarra_volcada"]
+[node name="turno_cocina_jarra_volcada_location" type="Marker2D" parent="turno_cocina_jarra_volcada" unique_id=210716623]
 position = Vector2(45.4321, 92.4099)
 script = ExtResource("5")
 
-[node name="turno_cocina_ordenador" type="Area2D" parent="."]
+[node name="turno_cocina_ordenador" type="Area2D" parent="." unique_id=1021929127]
 process_mode = 1
 position = Vector2(43, 322)
 script = ExtResource("6")
 global_id = "turno_cocina_ordenador"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/ordenador.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 interaction_angle = 270
 custom_data = {
 "tooltips": {
@@ -477,25 +478,25 @@ custom_data = {
 }
 metadata/_custom_type_script = "uid://ceym82rf2qnxu"
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_ordenador"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_ordenador" unique_id=2035984166]
 polygon = PackedVector2Array(-46, -77, 37, -78, 35, 37, 60, 43, 60, 47, 23, 54, -3, 50, -1, 55, -14, 59, -28, 57, -40, 55, -46, 53)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ordenador"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ordenador" unique_id=1830994970]
 position = Vector2(237, 210)
 script = ExtResource("5")
 
-[node name="turno_cocina_bandera_palestina_second" type="Marker2D" parent="."]
+[node name="turno_cocina_bandera_palestina_second" type="Marker2D" parent="." unique_id=1512588244]
 position = Vector2(399, 553)
 script = ExtResource("5")
 global_id = "turno_cocina_bandera_palestina_second"
 
-[node name="turno_cocina_bandera_palestina" type="Area2D" parent="."]
+[node name="turno_cocina_bandera_palestina" type="Area2D" parent="." unique_id=949924385]
 process_mode = 1
 position = Vector2(592, 181)
 script = ExtResource("6")
 global_id = "turno_cocina_bandera_palestina"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/bandera_palestina.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "turno_cocina_bandera_palestina_action1",
@@ -504,14 +505,14 @@ custom_data = {
 }
 metadata/_custom_type_script = "uid://ceym82rf2qnxu"
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_bandera_palestina"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_bandera_palestina" unique_id=171889723]
 polygon = PackedVector2Array(-49, -28, -48, -12, -48, 11, -48, 21, -25, 22, 2, 24, 32, 24, 47, 23, 50, -27, 14, -27, 2, -27, -9, -28, -28, -28, -47, -29)
 
-[node name="ESCDialogLocation" type="Marker2D" parent="turno_cocina_bandera_palestina"]
+[node name="ESCDialogLocation" type="Marker2D" parent="turno_cocina_bandera_palestina" unique_id=2120272402]
 position = Vector2(0, 123)
 script = ExtResource("26_5b7i4")
 metadata/_custom_type_script = "uid://85bledusisk1"
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_bandera_palestina"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_bandera_palestina" unique_id=1145132318]
 position = Vector2(-136, 274)
 script = ExtResource("5")

gymkhana/rooms/turno_cocina/cocina/jarra.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=3 format=3 uid="uid://bthshk88n0ida"]
+[gd_scene format=3 uid="uid://bthshk88n0ida"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://ch6cix8tilkko" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://d1lgrsl6n1iw5" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="2"]
 
-[node name="turno_cocina_jarra" type="Area2D"]
+[node name="turno_cocina_jarra" type="Area2D" unique_id=1194420428]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_jarra"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -18,7 +18,7 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=143904424]
 rotation = -0.0698132
 scale = Vector2(0.18, 0.18)
 texture = ExtResource("2")

gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=3 format=3 uid="uid://byfyg5p0h02br"]
+[gd_scene format=3 uid="uid://byfyg5p0h02br"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://owlqnagksu55" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://c77k4vhx8c4y2" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="2"]
 
-[node name="turno_cocina_jarra_volcada" type="Area2D"]
+[node name="turno_cocina_jarra_volcada" type="Area2D" unique_id=1338893468]
 process_mode = 1
 script = ExtResource("1")
 global_id = "turno_cocina_jarra_volcada"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra_volcada.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 inventory_texture = ExtResource("2")
 inventory_texture_hovered = ExtResource("2")
 custom_data = {
@@ -18,7 +18,7 @@ custom_data = {
 }
 }
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1890752649]
 rotation = -0.0698132
 scale = Vector2(0.18, 0.18)
 texture = ExtResource("2")

gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=19 format=3 uid="uid://dwvu5kn7qr35s"]
+[gd_scene format=3 uid="uid://dwvu5kn7qr35s"]
 
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
+[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://b8re6n31thdb" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/delante_cocina_full.jpg" id="3_us6ip"]
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
+[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="Texture2D" uid="uid://dhj8k3ro2vayg" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/light.png" id="6_ugqpr"]
-[ext_resource type="Texture2D" uid="uid://js3u7hbljn2x" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://cn22qqkf6c0fu" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/light.png" id="6_ugqpr"]
+[ext_resource type="Texture2D" uid="uid://d1jkwdf67q350" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" id="7"]
 [ext_resource type="PackedScene" uid="uid://wx76bqug4qy8" path="res://gymkhana/characters/eneko/eneko_smoking.tscn" id="8"]
-[ext_resource type="Texture2D" uid="uid://du7o4ic4601dk" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" id="9"]
+[ext_resource type="Texture2D" uid="uid://cgiiyfb58vcuf" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" id="9"]
 [ext_resource type="Script" uid="uid://06qgh0fqcu01" path="res://gymkhana/rooms/turno_cocina/cocina_delante/they_live.gd" id="9_ugqpr"]
 [ext_resource type="PackedScene" uid="uid://cbsyjat8xvwfx" path="res://gymkhana/items/turno_cocina_madera.tscn" id="10"]
 [ext_resource type="Texture2D" uid="uid://dmhkih2g0k4yv" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/they_live_buy.png" id="10_us6ip"]
@@ -23,37 +23,37 @@ vertices = PackedVector2Array(-768, 301, -1163, 462, -1161, 358, -532, 166, 676,
 polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(4, 5, 6, 7), PackedInt32Array(4, 7, 8, 9), PackedInt32Array(10, 9, 8), PackedInt32Array(11, 10, 8, 0, 12), PackedInt32Array(11, 13, 14, 10), PackedInt32Array(12, 0, 3, 15)])
 outlines = Array[PackedVector2Array]([PackedVector2Array(-1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 419, 146, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, -768, 301, -1163, 462)])
 
-[node name="ESCRoom" type="Node2D"]
+[node name="ESCRoom" type="Node2D" unique_id=1612130095]
 script = ExtResource("1")
 global_id = "cocina_delante"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc"
 player_scene = ExtResource("2")
 camera_limits = [Rect2(0, 0, 2319, 720)]
 
-[node name="background" type="Sprite2D" parent="."]
+[node name="background" type="Sprite2D" parent="." unique_id=65059233]
 position = Vector2(1164.1777, 290.5)
 scale = Vector2(0.37801057, 0.3782895)
 texture = ExtResource("3_us6ip")
 
-[node name="ESCTerrain" type="Node2D" parent="."]
+[node name="ESCTerrain" type="Node2D" parent="." unique_id=666297035]
 script = ExtResource("4")
 scales = ExtResource("7")
 scale_min = 0.25
 scale_max = 1.4
 lightmap = ExtResource("6_ugqpr")
 
-[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
+[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain" unique_id=1343444292]
 position = Vector2(1159, 289)
 navigation_polygon = SubResource("1")
 
-[node name="puerta_cocina" type="Area2D" parent="."]
+[node name="puerta_cocina" type="Area2D" parent="." unique_id=192535588]
 process_mode = 1
 script = ExtResource("6")
 with_is_picked_component = null
 custom_cursor = "north"
 global_id = "cocina_delante_puerta_cocina"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -61,24 +61,24 @@ custom_data = {
 }
 }
 
-[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
+[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina" unique_id=1651708234]
 position = Vector2(630, -130)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(-1.03802, 589.367, -1.03809, 311.899, 166.085, 311.899, 166.085, 589.367)
 
-[node name="puerta_cocina_start" type="Marker2D" parent="puerta_cocina"]
+[node name="puerta_cocina_start" type="Marker2D" parent="puerta_cocina" unique_id=720045353]
 position = Vector2(716, 473)
 script = ExtResource("5")
 global_id = "puerta_cocina_start"
 
-[node name="puerta_despensa" type="Area2D" parent="."]
+[node name="puerta_despensa" type="Area2D" parent="." unique_id=1407708989]
 process_mode = 1
 script = ExtResource("6")
 with_is_picked_component = null
 custom_cursor = "west"
 global_id = "cocina_delante_puerta_despensa"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -86,24 +86,24 @@ custom_data = {
 }
 }
 
-[node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"]
+[node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa" unique_id=325722397]
 position = Vector2(51, 113)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(-1.03803, 470.886, -1.03809, 311.899, 72.6622, 311.899, 71.6242, 469.873)
 
-[node name="puerta_despensa_start" type="Marker2D" parent="puerta_despensa"]
+[node name="puerta_despensa_start" type="Marker2D" parent="puerta_despensa" unique_id=1073524710]
 position = Vector2(90, 621)
 script = ExtResource("5")
 global_id = "puerta_despensa_start"
 
-[node name="puerta_detras" type="Area2D" parent="."]
+[node name="puerta_detras" type="Area2D" parent="." unique_id=1702960865]
 process_mode = 1
 script = ExtResource("6")
 with_is_picked_component = null
 custom_cursor = "north"
 global_id = "cocina_delante_puerta_detras"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -111,62 +111,62 @@ custom_data = {
 }
 }
 
-[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"]
+[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras" unique_id=22182385]
 position = Vector2(1067, -26)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506, -69.5481, 285.57, 120.412, 293.671, 122.488, 470.886)
 
-[node name="puerta_detras_start" type="Marker2D" parent="puerta_detras"]
+[node name="puerta_detras_start" type="Marker2D" parent="puerta_detras" unique_id=262909725]
 position = Vector2(1131, 460)
 script = ExtResource("5")
 global_id = "puerta_detras_start"
 
-[node name="they_live" type="Node2D" parent="."]
+[node name="they_live" type="Node2D" parent="." unique_id=754715409]
 visible = false
 script = ExtResource("9_ugqpr")
 
-[node name="buy" type="Sprite2D" parent="they_live"]
+[node name="buy" type="Sprite2D" parent="they_live" unique_id=1046174802]
 position = Vector2(566.00006, 256)
 scale = Vector2(0.33258832, 0.33258832)
 texture = ExtResource("10_us6ip")
 
-[node name="watch_tv" type="Sprite2D" parent="they_live"]
+[node name="watch_tv" type="Sprite2D" parent="they_live" unique_id=1698685599]
 position = Vector2(710, 319)
 scale = Vector2(0.8802128, 0.8802124)
 texture = ExtResource("11_ref2y")
 
-[node name="obey" type="Sprite2D" parent="they_live"]
+[node name="obey" type="Sprite2D" parent="they_live" unique_id=1096439097]
 position = Vector2(870, 267)
 scale = Vector2(0.8040541, 0.804054)
 texture = ExtResource("12_dqfmc")
 
-[node name="EnekoSmoking" parent="." instance=ExtResource("8")]
+[node name="EnekoSmoking" parent="." unique_id=1966599362 instance=ExtResource("8")]
 position = Vector2(813, 440)
 
-[node name="ESCLocation" type="Marker2D" parent="EnekoSmoking"]
+[node name="ESCLocation" type="Marker2D" parent="EnekoSmoking" unique_id=824620484]
 position = Vector2(-44, 82)
 script = ExtResource("5")
 global_id = "eneko_smoking"
 
-[node name="Foreground" type="Sprite2D" parent="."]
+[node name="Foreground" type="Sprite2D" parent="." unique_id=1278266874]
 z_index = 4096
 position = Vector2(1817, 451)
 texture = ExtResource("9")
 
-[node name="new_game_start_location" type="Marker2D" parent="."]
+[node name="new_game_start_location" type="Marker2D" parent="." unique_id=1901145914]
 position = Vector2(718, 509)
 script = ExtResource("5")
 global_id = "new_game_start_location"
 is_start_location = true
 
-[node name="pegatinas" type="Area2D" parent="."]
+[node name="pegatinas" type="Area2D" parent="." unique_id=1748583745]
 process_mode = 1
 position = Vector2(870, 264)
 script = ExtResource("6")
 with_is_picked_component = null
 global_id = "cocina_delante_pegatinas"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/pegatinas.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_cocina_delante_pegatinas_action1",
@@ -174,36 +174,36 @@ custom_data = {
 }
 }
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="pegatinas"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="pegatinas" unique_id=1045572264]
 position = Vector2(-33, -25)
 polygon = PackedVector2Array(-12, 29, 11, 16, 46, 31, 47.182953, 65.26837, 58, 73, 69, 84, 92, 84, 91, -16, 47, -17, -20, -17, -21, 26)
 
-[node name="ESCLocation" type="Marker2D" parent="pegatinas"]
+[node name="ESCLocation" type="Marker2D" parent="pegatinas" unique_id=1161817419]
 position = Vector2(-99, 213)
 script = ExtResource("5")
 
-[node name="turno_cocina_madera" parent="." instance=ExtResource("10")]
+[node name="turno_cocina_madera" parent="." unique_id=1511438880 instance=ExtResource("10")]
 position = Vector2(1505, 160)
 scale = Vector2(0.880435, 0.88735)
 
-[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"]
+[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera" unique_id=42924178]
 position = Vector2(396.395, 87.9022)
 polygon = PackedVector2Array(-2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.4277, -78.3702, -21.4121)
 
-[node name="turno_cocina_madera_location" type="Marker2D" parent="turno_cocina_madera"]
+[node name="turno_cocina_madera_location" type="Marker2D" parent="turno_cocina_madera" unique_id=1795642449]
 position = Vector2(368, 137.488)
 script = ExtResource("5")
 
-[node name="turno_cocina_ajo" parent="." instance=ExtResource("11")]
+[node name="turno_cocina_ajo" parent="." unique_id=743332875 instance=ExtResource("11")]
 position = Vector2(858, 399)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo" unique_id=1456237170]
 position = Vector2(-21, 91)
 script = ExtResource("5")
 
-[node name="turno_cocina_carton" parent="." instance=ExtResource("12")]
+[node name="turno_cocina_carton" parent="." unique_id=1543704098 instance=ExtResource("12")]
 position = Vector2(1221, 423)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton" unique_id=54574825]
 position = Vector2(-52, 34)
 script = ExtResource("5")

gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn

@@ -1,14 +1,14 @@
-[gd_scene load_steps=14 format=3 uid="uid://b1seq58sj62b4"]
+[gd_scene format=3 uid="uid://b1seq58sj62b4"]
 
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"]
+[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://dxof65ijg82fx" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background_full.jpg" id="3_rjp4x"]
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"]
-[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"]
+[ext_resource type="Texture2D" uid="uid://bk0e86r6u64pl" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background_full.jpg" id="3_rjp4x"]
+[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="Texture2D" uid="uid://cb0wp1hxr3ljr" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/light.jpg" id="6_ipxey"]
-[ext_resource type="Texture2D" uid="uid://loskq8fjc0f6" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" id="7"]
-[ext_resource type="Texture2D" uid="uid://diekyfeyu702i" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://biw3s8eyns8q0" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/light.jpg" id="6_ipxey"]
+[ext_resource type="Texture2D" uid="uid://doug3bnb3shwo" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://ehno370c7vt2" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" id="8"]
 [ext_resource type="PackedScene" uid="uid://dgucic2086suo" path="res://gymkhana/items/turno_cocina_olla_vacia.tscn" id="9"]
 [ext_resource type="PackedScene" uid="uid://bxjtxquhseqdp" path="res://gymkhana/items/turno_cocina_mechero.tscn" id="10"]
 [ext_resource type="PackedScene" uid="uid://bu2xpoyifwi5o" path="res://gymkhana/items/turno_cocina_romero.tscn" id="11"]
@@ -18,19 +18,19 @@ vertices = PackedVector2Array(-1104, 183, -1146, 112, -1013, 114, -864, 131, -78
 polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4, 5), PackedInt32Array(6, 7, 8, 9, 10, 11), PackedInt32Array(9, 12, 13, 10), PackedInt32Array(14, 11, 15, 0, 16), PackedInt32Array(17, 18, 4, 3), PackedInt32Array(14, 6, 11), PackedInt32Array(16, 19, 20, 14), PackedInt32Array(0, 5, 16)])
 outlines = Array[PackedVector2Array]([PackedVector2Array(-1146, 112, -1013, 114, -864, 131, -852, 111, -790, 115, -787, 150, -717, 189, -598, 200, -519, 186, -392, 198, -236, 229, 44, 171, 37, 137, 169, 158, 177, 170, 246, 170, 246, 233, 184, 248, 169, 316, -1093, 316, -1104, 183)])
 
-[node name="ESCRoom" type="Node2D"]
+[node name="ESCRoom" type="Node2D" unique_id=672851551]
 script = ExtResource("1")
 global_id = "cocina_detras"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc"
 player_scene = ExtResource("2")
 camera_limits = [Rect2(0, 0, 1500, 720)]
 
-[node name="background" type="Sprite2D" parent="."]
+[node name="background" type="Sprite2D" parent="." unique_id=1737623102]
 position = Vector2(748.6991, 288.50003)
 scale = Vector2(0.47916678, 0.4791667)
 texture = ExtResource("3_rjp4x")
 
-[node name="ESCTerrain" type="Node2D" parent="."]
+[node name="ESCTerrain" type="Node2D" parent="." unique_id=242568028]
 script = ExtResource("4")
 scales = ExtResource("7")
 scale_min = 0.5
@@ -38,17 +38,17 @@ lightmap = ExtResource("6_ipxey")
 player_speed_multiplier = 1.3
 player_doubleclick_speed_multiplier = 2.0
 
-[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
+[node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain" unique_id=1033551808]
 position = Vector2(1252, 260)
 navigation_polygon = SubResource("1")
 
-[node name="puerta_cocina" type="Area2D" parent="."]
+[node name="puerta_cocina" type="Area2D" parent="." unique_id=69725717]
 process_mode = 1
 script = ExtResource("6")
 custom_cursor = "north"
 global_id = "cocina_detras_puerta_cocina"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -56,23 +56,23 @@ custom_data = {
 }
 }
 
-[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
+[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina" unique_id=293341093]
 position = Vector2(630, -130)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(117.298, 581.266, 120.412, 341.266, 169.199, 325.063, 236.671, 333.165, 236.671, 588.354)
 
-[node name="cocina_detras_puerta_cocina_start" type="Marker2D" parent="puerta_cocina"]
+[node name="cocina_detras_puerta_cocina_start" type="Marker2D" parent="puerta_cocina" unique_id=707451145]
 position = Vector2(793, 465)
 script = ExtResource("5")
 global_id = "cocina_detras_puerta_cocina_start"
 
-[node name="puerta_delante" type="Area2D" parent="."]
+[node name="puerta_delante" type="Area2D" parent="." unique_id=1975633988]
 process_mode = 1
 script = ExtResource("6")
 custom_cursor = "north"
 global_id = "cocina_detras_puerta_delante"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_exit = true
 custom_data = {
 "tooltips": {
@@ -80,67 +80,67 @@ custom_data = {
 }
 }
 
-[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
+[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante" unique_id=1594306017]
 position = Vector2(298, -203)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(114.18347, 581.2658, 114.18347, 417.2152, 286.4967, 435.44305, 282.345, 486.076, 234.595, 513.418, 234.5951, 582.2785)
 
-[node name="puerta_delante_start" type="Marker2D" parent="puerta_delante"]
+[node name="puerta_delante_start" type="Marker2D" parent="puerta_delante" unique_id=1604177303]
 position = Vector2(436, 381)
 script = ExtResource("5")
 global_id = "puerta_delante_start"
 is_start_location = true
 
-[node name="Columna" type="Sprite2D" parent="."]
+[node name="Columna" type="Sprite2D" parent="." unique_id=1602394071]
 z_index = 400
 position = Vector2(235, 294)
 texture = ExtResource("8")
 
-[node name="turno_cocina_olla_vacia" parent="." instance=ExtResource("9")]
+[node name="turno_cocina_olla_vacia" parent="." unique_id=215663293 instance=ExtResource("9")]
 position = Vector2(883, 451)
 scale = Vector2(0.5, 0.5)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_vacia"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_vacia" unique_id=1334044862]
 position = Vector2(1, 96)
 script = ExtResource("5")
 
-[node name="turno_cocina_mechero" parent="." instance=ExtResource("10")]
+[node name="turno_cocina_mechero" parent="." unique_id=1298442614 instance=ExtResource("10")]
 position = Vector2(108, 438)
 rotation = 1.44513
 scale = Vector2(0.4, 0.4)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_mechero"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_mechero" unique_id=2104362218]
 position = Vector2(296.645, -154.035)
 script = ExtResource("5")
 
-[node name="turno_cocina_romero" parent="." instance=ExtResource("11")]
+[node name="turno_cocina_romero" parent="." unique_id=2024961927 instance=ExtResource("11")]
 position = Vector2(61, 341)
 
-[node name="ESCLocation" type="Marker2D" parent="turno_cocina_romero"]
+[node name="ESCLocation" type="Marker2D" parent="turno_cocina_romero" unique_id=712557492]
 position = Vector2(89, 60)
 script = ExtResource("5")
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero" unique_id=219774880]
 position = Vector2(-61, -341)
 polygon = PackedVector2Array(75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434)
 
-[node name="mikel" type="Area2D" parent="."]
+[node name="mikel" type="Area2D" parent="." unique_id=337376715]
 process_mode = 1
 script = ExtResource("6")
 global_id = "cocina_detras_mikel"
 esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc"
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 custom_data = {
 "tooltips": {
 "action1": "tooltip_common_look"
 }
 }
 
-[node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"]
+[node name="mikel_collision" type="CollisionPolygon2D" parent="mikel" unique_id=1718173840]
 position = Vector2(751, -159)
 scale = Vector2(0.963362, 0.9875)
 polygon = PackedVector2Array(129.7539, 469.8734, 128.71588, 370.63293, 138.05817, 368.6076, 183.732, 381.772, 184.77, 471.899, 153.62866, 471.89874)
 
-[node name="mikel_location" type="Marker2D" parent="mikel"]
+[node name="mikel_location" type="Marker2D" parent="mikel" unique_id=1069041206]
 position = Vector2(857, 491)
 script = ExtResource("5")

gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn

@@ -1,12 +1,12 @@
-[gd_scene load_steps=27 format=3 uid="uid://bgiskd55j17fc"]
+[gd_scene format=3 uid="uid://bgiskd55j17fc"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://dlndx4wt43du5" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" id="2"]
-[ext_resource type="Texture2D" uid="uid://cocv4kkfk5iov" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" id="3"]
-[ext_resource type="Texture2D" uid="uid://vpnelytw2stc" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" id="4"]
-[ext_resource type="Texture2D" uid="uid://h7emnr0usymg" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" id="5"]
+[ext_resource type="Texture2D" uid="uid://xy6y3vy7ryvn" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://co74b24kw7ltt" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://161uwvla2mw8" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://dxwq2a60r5ror" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" id="5"]
 [ext_resource type="Script" uid="uid://ixw3klxr3w2p" path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" id="7"]
-[ext_resource type="Texture2D" uid="uid://do8xbit43kike" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://bany73whwbgbc" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" id="8"]
 [ext_resource type="Resource" uid="uid://cr02ebtkhjlw7" path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" id="9"]
 [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="9_v123t"]
 
@@ -147,29 +147,29 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="EnekoDancing" type="Area2D"]
+[node name="EnekoDancing" type="Area2D" unique_id=869008104]
 process_mode = 1
 script = ExtResource("1")
 global_id = "eneko_dancing"
 dialog_color = Color(0.584314, 0.490196, 0.270588, 1)
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_interactive = false
 player_orients_on_arrival = false
 animations = ExtResource("9")
 animations = ExtResource("9")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=60078270]
 shape = SubResource("1")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1661769933]
 sprite_frames = SubResource("14")
 animation = &"idle"
 script = ExtResource("7")
 
-[node name="Timer" type="Timer" parent="AnimatedSprite2D"]
+[node name="Timer" type="Timer" parent="AnimatedSprite2D" unique_id=554906532]
 wait_time = 6.0
 
-[node name="ESCDialogLocation" type="Marker2D" parent="."]
+[node name="ESCDialogLocation" type="Marker2D" parent="." unique_id=1197389556]
 position = Vector2(7, -271)
 script = ExtResource("9_v123t")
 metadata/_custom_type_script = "uid://85bledusisk1"

gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://cr02ebtkhjlw7"]
+[gd_resource type="Resource" script_class="ESCAnimationResource" format=3 uid="uid://cr02ebtkhjlw7"]
 
 [ext_resource type="Script" uid="uid://sksvt0n8gle2" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
 [ext_resource type="Script" uid="uid://bxc3dll30x8tl" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
@@ -18,7 +18,7 @@ animation = "speak"
 
 [resource]
 script = ExtResource("1")
-dir_angles = [SubResource("1")]
-directions = [SubResource("2")]
-idles = [SubResource("2")]
-speaks = [SubResource("3")]
+dir_angles = Array[ExtResource("2")]([SubResource("1")])
+directions = Array[ExtResource("3")]([SubResource("2")])
+idles = Array[ExtResource("3")]([SubResource("2")])
+speaks = Array[ExtResource("3")]([SubResource("3")])

gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn

@@ -1,12 +1,12 @@
-[gd_scene load_steps=27 format=3 uid="uid://dg3q322t7b34f"]
+[gd_scene format=3 uid="uid://dg3q322t7b34f"]
 
 [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://do2a6t8weecj8" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" id="2"]
-[ext_resource type="Texture2D" uid="uid://d8kde02dy8aw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" id="3"]
-[ext_resource type="Texture2D" uid="uid://0g6vnnf6cvp0" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" id="4"]
-[ext_resource type="Texture2D" uid="uid://dna03xt7qpx8w" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" id="5"]
+[ext_resource type="Texture2D" uid="uid://bqe0xb6t01yei" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://mtefrgxydy6b" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://04oticpumws" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://dpbg6yw11tynd" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" id="5"]
 [ext_resource type="Script" uid="uid://ixw3klxr3w2p" path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" id="6"]
-[ext_resource type="Texture2D" uid="uid://diww8ibxlxjlr" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://da4vuu6b86v70" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" id="7"]
 [ext_resource type="Resource" uid="uid://bl5rc1krhwcbu" path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" id="8"]
 [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="9_wcgd0"]
 
@@ -147,29 +147,29 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="OierDancing" type="Area2D"]
+[node name="OierDancing" type="Area2D" unique_id=1597010995]
 process_mode = 1
 script = ExtResource("1")
 global_id = "oier_dancing"
 dialog_color = Color(0.321569, 0.662745, 0.301961, 1)
-combine_when_selected_action_is_in = PackedStringArray()
+actions_requiring_target_object = PackedStringArray()
 is_interactive = false
 player_orients_on_arrival = false
 animations = ExtResource("8")
 animations = ExtResource("8")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1068222101]
 shape = SubResource("1")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1372872303]
 sprite_frames = SubResource("14")
 animation = &"idle"
 script = ExtResource("6")
 
-[node name="Timer" type="Timer" parent="AnimatedSprite2D"]
+[node name="Timer" type="Timer" parent="AnimatedSprite2D" unique_id=1922829104]
 wait_time = 6.0
 
-[node name="ESCDialogLocation" type="Marker2D" parent="."]
+[node name="ESCDialogLocation" type="Marker2D" parent="." unique_id=239959658]
 position = Vector2(2, -269)
 script = ExtResource("9_wcgd0")
 metadata/_custom_type_script = "uid://85bledusisk1"

gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://bl5rc1krhwcbu"]
+[gd_resource type="Resource" script_class="ESCAnimationResource" format=3 uid="uid://bl5rc1krhwcbu"]
 
 [ext_resource type="Script" uid="uid://sksvt0n8gle2" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"]
 [ext_resource type="Script" uid="uid://bxc3dll30x8tl" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"]
@@ -18,7 +18,7 @@ animation = "speak"
 
 [resource]
 script = ExtResource("1")
-dir_angles = [SubResource("1")]
-directions = [SubResource("2")]
-idles = [SubResource("2")]
-speaks = [SubResource("3")]
+dir_angles = Array[ExtResource("2")]([SubResource("1")])
+directions = Array[ExtResource("3")]([SubResource("2")])
+idles = Array[ExtResource("3")]([SubResource("2")])
+speaks = Array[ExtResource("3")]([SubResource("3")])