diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd.uid new file mode 100644 index 00000000..4924a1bd --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd.uid @@ -0,0 +1 @@ +uid://cvhue8e0ory00 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index 8ea7d9ac..8fe7f2b7 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://nbnsf3pmh4jg"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" id="1"] +[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.tres" id="2"] [sub_resource type="Gradient" id="1"] diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd.uid new file mode 100644 index 00000000..311c1c06 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd.uid @@ -0,0 +1 @@ +uid://dlsaxwtoarkon diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd.uid new file mode 100644 index 00000000..8979b056 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd.uid @@ -0,0 +1 @@ +uid://duufh3f25hav8 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd.uid new file mode 100644 index 00000000..c7141a99 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd.uid @@ -0,0 +1 @@ +uid://tvxyry5g7kou diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd.uid new file mode 100644 index 00000000..d1e82e3f --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd.uid @@ -0,0 +1 @@ +uid://d1pg38kdwg07d diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn index 5ac2b4bc..04798ad0 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://dyi4lxm20wgne"] -[ext_resource type="FontFile" path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" id="1"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" id="2"] +[ext_resource type="FontFile" uid="uid://d1ctari2iol5l" path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" id="1"] +[ext_resource type="Script" uid="uid://d1pg38kdwg07d" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" id="2"] [node name="Label" type="Label"] offset_left = 1057.0 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd.uid new file mode 100644 index 00000000..3182778c --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd.uid @@ -0,0 +1 @@ +uid://e2sa6lkrn0js diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd.uid new file mode 100644 index 00000000..00f8fe69 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd.uid @@ -0,0 +1 @@ +uid://b1q5uv7uwn31f diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd.uid new file mode 100644 index 00000000..8e432fa5 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd.uid @@ -0,0 +1 @@ +uid://bw7paepd6ster diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd.uid new file mode 100644 index 00000000..a2714626 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd.uid @@ -0,0 +1 @@ +uid://cn37lmbastinu diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd.uid new file mode 100644 index 00000000..748b290b --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd.uid @@ -0,0 +1 @@ +uid://b6s8umo4wf644 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd.uid new file mode 100644 index 00000000..9cfa7a7c --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd.uid @@ -0,0 +1 @@ +uid://iivljvomkr7q diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd.uid new file mode 100644 index 00000000..69b065a6 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd.uid @@ -0,0 +1 @@ +uid://dkymk83pahngj diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd.uid new file mode 100644 index 00000000..2a016d4b --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd.uid @@ -0,0 +1 @@ +uid://cy6bt6secukba diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd.uid new file mode 100644 index 00000000..8e7d806a --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd.uid @@ -0,0 +1 @@ +uid://ci0cqim2bs0qk diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd.uid new file mode 100644 index 00000000..8b13fdc3 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd.uid @@ -0,0 +1 @@ +uid://8r0bhwdf6yvh diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd.uid new file mode 100644 index 00000000..ea4d4389 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd.uid @@ -0,0 +1 @@ +uid://bh8a06uoe432e diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd.uid new file mode 100644 index 00000000..cf91e69e --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd.uid @@ -0,0 +1 @@ +uid://b4dm1jk8q55fc diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd.uid new file mode 100644 index 00000000..c8659976 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd.uid @@ -0,0 +1 @@ +uid://bh1rpfjjpxgmp diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd.uid new file mode 100644 index 00000000..a69b79d1 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd.uid @@ -0,0 +1 @@ +uid://dbawq8ee81noc diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd.uid new file mode 100644 index 00000000..a2aa2f2a --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd.uid @@ -0,0 +1 @@ +uid://yv6l5iarc1ki diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn index 59535b8d..9871aba5 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cp75ofyuetxux"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd" id="1"] +[ext_resource type="Script" uid="uid://yv6l5iarc1ki" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd" id="1"] [node name="dialog_box" type="Popup"] size = Vector2i(510, 180) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd.uid b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd.uid new file mode 100644 index 00000000..2c135a39 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd.uid @@ -0,0 +1 @@ +uid://d12nyx86nlc6h diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn index 4889c113..7f161689 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn @@ -1,17 +1,17 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://x2crry528c4o"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] +[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="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" id="2"] [node name="dialog_label" type="RichTextLabel"] offset_right = 672.0 offset_bottom = 97.0 -theme = ExtResource( 2 ) +theme = ExtResource("2") bbcode_enabled = true text = "[center]Here be some text.[/center]" text = "Here be some text." fit_content_height = true -script = ExtResource( 1 ) +script = ExtResource("1") [node name="Tween" type="Tween" parent="."] diff --git a/addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd.uid b/addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd.uid new file mode 100644 index 00000000..bb4366fa --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd.uid @@ -0,0 +1 @@ +uid://c82wn7gefrdg4 diff --git a/addons/escoria-ui-return-monkey-island/MusicButton.gd.uid b/addons/escoria-ui-return-monkey-island/MusicButton.gd.uid new file mode 100644 index 00000000..dc5afb1c --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/MusicButton.gd.uid @@ -0,0 +1 @@ +uid://chas0xyx88njl diff --git a/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd.uid b/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd.uid new file mode 100644 index 00000000..6b3b79dd --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd.uid @@ -0,0 +1 @@ +uid://d0j657wcgxws8 diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd.uid b/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd.uid new file mode 100644 index 00000000..01be8d84 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd.uid @@ -0,0 +1 @@ +uid://c5r6mysg7vgj2 diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/music_enable.gd.uid b/addons/escoria-ui-return-monkey-island/esc/commands/music_enable.gd.uid new file mode 100644 index 00000000..f9d9acbb --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/commands/music_enable.gd.uid @@ -0,0 +1 @@ +uid://bhq6j56is66on diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd.uid b/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd.uid new file mode 100644 index 00000000..e44100b9 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd.uid @@ -0,0 +1 @@ +uid://cyiewqergoxre diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd.uid b/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd.uid new file mode 100644 index 00000000..76c57bef --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd.uid @@ -0,0 +1 @@ +uid://dfc0ius0vge1a diff --git a/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd.uid b/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd.uid new file mode 100644 index 00000000..fd97b616 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd.uid @@ -0,0 +1 @@ +uid://xuw3cax3mqn1 diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd.uid b/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd.uid new file mode 100644 index 00000000..8ba53fc2 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd.uid @@ -0,0 +1 @@ +uid://bmrddwpp3p2br diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd.uid b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd.uid new file mode 100644 index 00000000..8d028f78 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd.uid @@ -0,0 +1 @@ +uid://8rhdbaj1l3rw diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd.uid b/addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd.uid new file mode 100644 index 00000000..3e879189 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd.uid @@ -0,0 +1 @@ +uid://r4hqbg5hrhov diff --git a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd.uid b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd.uid new file mode 100644 index 00000000..e5d5c879 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd.uid @@ -0,0 +1 @@ +uid://ceym82rf2qnxu diff --git a/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd.uid b/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd.uid new file mode 100644 index 00000000..11724139 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd.uid @@ -0,0 +1 @@ +uid://clg4yrj7v7eae diff --git a/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd.uid b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd.uid new file mode 100644 index 00000000..665ab7ba --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd.uid @@ -0,0 +1 @@ +uid://bbf2w51korm6e diff --git a/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn index 1604df79..435d054a 100644 --- a/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn +++ b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://d2kogebvoxy51"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/esc_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="Script" uid="uid://bbf2w51korm6e" path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://cv545ye40v70b" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" id="2"] +[ext_resource type="Texture2D" uid="uid://naf4ovsgrbyp" 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.tres" id="4"] [node name="tooltipManager" type="Node2D"] diff --git a/addons/escoria-ui-return-monkey-island/game.gd.uid b/addons/escoria-ui-return-monkey-island/game.gd.uid new file mode 100644 index 00000000..d633e9be --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/game.gd.uid @@ -0,0 +1 @@ +uid://lkc4isk3g0rj diff --git a/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn index cf911731..e1bf0132 100644 --- a/addons/escoria-ui-return-monkey-island/game.tscn +++ b/addons/escoria-ui-return-monkey-island/game.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=17 format=3 uid="uid://cabos3cse6b71"] -[ext_resource type="PackedScene" 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="PackedScene" path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" id="3"] +[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" uid="uid://dfl7khtlretr7" path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" id="2"] +[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/esc_rich_tooltip.tscn" id="4"] -[ext_resource type="Script" 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="PackedScene" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" id="7"] -[ext_resource type="PackedScene" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" id="8"] +[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://c0rchilnmxyd" 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://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.tres" id="9"] -[ext_resource type="Texture2D" uid="uid://doahvd61d05u8" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"] -[ext_resource type="Texture2D" uid="uid://cvxd4tjmdwj5l" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"] -[ext_resource type="PackedScene" path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" id="12"] -[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="Script" path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" id="14"] -[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://e2xk0aimdte" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"] +[ext_resource type="Texture2D" uid="uid://ch7vmpx5l23fy" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"] +[ext_resource type="Texture2D" uid="uid://btng6bg3t644v" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"] +[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://dwkquq28fkf8n" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"] +[ext_resource type="Script" uid="uid://chas0xyx88njl" path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" id="14"] +[ext_resource type="Texture2D" uid="uid://p214fv1y4fr4" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"] +[ext_resource type="Texture2D" uid="uid://bcurldbc1pvn2" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"] [node name="game" type="Node2D"] script = ExtResource("5") diff --git a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd.uid b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd.uid new file mode 100644 index 00000000..ee9346b1 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd.uid @@ -0,0 +1 @@ +uid://1hedqas3odoy diff --git a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index fe506336..0c7cb176 100644 --- a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bl50queikqfjc"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" id="1"] -[ext_resource type="Script" path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" id="3"] +[ext_resource type="Script" uid="uid://1hedqas3odoy" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" id="1"] +[ext_resource type="Script" uid="uid://c4syt26p7mg66" path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" id="3"] [node name="inventory_ui" type="Control"] custom_minimum_size = Vector2(90, 90) diff --git a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd.uid b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd.uid new file mode 100644 index 00000000..77af972d --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd.uid @@ -0,0 +1 @@ +uid://bdple6jnn554h diff --git a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd.uid b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd.uid new file mode 100644 index 00000000..3c98f28f --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd.uid @@ -0,0 +1 @@ +uid://db4lw3phywnm4 diff --git a/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd.uid b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd.uid new file mode 100644 index 00000000..7a93f5a2 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd.uid @@ -0,0 +1 @@ +uid://c2dhb8b3h2sbd diff --git a/addons/escoria-ui-return-monkey-island/item_outline.gd.uid b/addons/escoria-ui-return-monkey-island/item_outline.gd.uid new file mode 100644 index 00000000..0f630f35 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/item_outline.gd.uid @@ -0,0 +1 @@ +uid://cmi6cn5tihk40 diff --git a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd.uid b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd.uid new file mode 100644 index 00000000..c31fae85 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd.uid @@ -0,0 +1 @@ +uid://cnlvmkxk41x6j diff --git a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn index 9308e8f9..7d1e76af 100644 --- a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn @@ -1,20 +1,20 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=6 format=3 uid="uid://d3wdxi18u52c5"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=3] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5] +[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="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="3"] +[ext_resource type="PackedScene" 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"] [node name="main_menu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 1 ) +script = ExtResource("1") -[node name="load_game" parent="." instance=ExtResource( 5 )] +[node name="load_game" parent="." instance=ExtResource("5")] visible = false -[node name="options" parent="." instance=ExtResource( 4 )] +[node name="options" parent="." instance=ExtResource("4")] visible = false [node name="main" type="Control" parent="."] @@ -45,7 +45,7 @@ __meta__ = { offset_top = 55.0 offset_right = 616.0 offset_bottom = 355.0 -texture = ExtResource( 3 ) +texture = ExtResource("3") __meta__ = { "_edit_use_anchors_": false } @@ -62,7 +62,7 @@ __meta__ = { [node name="new_game" type="Button" parent="main/main/buttons"] offset_right = 616.0 offset_bottom = 150.0 -custom_minimum_size = Vector2( 0, 150 ) +custom_minimum_size = Vector2(0, 150) size_flags_vertical = 3 text = "NEW_GAME" __meta__ = { @@ -74,7 +74,7 @@ offset_top = 160.0 offset_right = 616.0 offset_bottom = 180.0 text = "LOAD_GAME" -script = ExtResource( 2 ) +script = ExtResource("2") __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/escoria-ui-return-monkey-island/menus/options/options.gd.uid b/addons/escoria-ui-return-monkey-island/menus/options/options.gd.uid new file mode 100644 index 00000000..335451f2 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/options/options.gd.uid @@ -0,0 +1 @@ +uid://bjl2eag8hh30h diff --git a/addons/escoria-ui-return-monkey-island/menus/options/options.tscn b/addons/escoria-ui-return-monkey-island/menus/options/options.tscn index a6cf9fad..891a5808 100644 --- a/addons/escoria-ui-return-monkey-island/menus/options/options.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/options/options.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://csxvnrljbqkr8"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/flags/de.png" type="Texture2D" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.gd" type="Script" id=4] +[ext_resource type="Texture2D" uid="uid://srnd5fwltb6k" path="res://addons/escoria-ui-return-monkey-island/menus/options/flags/de.png" id="1"] +[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"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 4 ) +script = ExtResource("4") [node name="Panel" type="Panel" parent="."] anchor_right = 1.0 @@ -60,13 +60,13 @@ alignment = 1 [node name="TextureRect2" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"] offset_right = 125.0 offset_bottom = 75.0 -texture = ExtResource( 1 ) +texture = ExtResource("1") [node name="TextureRect3" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"] offset_left = 155.0 offset_right = 280.0 offset_bottom = 75.0 -texture = ExtResource( 1 ) +texture = ExtResource("1") [node name="label2" type="Label" parent="VBoxContainer/MarginContainer/options"] offset_top = 80.0 diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd.uid b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd.uid new file mode 100644 index 00000000..f2b96890 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd.uid @@ -0,0 +1 @@ +uid://ctu22fcrvjv4t diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn index 159a899b..afe4b6be 100644 --- a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn @@ -1,16 +1,16 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=7 format=3 uid="uid://dl7w8oqk1rmhw"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=2] -[ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=3] -[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" type="PackedScene" id=4] -[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=6] +[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="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="2"] +[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" 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://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="6"] [node name="pause_menu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="Panel" type="Panel" parent="."] anchor_right = 1.0 @@ -19,13 +19,13 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="save_game" parent="." instance=ExtResource( 4 )] +[node name="save_game" parent="." instance=ExtResource("4")] visible = false -[node name="load_game" parent="." instance=ExtResource( 5 )] +[node name="load_game" parent="." instance=ExtResource("5")] visible = false -[node name="options" parent="." instance=ExtResource( 2 )] +[node name="options" parent="." instance=ExtResource("2")] visible = false [node name="VBoxContainer" type="VBoxContainer" parent="."] @@ -41,7 +41,7 @@ alignment = 1 offset_top = 25.0 offset_right = 616.0 offset_bottom = 325.0 -texture = ExtResource( 3 ) +texture = ExtResource("3") __meta__ = { "_edit_use_anchors_": false } @@ -58,7 +58,7 @@ __meta__ = { [node name="continue" type="Button" parent="VBoxContainer/menuitems"] offset_right = 616.0 offset_bottom = 150.0 -custom_minimum_size = Vector2( 0, 150 ) +custom_minimum_size = Vector2(0, 150) size_flags_vertical = 3 text = "CONTINUE_GAME" __meta__ = { @@ -81,7 +81,7 @@ offset_right = 616.0 offset_bottom = 210.0 size_flags_vertical = 3 text = "SAVE_GAME" -script = ExtResource( 6 ) +script = ExtResource("6") __meta__ = { "_edit_use_anchors_": false } @@ -92,7 +92,7 @@ offset_right = 616.0 offset_bottom = 240.0 size_flags_vertical = 3 text = "LOAD_GAME" -script = ExtResource( 6 ) +script = ExtResource("6") __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd.uid b/addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd.uid new file mode 100644 index 00000000..9fc47d23 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd.uid @@ -0,0 +1 @@ +uid://c7y2f4rocpq4h diff --git a/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd.uid b/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd.uid new file mode 100644 index 00000000..d6667700 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd.uid @@ -0,0 +1 @@ +uid://bi51vsohi3n2y diff --git a/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd.uid b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd.uid new file mode 100644 index 00000000..756c09ba --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd.uid @@ -0,0 +1 @@ +uid://wras7d4a6gqu diff --git a/addons/escoria-ui-return-monkey-island/plugin.gd.uid b/addons/escoria-ui-return-monkey-island/plugin.gd.uid new file mode 100644 index 00000000..8cd244a5 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/plugin.gd.uid @@ -0,0 +1 @@ +uid://b6n4ilwn7a5d diff --git a/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd.uid b/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd.uid new file mode 100644 index 00000000..814bab39 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd.uid @@ -0,0 +1 @@ +uid://bdofg6b8f2p6c diff --git a/addons/escoria-ui-return-monkey-island/video_player/video_player.gd.uid b/addons/escoria-ui-return-monkey-island/video_player/video_player.gd.uid new file mode 100644 index 00000000..aa446448 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/video_player/video_player.gd.uid @@ -0,0 +1 @@ +uid://ckl3iy3v3v68s diff --git a/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn b/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn index 313e12b3..ba2961f5 100644 --- a/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn +++ b/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn @@ -1,32 +1,28 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=3 uid="uid://ctg3fukoficqk"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.gd" type="Script" id=1] -[ext_resource path="res://gymkhana.tres" type="Theme" id=2] +[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://djtwqnfbbt5t8" path="res://gymkhana.tres" id="2"] -[sub_resource type="VideoStreamTheora" id=1] +[sub_resource type="VideoStreamTheora" id="1"] -[sub_resource type="InputEventAction" id=2] -action = "ui_cancel" - -[sub_resource type="Shortcut" id=3] -shortcut = SubResource( 2 ) +[sub_resource type="Shortcut" id="3"] [node name="video_player" type="Control"] offset_right = 1285.0 offset_bottom = 753.0 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="ColorRect" type="ColorRect" parent="."] offset_left = -11.0 offset_top = -3.0 offset_right = 1285.0 offset_bottom = 766.0 -color = Color( 0, 0, 0, 1 ) +color = Color(0, 0, 0, 1) [node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."] offset_right = 1279.0 offset_bottom = 771.0 -stream = SubResource( 1 ) +stream = SubResource("1") expand = false [node name="Skip" type="Button" parent="."] @@ -34,9 +30,9 @@ offset_left = 1163.0 offset_top = 680.0 offset_right = 1250.0 offset_bottom = 712.0 -theme = ExtResource( 2 ) +theme = ExtResource("2") shortcut_in_tooltip = false -shortcut = SubResource( 3 ) +shortcut = SubResource("3") text = "Saltar video" [connection signal="finished" from="VideoStreamPlayer" to="." method="_on_VideoPlayer_finished"] diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 2f85291a..9f017497 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -1,50 +1,103 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=21 format=3 uid="uid://wx76bqug4qy8"] -[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" type="Texture2D" id=4] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" type="Texture2D" id=5] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" type="Texture2D" id=6] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" type="Texture2D" id=7] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" type="Texture2D" id=8] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" type="Texture2D" id=9] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" type="Texture2D" id=10] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" type="Texture2D" id=11] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" type="Texture2D" id=12] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" type="Texture2D" id=13] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" type="Texture2D" id=14] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" type="Texture2D" id=15] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" type="Texture2D" id=16] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" type="Texture2D" id=17] -[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" type="Texture2D" id=18] -[ext_resource path="res://gymkhana/characters/eneko/assets/speak-2.png" type="Texture2D" id=20] +[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://d3llwr16eq05e" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" id="4"] +[ext_resource type="Texture2D" uid="uid://bfsccuoj7pmbf" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" id="5"] +[ext_resource type="Texture2D" uid="uid://dttlqbxpeqwi2" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" id="6"] +[ext_resource type="Texture2D" uid="uid://cms1wfpspj3lm" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" id="7"] +[ext_resource type="Texture2D" uid="uid://dvn6aneqx6ki4" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" id="8"] +[ext_resource type="Texture2D" uid="uid://c3oauyuv2m63f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" id="9"] +[ext_resource type="Texture2D" uid="uid://dj3afybpcing3" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" id="10"] +[ext_resource type="Texture2D" uid="uid://b2fp3wx3yc4ac" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" id="11"] +[ext_resource type="Texture2D" uid="uid://dc18o6ownjk4f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" id="12"] +[ext_resource type="Texture2D" uid="uid://cwaa6byg1k8jp" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" id="13"] +[ext_resource type="Texture2D" uid="uid://b8dkc8xtqe4sh" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" id="14"] +[ext_resource type="Texture2D" uid="uid://bhj0jj26o1v24" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" id="15"] +[ext_resource type="Texture2D" uid="uid://cms3agh4k5nrs" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" id="16"] +[ext_resource type="Texture2D" uid="uid://deqj1jv3tlrnw" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" id="17"] +[ext_resource type="Texture2D" uid="uid://nrkwgky7ip6w" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" id="18"] +[ext_resource type="Texture2D" uid="uid://dh4jyr03r21c8" path="res://gymkhana/characters/eneko/assets/speak-2.png" id="20"] -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 20 ) -region = Rect2( 0, 0, 150, 256 ) +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("20") +region = Rect2(0, 0, 150, 256) -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ ExtResource( 7 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 14 ), ExtResource( 4 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 11 ), ExtResource( 10 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 9 ) ], +[sub_resource type="SpriteFrames" id="1"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("7") +}, { +"duration": 1.0, +"texture": ExtResource("5") +}, { +"duration": 1.0, +"texture": ExtResource("6") +}, { +"duration": 1.0, +"texture": ExtResource("14") +}, { +"duration": 1.0, +"texture": ExtResource("4") +}, { +"duration": 1.0, +"texture": ExtResource("15") +}, { +"duration": 1.0, +"texture": ExtResource("16") +}, { +"duration": 1.0, +"texture": ExtResource("11") +}, { +"duration": 1.0, +"texture": ExtResource("10") +}, { +"duration": 1.0, +"texture": ExtResource("8") +}, { +"duration": 1.0, +"texture": ExtResource("7") +}, { +"duration": 1.0, +"texture": ExtResource("12") +}, { +"duration": 1.0, +"texture": ExtResource("13") +}, { +"duration": 1.0, +"texture": ExtResource("18") +}, { +"duration": 1.0, +"texture": ExtResource("17") +}, { +"duration": 1.0, +"texture": ExtResource("9") +}], "loop": true, -"name": "idle", +"name": &"idle", "speed": 5.0 }, { -"frames": [ ExtResource( 7 ), SubResource( 2 ) ], +"frames": [{ +"duration": 1.0, +"texture": ExtResource("7") +}, { +"duration": 1.0, +"texture": SubResource("2") +}], "loop": true, -"name": "speak", +"name": &"speak", "speed": 5.0 -} ] +}] [node name="ESCPlayerWithTooltip2" type="Area2D"] process_mode = 1 -script = ExtResource( 2 ) +script = ExtResource("2") global_id = "eneko_smoking" esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" is_movable = true -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0.584314, 0.490196, 0.270588, 1) custom_data = { "tooltips": { "action1": "cocina_delante_eneko_smoking_action1", @@ -54,22 +107,22 @@ custom_data = { action3_target_texts = { "turno_cocina_cuchillo": "Amenzar", "turno_cocina_frontal": "Ofrecer", -"turno_cocina_mechero": "Ofrecer", -"turno_cocina_madera": "Ofrecerle leña" +"turno_cocina_madera": "Ofrecerle leña", +"turno_cocina_mechero": "Ofrecer" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] selectable = true -animations = ExtResource( 1 ) +animations = ExtResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2( 32.625, -50.56 ) -scale = Vector2( 0.8, 0.8 ) -frames = SubResource( 1 ) +position = Vector2(32.625, -50.56) +scale = Vector2(0.8, 0.8) +frames = SubResource("1") animation = "speak" flip_h = true [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( 36, -253 ) +position = Vector2(36, -253) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -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 ) +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) diff --git a/gymkhana/characters/eneko/eneko_smoking_animatios.tres b/gymkhana/characters/eneko/eneko_smoking_animatios.tres index ed73ea95..c90f65b3 100644 --- a/gymkhana/characters/eneko/eneko_smoking_animatios.tres +++ b/gymkhana/characters/eneko/eneko_smoking_animatios.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://c4lhcwvjqx5ty"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] +[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"] +[ext_resource type="Script" uid="uid://clixil1u5exq7" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] [sub_resource type="Resource" id="1"] script = ExtResource("2") diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn index e5624670..8217b740 100644 --- a/gymkhana/characters/oier/oier.tscn +++ b/gymkhana/characters/oier/oier.tscn @@ -1,219 +1,272 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=32 format=3 uid="uid://cjmsexhyhi4vs"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3] -[ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture2D" id=4] +[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="Texture2D" uid="uid://b2msjygw7oyi0" path="res://gymkhana/characters/oier/oier-mod.png" id="2"] +[ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"] +[ext_resource type="Texture2D" uid="uid://bcs6kqj5w23vk" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"] -[sub_resource type="AtlasTexture" id=22] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 5733, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="22"] +atlas = ExtResource("2") +region = Rect2(5733, 0, 273, 795) -[sub_resource type="AtlasTexture" id=23] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 5460, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="23"] +atlas = ExtResource("2") +region = Rect2(5460, 0, 273, 795) -[sub_resource type="AtlasTexture" id=24] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 4368, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="24"] +atlas = ExtResource("2") +region = Rect2(4368, 0, 273, 795) -[sub_resource type="AtlasTexture" id=25] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 5187, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="25"] +atlas = ExtResource("2") +region = Rect2(5187, 0, 273, 795) -[sub_resource type="AtlasTexture" id=26] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 4641, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="26"] +atlas = ExtResource("2") +region = Rect2(4641, 0, 273, 795) -[sub_resource type="AtlasTexture" id=27] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1638, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="27"] +atlas = ExtResource("2") +region = Rect2(1638, 0, 273, 795) -[sub_resource type="AtlasTexture" id=59] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 5733, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="59"] +atlas = ExtResource("2") +region = Rect2(5733, 0, 273, 795) -[sub_resource type="AtlasTexture" id=60] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 5733, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="60"] +atlas = ExtResource("4") +region = Rect2(5733, 0, 273, 795) -[sub_resource type="AtlasTexture" id=46] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 3549, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="46"] +atlas = ExtResource("2") +region = Rect2(3549, 0, 273, 795) -[sub_resource type="AtlasTexture" id=47] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 3822, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="47"] +atlas = ExtResource("2") +region = Rect2(3822, 0, 273, 795) -[sub_resource type="AtlasTexture" id=48] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 4095, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="48"] +atlas = ExtResource("2") +region = Rect2(4095, 0, 273, 795) -[sub_resource type="AtlasTexture" id=49] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 2184, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="49"] +atlas = ExtResource("2") +region = Rect2(2184, 0, 273, 795) -[sub_resource type="AtlasTexture" id=50] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 2457, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="50"] +atlas = ExtResource("2") +region = Rect2(2457, 0, 273, 795) -[sub_resource type="AtlasTexture" id=51] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 2730, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="51"] +atlas = ExtResource("2") +region = Rect2(2730, 0, 273, 795) -[sub_resource type="AtlasTexture" id=52] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 3003, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="52"] +atlas = ExtResource("2") +region = Rect2(3003, 0, 273, 795) -[sub_resource type="AtlasTexture" id=53] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 3276, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="53"] +atlas = ExtResource("2") +region = Rect2(3276, 0, 273, 795) -[sub_resource type="AtlasTexture" id=54] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 0, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="54"] +atlas = ExtResource("2") +region = Rect2(0, 0, 273, 795) -[sub_resource type="AtlasTexture" id=55] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 273, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="55"] +atlas = ExtResource("2") +region = Rect2(273, 0, 273, 795) -[sub_resource type="AtlasTexture" id=56] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 546, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="56"] +atlas = ExtResource("2") +region = Rect2(546, 0, 273, 795) -[sub_resource type="AtlasTexture" id=57] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 819, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="57"] +atlas = ExtResource("2") +region = Rect2(819, 0, 273, 795) -[sub_resource type="AtlasTexture" id=58] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1092, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="58"] +atlas = ExtResource("2") +region = Rect2(1092, 0, 273, 795) -[sub_resource type="AtlasTexture" id=42] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1365, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="42"] +atlas = ExtResource("2") +region = Rect2(1365, 0, 273, 795) -[sub_resource type="AtlasTexture" id=43] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1638, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="43"] +atlas = ExtResource("2") +region = Rect2(1638, 0, 273, 795) -[sub_resource type="AtlasTexture" id=44] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1911, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="44"] +atlas = ExtResource("2") +region = Rect2(1911, 0, 273, 795) -[sub_resource type="AtlasTexture" id=45] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 1638, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id="45"] +atlas = ExtResource("2") +region = Rect2(1638, 0, 273, 795) -[sub_resource type="SpriteFrames" id=20] -animations = [ { -"frames": [ SubResource( 22 ) ], +[sub_resource type="SpriteFrames" id="20"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("22") +}], "loop": true, -"name": "idle_down", +"name": &"idle_down", "speed": 5.0 }, { -"frames": [ SubResource( 23 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("23") +}], "loop": true, -"name": "idle_down_left", +"name": &"idle_down_left", "speed": 5.0 }, { -"frames": [ SubResource( 24 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("24") +}], "loop": true, -"name": "idle_down_right", +"name": &"idle_down_right", "speed": 5.0 }, { -"frames": [ SubResource( 25 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("25") +}], "loop": true, -"name": "idle_left", +"name": &"idle_left", "speed": 5.0 }, { -"frames": [ SubResource( 26 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("26") +}], "loop": true, -"name": "idle_right", +"name": &"idle_right", "speed": 5.0 }, { -"frames": [ SubResource( 27 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("27") +}], "loop": true, -"name": "idle_up", +"name": &"idle_up", "speed": 5.0 }, { -"frames": [ SubResource( 59 ), SubResource( 60 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("59") +}, { +"duration": 1.0, +"texture": SubResource("60") +}], "loop": true, -"name": "speak_down", +"name": &"speak_down", "speed": 5.0 }, { -"frames": [ SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 47 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("46") +}, { +"duration": 1.0, +"texture": SubResource("47") +}, { +"duration": 1.0, +"texture": SubResource("48") +}, { +"duration": 1.0, +"texture": SubResource("47") +}], "loop": true, -"name": "walk_down", +"name": &"walk_down", "speed": 5.0 }, { -"frames": [ SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ), SubResource( 53 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("49") +}, { +"duration": 1.0, +"texture": SubResource("50") +}, { +"duration": 1.0, +"texture": SubResource("51") +}, { +"duration": 1.0, +"texture": SubResource("52") +}, { +"duration": 1.0, +"texture": SubResource("53") +}], "loop": true, -"name": "walk_left", +"name": &"walk_left", "speed": 5.0 }, { -"frames": [ SubResource( 54 ), SubResource( 55 ), SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("54") +}, { +"duration": 1.0, +"texture": SubResource("55") +}, { +"duration": 1.0, +"texture": SubResource("56") +}, { +"duration": 1.0, +"texture": SubResource("57") +}, { +"duration": 1.0, +"texture": SubResource("58") +}], "loop": true, -"name": "walk_right", +"name": &"walk_right", "speed": 5.0 }, { -"frames": [ SubResource( 42 ), SubResource( 43 ), SubResource( 44 ), SubResource( 45 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("42") +}, { +"duration": 1.0, +"texture": SubResource("43") +}, { +"duration": 1.0, +"texture": SubResource("44") +}, { +"duration": 1.0, +"texture": SubResource("45") +}], "loop": true, -"name": "walk_up", +"name": &"walk_up", "speed": 5.0 -} ] +}] -[sub_resource type="CapsuleShape2D" id=21] +[sub_resource type="CapsuleShape2D" id="21"] radius = 53.0 height = 208.0 [node name="ESCPlayerWithTooltip" type="Area2D"] process_mode = 1 -position = Vector2( -5, 0 ) -script = ExtResource( 1 ) +position = Vector2(-5, 0) +script = ExtResource("1") global_id = "player" esc_script = "res://gymkhana/characters/oier/oier.esc" is_interactive = false is_movable = true default_action = "action1" -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 ) -animations = ExtResource( 3 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0.321569, 0.662745, 0.301961, 1) +animations = ExtResource("3") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2( 0, -155 ) -scale = Vector2( 0.389246, 0.389247 ) -frames = SubResource( 20 ) +position = Vector2(0, -155) +scale = Vector2(0.389246, 0.389247) +frames = SubResource("20") animation = "speak_down" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 5, -151 ) -shape = SubResource( 21 ) +position = Vector2(5, -151) +shape = SubResource("21") [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( 1, -473 ) +position = Vector2(1, -473) diff --git a/gymkhana/characters/oier/oier_animations.tres b/gymkhana/characters/oier/oier_animations.tres index 45646ec7..53cdc274 100644 --- a/gymkhana/characters/oier/oier_animations.tres +++ b/gymkhana/characters/oier/oier_animations.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=36 format=3 uid="uid://cyjo7aq0e4hbe"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" id="1"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" id="2"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] +[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"] +[ext_resource type="Script" uid="uid://clixil1u5exq7" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] [sub_resource type="Resource" id="1"] script = ExtResource("2") diff --git a/gymkhana/characters/talking-heads/eneko.tscn b/gymkhana/characters/talking-heads/eneko.tscn index e1698f78..15ec6f8f 100644 --- a/gymkhana/characters/talking-heads/eneko.tscn +++ b/gymkhana/characters/talking-heads/eneko.tscn @@ -1,49 +1,55 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=9 format=3 uid="uid://cnpjc4783bqsj"] -[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png" type="Texture2D" id=3] +[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://c5g44ifbgf5fo" path="res://gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png" id="3"] -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("3") +region = Rect2(0, 0, 72, 72) -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="3"] +atlas = ExtResource("3") +region = Rect2(0, 0, 72, 72) -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 72, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="4"] +atlas = ExtResource("3") +region = Rect2(72, 0, 72, 72) -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ SubResource( 2 ) ], +[sub_resource type="SpriteFrames" id="1"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("2") +}], "loop": true, -"name": "idle", +"name": &"idle", "speed": 5.0 }, { -"frames": [ SubResource( 3 ), SubResource( 4 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("3") +}, { +"duration": 1.0, +"texture": SubResource("4") +}], "loop": true, -"name": "speak", +"name": &"speak", "speed": 5.0 -} ] +}] -[sub_resource type="CircleShape2D" id=5] +[sub_resource type="CircleShape2D" id="5"] radius = 40.1123 [node name="ESCPlayerWithTooltip2" type="Area2D"] process_mode = 1 -script = ExtResource( 2 ) +script = ExtResource("2") global_id = "eneko_head" is_interactive = false is_movable = true player_orients_on_arrival = false -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0, 0.560784, 0.0470588, 1 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0, 0.560784, 0.0470588, 1) custom_data = { "tooltips": { "action1": "cocina_delante_eneko_smoking_action1", @@ -54,20 +60,20 @@ action3_target_texts = { "turno_cocina_frontal": "Ofrecer", "turno_cocina_madera": "Ofrecerle leña" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] selectable = true -animations = ExtResource( 1 ) +animations = ExtResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2( -1, 0 ) -scale = Vector2( 1.67778, 1.67778 ) -frames = SubResource( 1 ) +position = Vector2(-1, 0) +scale = Vector2(1.67778, 1.67778) +frames = SubResource("1") animation = "speak" flip_h = true [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( -1, -153 ) +position = Vector2(-1, -153) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 1 ) -shape = SubResource( 5 ) +position = Vector2(0, 1) +shape = SubResource("5") diff --git a/gymkhana/characters/talking-heads/oier.tscn b/gymkhana/characters/talking-heads/oier.tscn index e1dcfb3c..96308361 100644 --- a/gymkhana/characters/talking-heads/oier.tscn +++ b/gymkhana/characters/talking-heads/oier.tscn @@ -1,49 +1,55 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=9 format=3 uid="uid://cepk612gi1akw"] -[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/characters/talking-heads/assets/oier-avatar-talking.png" type="Texture2D" id=3] +[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://c7y54yhu3kxh5" path="res://gymkhana/characters/talking-heads/assets/oier-avatar-talking.png" id="3"] -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("3") +region = Rect2(0, 0, 72, 72) -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="3"] +atlas = ExtResource("3") +region = Rect2(0, 0, 72, 72) -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 72, 0, 72, 72 ) +[sub_resource type="AtlasTexture" id="4"] +atlas = ExtResource("3") +region = Rect2(72, 0, 72, 72) -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ SubResource( 2 ) ], +[sub_resource type="SpriteFrames" id="1"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("2") +}], "loop": true, -"name": "idle", +"name": &"idle", "speed": 5.0 }, { -"frames": [ SubResource( 3 ), SubResource( 4 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("3") +}, { +"duration": 1.0, +"texture": SubResource("4") +}], "loop": true, -"name": "speak", +"name": &"speak", "speed": 5.0 -} ] +}] -[sub_resource type="CircleShape2D" id=5] +[sub_resource type="CircleShape2D" id="5"] radius = 40.1123 [node name="ESCPlayerWithTooltip2" type="Area2D"] process_mode = 1 -script = ExtResource( 2 ) +script = ExtResource("2") global_id = "oier_head" is_interactive = false is_movable = true player_orients_on_arrival = false -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0.584314, 0.490196, 0.270588, 1) custom_data = { "tooltips": { "action1": "cocina_delante_eneko_smoking_action1", @@ -54,21 +60,21 @@ action3_target_texts = { "turno_cocina_frontal": "Ofrecer", "turno_cocina_madera": "Ofrecerle leña" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] selectable = true -animations = ExtResource( 1 ) +animations = ExtResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2( -1, 0 ) -scale = Vector2( 1.67778, 1.67778 ) -frames = SubResource( 1 ) +position = Vector2(-1, 0) +scale = Vector2(1.67778, 1.67778) +frames = SubResource("1") animation = "speak" flip_h = true [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( -1, -153 ) +position = Vector2(-1, -153) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false -position = Vector2( 0, 1 ) -shape = SubResource( 5 ) +position = Vector2(0, 1) +shape = SubResource("5") diff --git a/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd.uid b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd.uid new file mode 100644 index 00000000..780061fa --- /dev/null +++ b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd.uid @@ -0,0 +1 @@ +uid://con0lpnpm1118 diff --git a/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd.uid b/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd.uid new file mode 100644 index 00000000..814b5b3f --- /dev/null +++ b/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd.uid @@ -0,0 +1 @@ +uid://uadel3g82io diff --git a/gymkhana/items/inventory/turno_cocina_ajo.tscn b/gymkhana/items/inventory/turno_cocina_ajo.tscn index 2d4cd884..9a5c0d6a 100644 --- a/gymkhana/items/inventory/turno_cocina_ajo.tscn +++ b/gymkhana/items/inventory/turno_cocina_ajo.tscn @@ -1,28 +1,28 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://84h4l81cuwdv"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" type="Texture2D" id=2] +[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/inventory/assets/turno_cocina_ajo.png" id="2"] [node name="turno_cocina_ajo" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_ajo" esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_turno_cocina_ajo_action1", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_turno_cocina_ajo_action1", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2( 0.101548, 0.101548 ) -texture = ExtResource( 2 ) +scale = Vector2(0.101548, 0.101548) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -7, -6, 7, -6, 7, 6, -7, 6 ) +polygon = PackedVector2Array(-7, -6, 7, -6, 7, 6, -7, 6) diff --git a/gymkhana/items/inventory/turno_cocina_bol.tscn b/gymkhana/items/inventory/turno_cocina_bol.tscn index fa01dfd3..cbecddea 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol.tscn @@ -1,29 +1,25 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=3 uid="uid://cpeqaymxabewi"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[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/inventory/assets/turno_cocina_bol_inventario.png" id="2"] [node name="turno_cocina_bol" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_bol" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_turno_cocina_bol_action1", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_turno_cocina_bol_action1", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } action3_target_texts = { "turno_cocina_peso": "tooltip_turno_cocina_bol_action3_turno_cocina_peso" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] animations = null diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn index eff24b7b..abe0d2c8 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn @@ -1,37 +1,37 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://b05fu1g1rlt0o"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://dr7ok8ghysg5k" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_bol_lentejas" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_bol_lentejas" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" } -combine_when_selected_action_is_in = [ "action4" ] +} +combine_when_selected_action_is_in = ["action4"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn index bc46ac58..fb006610 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton.tscn @@ -1,33 +1,33 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://dyejne0ibag68"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture2D" id=3] +[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://qkq00po4xvto" path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dfxjkbugt0jld" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" id="3"] [node name="turno_cocina_carton" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_carton" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 3 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("3") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } action3_target_texts = { "turno_cocina_mechero": "tooltip_turno_cocina_carton_action3_turno_cocina_mechero" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource( 2 ) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17 ) +polygon = PackedVector2Array(-23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17) diff --git a/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn index 5f561e19..8e385b93 100644 --- a/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn @@ -1,29 +1,29 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://6xkiwvpg2xb"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_encendido.png" type="Texture2D" id=2] +[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://symk7uy7p8es" path="res://gymkhana/items/inventory/assets/turno_cocina_carton_encendido.png" id="2"] [node name="turno_cocina_carton_encendido" type="Area2D"] process_mode = 1 rotation = 1.11177 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_carton_encendido" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton_encendido.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) +polygon = PackedVector2Array(-13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12) diff --git a/gymkhana/items/inventory/turno_cocina_cuchillo.tscn b/gymkhana/items/inventory/turno_cocina_cuchillo.tscn index d3f1fefa..b1ad70fb 100644 --- a/gymkhana/items/inventory/turno_cocina_cuchillo.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuchillo.tscn @@ -1,20 +1,20 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://2xsjq7rgjcl"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuchillo.png" type="Texture2D" id=2] +[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://4a3fnm5xx1gy" path="res://gymkhana/items/inventory/assets/turno_cocina_cuchillo.png" id="2"] [node name="turno_cocina_cuchillo" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_cuchillo" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuchillo.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) animations = null custom_data = { - "tooltips": { - "action3": "tooltip_common_look", - "action4": "tooltip_common_use", - } +"tooltips": { +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn index e086080e..2b4a36a7 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn @@ -1,30 +1,30 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://igj2f3midaad"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" type="Texture2D" id=3] +[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://d33c6oen4di3s" path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bmrurk8dpgeci" path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" id="3"] [node name="turno_cocina_cuerno" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_cuerno" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 3 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = [] +inventory_texture = ExtResource("3") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_turno_cocina_cuerno_action1", - "action2": "tooltip_turno_cocina_cuerno_action2", - "action3": "tooltip_turno_cocina_cuerno_action3", - "action4": "tooltip_turno_cocina_cuerno_action4" - } +"tooltips": { +"action1": "tooltip_turno_cocina_cuerno_action1", +"action2": "tooltip_turno_cocina_cuerno_action2", +"action3": "tooltip_turno_cocina_cuerno_action3", +"action4": "tooltip_turno_cocina_cuerno_action4" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( 8.125, -8.125 ) -texture = ExtResource( 2 ) +position = Vector2(8.125, -8.125) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -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 ) +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) diff --git a/gymkhana/items/inventory/turno_cocina_frontal.tscn b/gymkhana/items/inventory/turno_cocina_frontal.tscn index 36a637a2..64cb2a36 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.tscn +++ b/gymkhana/items/inventory/turno_cocina_frontal.tscn @@ -1,37 +1,37 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://bxwikger8m82p"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://p4ng8m5u1w58" path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_frontal" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_frontal" esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action3": "tooltip_frontal_action3", - "action4": "tooltip_frontal_action4" - } +"tooltips": { +"action3": "tooltip_frontal_action3", +"action4": "tooltip_frontal_action4" } -combine_when_selected_action_is_in = [ "action4" ] +} +combine_when_selected_action_is_in = ["action4"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn index b2e14e23..3b011b92 100644 --- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn +++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn @@ -1,21 +1,21 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://bnf0ylqtnajms"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" type="Texture2D" id=2] +[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://7hcp3g8e17po" path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" id="2"] [node name="turno_cocina_libro_de_cocina" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_libro_de_cocina" esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = [] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - "action3": "tooltip_turno_cocina_libro_de_cocina_action3" - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick", +"action3": "tooltip_turno_cocina_libro_de_cocina_action3" +} } animations = null diff --git a/gymkhana/items/inventory/turno_cocina_madera.tscn b/gymkhana/items/inventory/turno_cocina_madera.tscn index fc863c13..a7facc16 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.tscn +++ b/gymkhana/items/inventory/turno_cocina_madera.tscn @@ -1,26 +1,22 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=3 uid="uid://cbsyjat8xvwfx"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[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://bmivmrciqatkc" path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" id="2"] [node name="turno_cocina_madera" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_madera" esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_cocina_delante_madera_action1", - "action2": "tooltip_cocina_delante_madera_action2", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_cocina_delante_madera_action1", +"action2": "tooltip_cocina_delante_madera_action2", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null -combine_when_selected_action_is_in = [ "action4" ] +combine_when_selected_action_is_in = ["action4"] diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index d767b299..f93f34ec 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -1,30 +1,30 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://bxjtxquhseqdp"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" type="Texture2D" id=2] +[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://p48fq13qx3d5" path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" id="2"] [node name="turno_cocina_mechero" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_mechero" esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) +polygon = PackedVector2Array(-15, -29, 3, -33, 10, 30, -3, 32) diff --git a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn index 5ae5cd71..7a48d317 100644 --- a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn +++ b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn @@ -1,26 +1,26 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=6 format=3 uid="uid://d1ust40cvfjtw"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture2D" id=3] -[ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=4] -[ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" type="Script" id=5] +[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://dhh7ya2ab1eax" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"] +[ext_resource type="PackedScene" path="res://gymkhana/particles/SmokeParticles.tscn" id="4"] +[ext_resource type="Script" uid="uid://con0lpnpm1118" path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" id="5"] [node name="turno_cocina_olla_llena" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_olla_llena" esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc" interaction_direction = 3 -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look_inside", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_look_inside", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } action3_target_texts = { "turno_cocina_ajo": "tooltip_turno_cocina_olla_llena_action3_drop_in", @@ -29,14 +29,14 @@ action3_target_texts = { "turno_cocina_patata": "tooltip_turno_cocina_olla_llena_action3_drop_in", "turno_cocina_romero": "tooltip_turno_cocina_olla_llena_action3_drop_in" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource( 3 ) +texture = ExtResource("3") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 ) +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 )] -script = ExtResource( 5 ) +[node name="SmokeParticles" parent="." instance=ExtResource("4")] +script = ExtResource("5") diff --git a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn index 46dd122b..cdb37114 100644 --- a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn +++ b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn @@ -1,24 +1,24 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://dgucic2086suo"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture2D" id=3] +[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://pxtnkcvfou4s" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"] [node name="turno_cocina_olla_vacia" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_olla_vacia" esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null action3_target_texts = { @@ -27,10 +27,10 @@ action3_target_texts = { "turno_cocina_patata": "tooltip_turno_cocina_olla_vacia_action3_drop_in", "turno_cocina_romero": "tooltip_turno_cocina_olla_vacia_action3_drop_in" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource( 3 ) +texture = ExtResource("3") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -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 ) +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) diff --git a/gymkhana/items/inventory/turno_cocina_patata.tscn b/gymkhana/items/inventory/turno_cocina_patata.tscn index 23005ff7..32416a1d 100644 --- a/gymkhana/items/inventory/turno_cocina_patata.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata.tscn @@ -1,50 +1,57 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://d3kv08rpj3upm"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://djkmw4bj8siok" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_patata" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_patata" esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) -combine_when_selected_action_is_in = [ "action4" ] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) +combine_when_selected_action_is_in = ["action4"] action3_target_texts = { "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_action3_turno_cocina_cuchillo" } action4_target_texts = { "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_action4_turno_cocina_cuchillo" } -target_when_selected_action_is_in = [ "action3", "action4" ] +target_when_selected_action_is_in = ["action3", "action4"] animations = null custom_data = { - "count_textures": [ - { "start": 1, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" }, - { "start": 2, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" }, - { "start": 3, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" }, - { "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" }, - ], - "tooltips": { - "action3": "tooltip_turno_cocina_patata_action3", - "action4": "tooltip_common_use", - } +"count_textures": [{ +"start": 1, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" +}, { +"start": 2, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_dos_patatas.png" +}, { +"start": 3, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_tres_patatas.png" +}, { +"start": 4, +"texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" +}], +"tooltips": { +"action3": "tooltip_turno_cocina_patata_action3", +"action4": "tooltip_common_use" +} } [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn index ab89ddf5..267fbc29 100644 --- a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn @@ -1,16 +1,16 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://b3owsy6kidijt"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" type="Texture2D" id=2] +[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://bbh0brigmhtfb" path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" id="2"] [node name="turno_cocina_patata_grande" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_patata_grande" esc_script = "res://gymkhana/items/inventory/turno_cocina_patata_grande.esc" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = [] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) animations = null action3_target_texts = { "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_grande_action3_turno_cocina_cuchillo" @@ -18,4 +18,4 @@ action3_target_texts = { action4_target_texts = { "turno_cocina_cuchillo": "tooltip_turno_cocina_patata_grande_action4_turno_cocina_cuchillo" } -target_when_selected_action_is_in = [ "action3", "action4" ] +target_when_selected_action_is_in = ["action3", "action4"] diff --git a/gymkhana/items/inventory/turno_cocina_pegatina.tscn b/gymkhana/items/inventory/turno_cocina_pegatina.tscn index 29ec985b..807d935c 100644 --- a/gymkhana/items/inventory/turno_cocina_pegatina.tscn +++ b/gymkhana/items/inventory/turno_cocina_pegatina.tscn @@ -1,27 +1,27 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://b5vlbiy057rdr"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_pegatina.png" type="Texture2D" id=2] +[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://dqaspgf1h1f5j" path="res://gymkhana/items/inventory/assets/turno_cocina_pegatina.png" id="2"] [node name="turno_cocina_pegatina" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_pegatina" esc_script = "res://gymkhana/items/inventory/turno_cocina_pegatina.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action3": "tooltip_common_look", - } +"tooltips": { +"action3": "tooltip_common_look" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) +polygon = PackedVector2Array(-15, -29, 3, -33, 10, 30, -3, 32) diff --git a/gymkhana/items/inventory/turno_cocina_peso.tscn b/gymkhana/items/inventory/turno_cocina_peso.tscn index feddc199..cbd60740 100644 --- a/gymkhana/items/inventory/turno_cocina_peso.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso.tscn @@ -1,33 +1,32 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://cwlq5pqwktbul"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=3] +[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://bhomm5rmi8fnr" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="2"] +[ext_resource type="Texture2D" uid="uid://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="3"] [node name="turno_cocina_peso" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_peso" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 3 ) -dialog_color = Color( 1, 1, 1, 1 ) - +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("3") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_whats_this", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_whats_this", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } action3_target_texts = { "turno_cocina_bol": "tooltip_cocina_peso_action3_bol" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] rotation = -0.0698132 -scale = Vector2( 0.18, 0.18 ) -texture = ExtResource( 2 ) +scale = Vector2(0.18, 0.18) +texture = ExtResource("2") diff --git a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn index 081fbbaf..ef0e13c8 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn @@ -1,40 +1,40 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://dw8gujjmgq7g2"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_bol.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://uqi3bk65j7y4" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_bol.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_peso_bol" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_peso_bol" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc" -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_whats_this", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_whats_this", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" } -target_when_selected_action_is_in = [ "action3" ] +} +target_when_selected_action_is_in = ["action3"] animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn index 59a1ff69..ea9ad2c9 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn @@ -1,38 +1,38 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://bo0acekt13ip2"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_peso_inventario" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_peso_inventario" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_whats_this", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_whats_this", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/items/inventory/turno_cocina_peso_usado.tscn b/gymkhana/items/inventory/turno_cocina_peso_usado.tscn index 4ebca36b..a88f3703 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_usado.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_usado.tscn @@ -1,25 +1,24 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://e12h06462p6d"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=3] +[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://bhomm5rmi8fnr" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="2"] +[ext_resource type="Texture2D" uid="uid://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="3"] [node name="turno_cocina_peso_usado" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_peso_usado" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_usado.esc" -inventory_texture = ExtResource( 3 ) -dialog_color = Color( 1, 1, 1, 1 ) - +inventory_texture = ExtResource("3") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action3": "tooltip_common_look" - } +"tooltips": { +"action3": "tooltip_common_look" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] rotation = -0.0698132 -scale = Vector2( 0.18, 0.18 ) -texture = ExtResource( 2 ) +scale = Vector2(0.18, 0.18) +texture = ExtResource("2") diff --git a/gymkhana/items/inventory/turno_cocina_romero.tscn b/gymkhana/items/inventory/turno_cocina_romero.tscn index 66704f06..bf8e219d 100644 --- a/gymkhana/items/inventory/turno_cocina_romero.tscn +++ b/gymkhana/items/inventory/turno_cocina_romero.tscn @@ -1,23 +1,23 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://bu2xpoyifwi5o"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" type="Texture2D" id=2] +[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://de48ulmglepy5" path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" id="2"] [node name="turno_cocina_romero" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_romero" esc_script = "res://gymkhana/items/inventory/turno_cocina_romero.esc" interaction_direction = 6 -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = ["action4"] +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_whats_this", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_whats_this", +"action4": "tooltip_common_use" +} } animations = null diff --git a/gymkhana/items/inventory/turno_cocina_salero.tscn b/gymkhana/items/inventory/turno_cocina_salero.tscn index ecd5d969..b8a87dbe 100644 --- a/gymkhana/items/inventory/turno_cocina_salero.tscn +++ b/gymkhana/items/inventory/turno_cocina_salero.tscn @@ -1,38 +1,38 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://b67y8qg7m5lgh"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_salero.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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://bsrvyf0yafpma" path="res://gymkhana/items/inventory/assets/turno_cocina_salero.png" id="2"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="turno_cocina_salero" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_salero" esc_script = "res://gymkhana/items/inventory/turno_cocina_salero.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = ExtResource("2") +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_whats_this", - "action2": "tooltip_common_pick", - "action3": "tooltip_common_look", - "action4": "tooltip_common_use" - } +"tooltips": { +"action1": "tooltip_common_whats_this", +"action2": "tooltip_common_pick", +"action3": "tooltip_common_look", +"action4": "tooltip_common_use" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("2") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +position = Vector2(-51, 69) +script = ExtResource("3") diff --git a/gymkhana/particles/SmokeParticles.tscn b/gymkhana/particles/SmokeParticles.tscn index c34733b8..7d150dca 100644 --- a/gymkhana/particles/SmokeParticles.tscn +++ b/gymkhana/particles/SmokeParticles.tscn @@ -1,31 +1,31 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://d7l30s558mvd"] -[ext_resource path="res://gymkhana/particles/assets/smoke.png" type="Texture2D" id=1] +[ext_resource type="Texture2D" uid="uid://dape7b8kflfgf" path="res://gymkhana/particles/assets/smoke.png" id="1"] -[sub_resource type="Curve" id=1] -min_value = -360.0 -max_value = 360.0 -_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 13.0909 ), 0.0, 0.0, 0, 0 ] +[sub_resource type="Curve" id="1"] +_limits = [-360.0, 360.0, 0.0, 1.0] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 13.0909), 0.0, 0.0, 0, 0] +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 ) +[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"] -position = Vector2( -2, -63 ) -scale = Vector2( 1.48, 1 ) +position = Vector2(-2, -63) +scale = Vector2(1.48, 1) amount = 20 lifetime = 2.0 speed_scale = 0.63 explosiveness = 0.06 randomness = 0.84 lifetime_randomness = 0.55 -texture = ExtResource( 1 ) +texture = ExtResource("1") emission_shape = 1 emission_sphere_radius = 1.0 -direction = Vector2( 0, 1 ) +direction = Vector2(0, 1) spread = 103.24 -gravity = Vector2( 0, -98 ) +gravity = Vector2(0, -98) angular_velocity = 42.36 -angular_velocity_curve = SubResource( 1 ) +angular_velocity_curve = SubResource("1") scale_amount_random = 0.1 -color_ramp = SubResource( 2 ) +color_ramp = SubResource("2") diff --git a/gymkhana/rooms/intro/intro_room.tscn b/gymkhana/rooms/intro/intro_room.tscn index 5cc6b150..154c3f78 100644 --- a/gymkhana/rooms/intro/intro_room.tscn +++ b/gymkhana/rooms/intro/intro_room.tscn @@ -1,281 +1,293 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=17 format=3 uid="uid://bhbg8bu70suwo"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3] -[ext_resource path="res://gymkhana/rooms/intro/escoria_background.png" type="Texture2D" id=4] -[ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" type="Texture2D" id=5] -[ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet.png" type="Texture2D" id=6] -[ext_resource path="res://gymkhana/rooms/intro/intro_background_space.png" type="Texture2D" id=7] +[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://j8g8uv6qisoj" path="res://gymkhana/rooms/intro/escoria_background.png" id="4"] +[ext_resource type="Texture2D" uid="uid://dubihfjeptqqi" path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" id="5"] +[ext_resource type="Texture2D" uid="uid://do6yakpk8w4ct" path="res://gymkhana/rooms/intro/escoria-logo-comet.png" id="6"] +[ext_resource type="Texture2D" uid="uid://c7tkx0w1rpnj7" path="res://gymkhana/rooms/intro/intro_background_space.png" id="7"] -[sub_resource type="AtlasTexture" id=1] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 0, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("5") +region = Rect2(0, 0, 340, 400) -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 340, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("5") +region = Rect2(340, 0, 340, 400) -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 680, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="3"] +atlas = ExtResource("5") +region = Rect2(680, 0, 340, 400) -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 1020, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="4"] +atlas = ExtResource("5") +region = Rect2(1020, 0, 340, 400) -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 1360, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="5"] +atlas = ExtResource("5") +region = Rect2(1360, 0, 340, 400) -[sub_resource type="AtlasTexture" id=6] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 1700, 0, 340, 400 ) +[sub_resource type="AtlasTexture" id="6"] +atlas = ExtResource("5") +region = Rect2(1700, 0, 340, 400) -[sub_resource type="SpriteFrames" id=7] -animations = [ { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ], +[sub_resource type="SpriteFrames" id="7"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("1") +}, { +"duration": 1.0, +"texture": SubResource("2") +}, { +"duration": 1.0, +"texture": SubResource("3") +}, { +"duration": 1.0, +"texture": SubResource("4") +}, { +"duration": 1.0, +"texture": SubResource("5") +}, { +"duration": 1.0, +"texture": SubResource("6") +}], "loop": true, -"name": "default", +"name": &"default", "speed": 10.0 -} ] +}] -[sub_resource type="Animation" id=8] +[sub_resource type="Animation" id="8"] length = 0.1 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("asteroid:visible") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ false ] +"values": [false] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("animated_asteroid:visible") tracks/1/interp = 1 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ false ] +"values": [false] } tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true tracks/2/path = NodePath("ESCBackground:visible") tracks/2/interp = 1 tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true tracks/2/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ true ] +"values": [true] } tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true tracks/3/path = NodePath("asteroid:position") tracks/3/interp = 1 tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true tracks/3/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Vector2( 620, 450 ) ] +"values": [Vector2(620, 450)] } tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true tracks/4/path = NodePath("Polygon2D:visible") tracks/4/interp = 1 tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true tracks/4/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ true ] +"values": [true] } -[sub_resource type="Animation" id=9] +[sub_resource type="Animation" id="9"] length = 6.0 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("animated_asteroid:position") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 3 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Vector2( 350, -20 ), Vector2( 630, 471 ) ] +"values": [Vector2(350, -20), Vector2(630, 471)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("animated_asteroid:playing") tracks/1/interp = 1 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ true ] +"values": [true] } tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true tracks/2/path = NodePath("animated_asteroid:scale") tracks/2/interp = 1 tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true tracks/2/keys = { -"times": PackedFloat32Array( 0, 3 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Vector2( 0.1, 0.1 ), Vector2( 1, 1 ) ] +"values": [Vector2(0.1, 0.1), Vector2(1, 1)] } tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true tracks/3/path = NodePath("animated_asteroid:visible") tracks/3/interp = 1 tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true tracks/3/keys = { -"times": PackedFloat32Array( 0, 3 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [ true, false ] +"values": [true, false] } tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true tracks/4/path = NodePath("asteroid:visible") tracks/4/interp = 1 tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true tracks/4/keys = { -"times": PackedFloat32Array( 0, 3 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 3), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [ false, true ] +"values": [false, true] } tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true tracks/5/path = NodePath("asteroid:modulate") tracks/5/interp = 1 tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true tracks/5/keys = { -"times": PackedFloat32Array( 0, 3.5, 4.5 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), +"times": PackedFloat32Array(0, 3.5, 4.5), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true tracks/6/path = NodePath("Polygon2D:color") tracks/6/interp = 1 tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true tracks/6/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Color( 1, 1, 1, 1 ) ] +"values": [Color(1, 1, 1, 1)] } tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true tracks/7/path = NodePath("Polygon2D:modulate") tracks/7/interp = 1 tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true tracks/7/keys = { -"times": PackedFloat32Array( 0, 3, 3.5, 5 ), -"transitions": PackedFloat32Array( 1, 1, 1, 1 ), +"times": PackedFloat32Array(0, 3, 3.5, 5), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } tracks/8/type = "value" +tracks/8/imported = false +tracks/8/enabled = true tracks/8/path = NodePath("asteroid:position") tracks/8/interp = 1 tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true tracks/8/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Vector2( 620, 450 ) ] +"values": [Vector2(620, 450)] } tracks/9/type = "value" +tracks/9/imported = false +tracks/9/enabled = true tracks/9/path = NodePath("Polygon2D:visible") tracks/9/interp = 1 tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true tracks/9/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ true ] +"values": [true] } [node name="ESCRoom" type="Node2D"] -script = ExtResource( 2 ) +script = ExtResource("2") global_id = "intro_cutscene" esc_script = "res://gymkhana/rooms/intro/esc/intro.esc" -camera_limits = [ Rect2( 0, 0, 1920, 1080 ) ] +camera_limits = [Rect2(0, 0, 1920, 1080)] [node name="ESCBackground" type="TextureRect" parent="."] offset_right = 1279.0 offset_bottom = 900.0 mouse_filter = 2 -texture = ExtResource( 4 ) +texture = ExtResource("4") expand = true stretch_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="IntroBackgroundSpace" type="Sprite2D" parent="."] -position = Vector2( 641, 451 ) -texture = ExtResource( 7 ) +position = Vector2(641, 451) +texture = ExtResource("7") [node name="animated_asteroid" type="AnimatedSprite2D" parent="."] visible = false -position = Vector2( 630, 471 ) -frames = SubResource( 7 ) +position = Vector2(630, 471) +frames = SubResource("7") [node name="Polygon2D" type="Polygon2D" parent="."] -modulate = Color( 1, 1, 1, 0 ) -position = Vector2( 0, 2 ) -polygon = PackedVector2Array( 0, 0, 1280, 0, 1280, 900, 0, 900 ) +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="."] visible = false -modulate = Color( 1, 1, 1, 0 ) -position = Vector2( 620, 450 ) -texture = ExtResource( 6 ) +modulate = Color(1, 1, 1, 0) +position = Vector2(620, 450) +texture = ExtResource("6") [node name="ESCItem" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 3 ) +script = ExtResource("3") global_id = "intro_animation_player" -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(1, 1, 1, 1) animations = null [node name="AnimationPlayer" type="AnimationPlayer" parent="ESCItem"] root_node = NodePath("../..") -anims/RESET = SubResource( 8 ) -anims/intro = SubResource( 9 ) +anims/RESET = SubResource("8") +anims/intro = SubResource("9") diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index abcda5b1..508e3079 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,31 +1,31 @@ [gd_scene load_steps=29 format=3 uid="uid://dowbdjo7ka0sq"] -[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"] -[ext_resource type="PackedScene" path="res://gymkhana/characters/oier/oier.tscn" id="2"] +[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://btinfddpynakn" path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" id="3"] -[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" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] +[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="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"] +[ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"] +[ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"] +[ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"] [ext_resource type="Texture2D" uid="uid://djkmw4bj8siok" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"] +[ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"] [ext_resource type="Texture2D" uid="uid://chy7hyrqi6imp" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"] [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="PackedScene" path="res://gymkhana/particles/SmokeParticles.tscn" id="19"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" id="20"] -[ext_resource type="Script" path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" id="21"] +[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/inventory/turno_cocina_cuerno.tscn" id="20"] +[ext_resource type="Script" uid="uid://uadel3g82io" path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" id="21"] [ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" id="22"] [ext_resource type="Texture2D" uid="uid://bfrdglprxc04e" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="23"] [ext_resource type="Texture2D" uid="uid://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="24"] -[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" id="25"] -[ext_resource type="Script" path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" id="26"] +[ext_resource type="PackedScene" uid="uid://byfyg5p0h02br" path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" id="25"] +[ext_resource type="Script" uid="uid://oaq45tntm70n" path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" id="26"] [sub_resource type="NavigationPolygon" id="3"] vertices = PackedVector2Array(2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498) @@ -373,7 +373,6 @@ position = Vector2(2547, 244) scale = Vector2(1.06318, 1.06318) combine_when_selected_action_is_in = PackedStringArray() - [node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"] position = Vector2(-16.9304, 145.789) script = ExtResource("5") diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd.uid b/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd.uid new file mode 100644 index 00000000..bd65c873 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd.uid @@ -0,0 +1 @@ +uid://oaq45tntm70n diff --git a/gymkhana/rooms/turno_cocina/cocina/jarra.tscn b/gymkhana/rooms/turno_cocina/cocina/jarra.tscn index 7c2156ce..ffb2b4cf 100644 --- a/gymkhana/rooms/turno_cocina/cocina/jarra.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/jarra.tscn @@ -1,24 +1,23 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=3 uid="uid://bthshk88n0ida"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture2D" id=2] +[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://bfrdglprxc04e" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="2"] [node name="turno_cocina_jarra" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_jarra" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra.esc" -dialog_color = Color( 1, 1, 1, 1 ) - +dialog_color = Color(1, 1, 1, 1) custom_data = { - "tooltips": { - "action1": "tooltip_common_look", - "action2": "tooltip_common_pick", - } +"tooltips": { +"action1": "tooltip_common_look", +"action2": "tooltip_common_pick" +} } animations = null [node name="Sprite2D" type="Sprite2D" parent="."] rotation = -0.0698132 -scale = Vector2( 0.18, 0.18 ) -texture = ExtResource( 2 ) +scale = Vector2(0.18, 0.18) +texture = ExtResource("2") diff --git a/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn b/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn index 49a1356e..54ac4921 100644 --- a/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://byfyg5p0h02br"] -[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] +[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://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="2"] [node name="turno_cocina_jarra_volcada" type="Area2D"] diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 6ce5ba48..bd5ed372 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=14 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="PackedScene" path="res://gymkhana/characters/oier/oier.tscn" id="2"] -[ext_resource type="Texture2D" uid="uid://sdv18jxcknuw" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" id="3"] -[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" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] -[ext_resource type="Texture2D" uid="uid://js3u7hbljn2x" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" id="7"] -[ext_resource type="PackedScene" 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="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" id="10"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" id="11"] -[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" id="12"] +[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://b40fujejphqna" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" id="3"] +[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"] +[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] +[ext_resource type="Texture2D" uid="uid://cf03psgagyflc" 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://foc4og4iun0y" path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" id="9"] +[ext_resource type="PackedScene" uid="uid://cbsyjat8xvwfx" path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" id="10"] +[ext_resource type="PackedScene" uid="uid://84h4l81cuwdv" path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" id="11"] +[ext_resource type="PackedScene" uid="uid://dyejne0ibag68" path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" id="12"] [sub_resource type="NavigationPolygon" id="1"] vertices = PackedVector2Array(-768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166) diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 9b2ab93c..42098a39 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -1,63 +1,63 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=13 format=3 uid="uid://b1seq58sj62b4"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" type="Texture2D" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture2D" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture2D" id=8] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11] +[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://kijietn8e0b3" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" id="3"] +[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"] +[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] +[ext_resource type="Texture2D" uid="uid://crsf8mk6i56sr" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" id="7"] +[ext_resource type="Texture2D" uid="uid://bkyw83035dd4f" path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" id="8"] +[ext_resource type="PackedScene" uid="uid://dgucic2086suo" path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" id="9"] +[ext_resource type="PackedScene" uid="uid://bxjtxquhseqdp" path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" id="10"] +[ext_resource type="PackedScene" uid="uid://bu2xpoyifwi5o" path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" id="11"] -[sub_resource type="NavigationPolygon" id=1] -vertices = PackedVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) -polygons = [ 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 = [ 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 ) ] +[sub_resource type="NavigationPolygon" id="1"] +vertices = PackedVector2Array(-1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198) +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"] -script = ExtResource( 1 ) +script = ExtResource("1") __meta__ = { "_edit_lock_": true } 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, 577 ) ] +player_scene = ExtResource("2") +camera_limits = [Rect2(0, 0, 1500, 577)] [node name="background" type="Sprite2D" parent="."] -position = Vector2( 750, 289 ) -texture = ExtResource( 3 ) +position = Vector2(750, 289) +texture = ExtResource("3") __meta__ = { "_edit_lock_": true } [node name="ESCTerrain" type="Navigation2D" parent="."] -script = ExtResource( 4 ) +script = ExtResource("4") __meta__ = { "_edit_lock_": true } -scales = ExtResource( 7 ) +scales = ExtResource("7") scale_min = 0.5 player_speed_multiplier = 1.3 player_doubleclick_speed_multiplier = 2.0 [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"] -position = Vector2( 1252, 260 ) -navigation_polygon = SubResource( 1 ) +position = Vector2(1252, 260) +navigation_polygon = SubResource("1") __meta__ = { "_edit_lock_": true } [node name="puerta_cocina" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") global_id = "cocina_detras_puerta_cocina" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc" is_exit = true -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_cocina_detras_cocina_detras_puerta_cocina" @@ -66,22 +66,22 @@ custom_data = { animations = null [node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] -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 ) +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"] -position = Vector2( 793, 465 ) -script = ExtResource( 5 ) +position = Vector2(793, 465) +script = ExtResource("5") global_id = "cocina_detras_puerta_cocina_start" [node name="puerta_delante" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") global_id = "cocina_detras_puerta_delante" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc" is_exit = true -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_cocina_detras_cocina_detras_puerta_delante" @@ -90,54 +90,54 @@ custom_data = { animations = null [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] -position = Vector2( 298, -203 ) -scale = Vector2( 0.963362, 0.9875 ) -polygon = PackedVector2Array( 117.298, 581.266, 112.107, 422.279, 285.459, 437.468, 282.345, 486.076, 234.595, 513.418, 234.595, 582.279 ) +position = Vector2(298, -203) +scale = Vector2(0.963362, 0.9875) +polygon = PackedVector2Array(117.298, 581.266, 112.107, 422.279, 285.459, 437.468, 282.345, 486.076, 234.595, 513.418, 234.595, 582.279) [node name="puerta_delante_start" type="Marker2D" parent="puerta_delante"] -position = Vector2( 436, 381 ) -script = ExtResource( 5 ) +position = Vector2(436, 381) +script = ExtResource("5") global_id = "puerta_delante_start" [node name="Columna" type="Sprite2D" parent="."] -position = Vector2( 235, 294 ) +position = Vector2(235, 294) z_index = 400 -texture = ExtResource( 8 ) +texture = ExtResource("8") -[node name="turno_cocina_olla_vacia" parent="." instance=ExtResource( 9 )] -position = Vector2( 883, 451 ) -scale = Vector2( 0.5, 0.5 ) +[node name="turno_cocina_olla_vacia" parent="." instance=ExtResource("9")] +position = Vector2(883, 451) +scale = Vector2(0.5, 0.5) [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_vacia"] -position = Vector2( 1, 96 ) -script = ExtResource( 5 ) +position = Vector2(1, 96) +script = ExtResource("5") -[node name="turno_cocina_mechero" parent="." instance=ExtResource( 10 )] -position = Vector2( 108, 438 ) +[node name="turno_cocina_mechero" parent="." instance=ExtResource("10")] +position = Vector2(108, 438) rotation = 1.44513 -scale = Vector2( 0.4, 0.4 ) +scale = Vector2(0.4, 0.4) [node name="ESCLocation" type="Marker2D" parent="turno_cocina_mechero"] -position = Vector2( 296.645, -154.035 ) -script = ExtResource( 5 ) +position = Vector2(296.645, -154.035) +script = ExtResource("5") -[node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )] -position = Vector2( 61, 341 ) +[node name="turno_cocina_romero" parent="." instance=ExtResource("11")] +position = Vector2(61, 341) [node name="ESCLocation" type="Marker2D" parent="turno_cocina_romero"] -position = Vector2( 89, 60 ) -script = ExtResource( 5 ) +position = Vector2(89, 60) +script = ExtResource("5") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"] -position = Vector2( -61, -341 ) -polygon = PackedVector2Array( 75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434 ) +position = Vector2(-61, -341) +polygon = PackedVector2Array(75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434) [node name="mikel" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +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 = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_common_look" @@ -146,10 +146,10 @@ custom_data = { animations = null [node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"] -position = Vector2( 751, -159 ) -scale = Vector2( 0.963362, 0.9875 ) -polygon = PackedVector2Array( 129.754, 469.873, 129.754, 371.646, 140.134, 369.62, 183.732, 381.772, 184.77, 471.899 ) +position = Vector2(751, -159) +scale = Vector2(0.963362, 0.9875) +polygon = PackedVector2Array(129.754, 469.873, 129.754, 371.646, 140.134, 369.62, 183.732, 381.772, 184.77, 471.899) [node name="mikel_location" type="Marker2D" parent="mikel"] -position = Vector2( 857, 491 ) -script = ExtResource( 5 ) +position = Vector2(857, 491) +script = ExtResource("5") diff --git a/gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd.uid b/gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd.uid new file mode 100644 index 00000000..99c44d43 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd.uid @@ -0,0 +1 @@ +uid://ixw3klxr3w2p diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn index 089966cf..1ab3a23c 100644 --- a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn @@ -1,143 +1,173 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=26 format=3 uid="uid://bgiskd55j17fc"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" type="Texture2D" id=3] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" type="Texture2D" id=4] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" type="Texture2D" id=5] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" type="Texture2D" id=8] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" type="Resource" id=9] +[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://wb78a2y0m57i" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dc5ssanpsjr4v" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" id="3"] +[ext_resource type="Texture2D" uid="uid://dn6d46kpmkhpw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" id="4"] +[ext_resource type="Texture2D" uid="uid://cdkeajd7fstp6" 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://caru5ygwmheyw" path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" id="8"] +[ext_resource type="Resource" path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" id="9"] -[sub_resource type="CapsuleShape2D" id=1] +[sub_resource type="CapsuleShape2D" id="1"] radius = 57.0 height = 186.0 -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("3") +region = Rect2(0, 0, 186, 375) -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 186, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="3"] +atlas = ExtResource("3") +region = Rect2(186, 0, 186, 375) -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 372, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="4"] +atlas = ExtResource("3") +region = Rect2(372, 0, 186, 375) -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 558, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="5"] +atlas = ExtResource("3") +region = Rect2(558, 0, 186, 375) -[sub_resource type="AtlasTexture" id=6] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 0, 0, 155, 375 ) +[sub_resource type="AtlasTexture" id="6"] +atlas = ExtResource("2") +region = Rect2(0, 0, 155, 375) -[sub_resource type="AtlasTexture" id=7] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 155, 0, 155, 375 ) +[sub_resource type="AtlasTexture" id="7"] +atlas = ExtResource("2") +region = Rect2(155, 0, 155, 375) -[sub_resource type="AtlasTexture" id=15] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 0, 0, 118, 375 ) +[sub_resource type="AtlasTexture" id="15"] +atlas = ExtResource("5") +region = Rect2(0, 0, 118, 375) -[sub_resource type="AtlasTexture" id=8] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="8"] +atlas = ExtResource("4") +region = Rect2(0, 0, 186, 375) -[sub_resource type="AtlasTexture" id=9] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 186, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="9"] +atlas = ExtResource("4") +region = Rect2(186, 0, 186, 375) -[sub_resource type="AtlasTexture" id=10] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 372, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="10"] +atlas = ExtResource("4") +region = Rect2(372, 0, 186, 375) -[sub_resource type="AtlasTexture" id=11] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 558, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="11"] +atlas = ExtResource("4") +region = Rect2(558, 0, 186, 375) -[sub_resource type="AtlasTexture" id=12] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 744, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="12"] +atlas = ExtResource("4") +region = Rect2(744, 0, 186, 375) -[sub_resource type="AtlasTexture" id=13] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 930, 0, 186, 375 ) +[sub_resource type="AtlasTexture" id="13"] +atlas = ExtResource("4") +region = Rect2(930, 0, 186, 375) -[sub_resource type="AtlasTexture" id=18] -flags = 4 -atlas = ExtResource( 8 ) -region = Rect2( 0, 0, 118, 375 ) +[sub_resource type="AtlasTexture" id="18"] +atlas = ExtResource("8") +region = Rect2(0, 0, 118, 375) -[sub_resource type="AtlasTexture" id=19] -flags = 4 -atlas = ExtResource( 8 ) -region = Rect2( 118, 0, 118, 375 ) +[sub_resource type="AtlasTexture" id="19"] +atlas = ExtResource("8") +region = Rect2(118, 0, 118, 375) -[sub_resource type="SpriteFrames" id=14] -animations = [ { -"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], +[sub_resource type="SpriteFrames" id="14"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("2") +}, { +"duration": 1.0, +"texture": SubResource("3") +}, { +"duration": 1.0, +"texture": SubResource("4") +}, { +"duration": 1.0, +"texture": SubResource("5") +}], "loop": true, -"name": "disco", +"name": &"disco", "speed": 5.0 }, { -"frames": [ SubResource( 6 ), SubResource( 7 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("6") +}, { +"duration": 1.0, +"texture": SubResource("7") +}], "loop": true, -"name": "donkey", +"name": &"donkey", "speed": 5.0 }, { -"frames": [ SubResource( 15 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("15") +}], "loop": true, -"name": "idle", +"name": &"idle", "speed": 5.0 }, { -"frames": [ SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("8") +}, { +"duration": 1.0, +"texture": SubResource("9") +}, { +"duration": 1.0, +"texture": SubResource("10") +}, { +"duration": 1.0, +"texture": SubResource("11") +}, { +"duration": 1.0, +"texture": SubResource("12") +}, { +"duration": 1.0, +"texture": SubResource("13") +}], "loop": true, -"name": "pulp", +"name": &"pulp", "speed": 5.0 }, { -"frames": [ SubResource( 18 ), SubResource( 19 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("18") +}, { +"duration": 1.0, +"texture": SubResource("19") +}], "loop": true, -"name": "speak", +"name": &"speak", "speed": 5.0 -} ] +}] [node name="EnekoDancing" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "eneko_dancing" is_interactive = false player_orients_on_arrival = false -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) -animations = ExtResource( 9 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0.584314, 0.490196, 0.270588, 1) +animations = ExtResource("9") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 1 ) +shape = SubResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -frames = SubResource( 14 ) +frames = SubResource("14") animation = "idle" -script = ExtResource( 7 ) +script = ExtResource("7") [node name="Timer" type="Timer" parent="AnimatedSprite2D"] wait_time = 6.0 [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( -2, -273 ) +position = Vector2(-2, -273) [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"] diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres b/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres index c6c3637f..aba254dd 100644 --- a/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres @@ -1,27 +1,27 @@ -[gd_resource type="Resource" load_steps=7 format=2] +[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://cr02ebtkhjlw7"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] +[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"] +[ext_resource type="Script" uid="uid://clixil1u5exq7" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] -[sub_resource type="Resource" id=1] -script = ExtResource( 2 ) +[sub_resource type="Resource" id="1"] +script = ExtResource("2") angle_start = 0 angle_size = 360 -[sub_resource type="Resource" id=2] -script = ExtResource( 3 ) +[sub_resource type="Resource" id="2"] +script = ExtResource("3") animation = "idle" mirrored = false -[sub_resource type="Resource" id=3] -script = ExtResource( 3 ) +[sub_resource type="Resource" id="3"] +script = ExtResource("3") animation = "speak" mirrored = false [resource] -script = ExtResource( 1 ) -dir_angles = [ SubResource( 1 ) ] -directions = [ SubResource( 2 ) ] -idles = [ SubResource( 2 ) ] -speaks = [ SubResource( 3 ) ] +script = ExtResource("1") +dir_angles = [SubResource("1")] +directions = [SubResource("2")] +idles = [SubResource("2")] +speaks = [SubResource("3")] diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn index a64088b7..81aaf3e5 100644 --- a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn @@ -1,143 +1,173 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=26 format=3 uid="uid://dg3q322t7b34f"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" type="Texture2D" id=2] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" type="Texture2D" id=3] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" type="Texture2D" id=4] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" type="Texture2D" id=5] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=6] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" type="Texture2D" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" type="Resource" id=8] +[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://cht3r83h74v1p" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" id="2"] +[ext_resource type="Texture2D" uid="uid://h38hcuygme4d" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" id="3"] +[ext_resource type="Texture2D" uid="uid://cbqvx5efjmdci" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" id="4"] +[ext_resource type="Texture2D" uid="uid://c7g27vatqcft4" 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://dt1rchb7y4qe" path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" id="7"] +[ext_resource type="Resource" path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" id="8"] -[sub_resource type="CapsuleShape2D" id=1] +[sub_resource type="CapsuleShape2D" id="1"] radius = 57.0 height = 186.0 -[sub_resource type="AtlasTexture" id=15] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 0, 0, 185, 375 ) +[sub_resource type="AtlasTexture" id="15"] +atlas = ExtResource("5") +region = Rect2(0, 0, 185, 375) -[sub_resource type="AtlasTexture" id=16] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 185, 0, 185, 375 ) +[sub_resource type="AtlasTexture" id="16"] +atlas = ExtResource("5") +region = Rect2(185, 0, 185, 375) -[sub_resource type="AtlasTexture" id=17] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 370, 0, 185, 375 ) +[sub_resource type="AtlasTexture" id="17"] +atlas = ExtResource("5") +region = Rect2(370, 0, 185, 375) -[sub_resource type="AtlasTexture" id=18] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 555, 0, 185, 375 ) +[sub_resource type="AtlasTexture" id="18"] +atlas = ExtResource("5") +region = Rect2(555, 0, 185, 375) -[sub_resource type="AtlasTexture" id=19] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 0, 0, 188, 375 ) +[sub_resource type="AtlasTexture" id="19"] +atlas = ExtResource("2") +region = Rect2(0, 0, 188, 375) -[sub_resource type="AtlasTexture" id=20] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 188, 0, 188, 375 ) +[sub_resource type="AtlasTexture" id="20"] +atlas = ExtResource("2") +region = Rect2(188, 0, 188, 375) -[sub_resource type="AtlasTexture" id=21] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 117, 375 ) +[sub_resource type="AtlasTexture" id="21"] +atlas = ExtResource("3") +region = Rect2(0, 0, 117, 375) -[sub_resource type="AtlasTexture" id=22] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="22"] +atlas = ExtResource("4") +region = Rect2(0, 0, 177, 375) -[sub_resource type="AtlasTexture" id=23] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 177, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="23"] +atlas = ExtResource("4") +region = Rect2(177, 0, 177, 375) -[sub_resource type="AtlasTexture" id=24] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 354, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="24"] +atlas = ExtResource("4") +region = Rect2(354, 0, 177, 375) -[sub_resource type="AtlasTexture" id=25] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 531, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="25"] +atlas = ExtResource("4") +region = Rect2(531, 0, 177, 375) -[sub_resource type="AtlasTexture" id=26] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 708, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="26"] +atlas = ExtResource("4") +region = Rect2(708, 0, 177, 375) -[sub_resource type="AtlasTexture" id=27] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 885, 0, 177, 375 ) +[sub_resource type="AtlasTexture" id="27"] +atlas = ExtResource("4") +region = Rect2(885, 0, 177, 375) -[sub_resource type="AtlasTexture" id=28] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 0, 0, 117, 375 ) +[sub_resource type="AtlasTexture" id="28"] +atlas = ExtResource("7") +region = Rect2(0, 0, 117, 375) -[sub_resource type="AtlasTexture" id=29] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 117, 0, 117, 375 ) +[sub_resource type="AtlasTexture" id="29"] +atlas = ExtResource("7") +region = Rect2(117, 0, 117, 375) -[sub_resource type="SpriteFrames" id=14] -animations = [ { -"frames": [ SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ) ], +[sub_resource type="SpriteFrames" id="14"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("15") +}, { +"duration": 1.0, +"texture": SubResource("16") +}, { +"duration": 1.0, +"texture": SubResource("17") +}, { +"duration": 1.0, +"texture": SubResource("18") +}], "loop": true, -"name": "disco", +"name": &"disco", "speed": 5.0 }, { -"frames": [ SubResource( 19 ), SubResource( 20 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("19") +}, { +"duration": 1.0, +"texture": SubResource("20") +}], "loop": true, -"name": "donkey", +"name": &"donkey", "speed": 5.0 }, { -"frames": [ SubResource( 21 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("21") +}], "loop": true, -"name": "idle", +"name": &"idle", "speed": 5.0 }, { -"frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("22") +}, { +"duration": 1.0, +"texture": SubResource("23") +}, { +"duration": 1.0, +"texture": SubResource("24") +}, { +"duration": 1.0, +"texture": SubResource("25") +}, { +"duration": 1.0, +"texture": SubResource("26") +}, { +"duration": 1.0, +"texture": SubResource("27") +}], "loop": true, -"name": "pulp", +"name": &"pulp", "speed": 5.0 }, { -"frames": [ SubResource( 28 ), SubResource( 29 ) ], +"frames": [{ +"duration": 1.0, +"texture": SubResource("28") +}, { +"duration": 1.0, +"texture": SubResource("29") +}], "loop": true, -"name": "speak", +"name": &"speak", "speed": 5.0 -} ] +}] [node name="OierDancing" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "oier_dancing" is_interactive = false player_orients_on_arrival = false -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 ) -animations = ExtResource( 8 ) +combine_when_selected_action_is_in = [] +dialog_color = Color(0.321569, 0.662745, 0.301961, 1) +animations = ExtResource("8") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 1 ) +shape = SubResource("1") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -frames = SubResource( 14 ) +frames = SubResource("14") animation = "idle" -script = ExtResource( 6 ) +script = ExtResource("6") [node name="Timer" type="Timer" parent="AnimatedSprite2D"] wait_time = 6.0 [node name="dialog_position" type="Marker2D" parent="."] -position = Vector2( -2, -273 ) +position = Vector2(-2, -273) [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"] diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres b/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres index c6c3637f..8cb68d0c 100644 --- a/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres +++ b/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres @@ -1,27 +1,27 @@ -[gd_resource type="Resource" load_steps=7 format=2] +[gd_resource type="Resource" script_class="ESCAnimationResource" load_steps=7 format=3 uid="uid://bl5rc1krhwcbu"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] +[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"] +[ext_resource type="Script" uid="uid://clixil1u5exq7" path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" id="3"] -[sub_resource type="Resource" id=1] -script = ExtResource( 2 ) +[sub_resource type="Resource" id="1"] +script = ExtResource("2") angle_start = 0 angle_size = 360 -[sub_resource type="Resource" id=2] -script = ExtResource( 3 ) +[sub_resource type="Resource" id="2"] +script = ExtResource("3") animation = "idle" mirrored = false -[sub_resource type="Resource" id=3] -script = ExtResource( 3 ) +[sub_resource type="Resource" id="3"] +script = ExtResource("3") animation = "speak" mirrored = false [resource] -script = ExtResource( 1 ) -dir_angles = [ SubResource( 1 ) ] -directions = [ SubResource( 2 ) ] -idles = [ SubResource( 2 ) ] -speaks = [ SubResource( 3 ) ] +script = ExtResource("1") +dir_angles = [SubResource("1")] +directions = [SubResource("2")] +idles = [SubResource("2")] +speaks = [SubResource("3")] diff --git a/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd.uid b/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd.uid new file mode 100644 index 00000000..febd7e65 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd.uid @@ -0,0 +1 @@ +uid://c6yobrdbei4d diff --git a/gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd.uid b/gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd.uid new file mode 100644 index 00000000..6e381f80 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd.uid @@ -0,0 +1 @@ +uid://ib2j5oleakyb diff --git a/gymkhana/rooms/turno_cocina/creditos/creditos.tscn b/gymkhana/rooms/turno_cocina/creditos/creditos.tscn index 5e5ffd4f..681a7755 100644 --- a/gymkhana/rooms/turno_cocina/creditos/creditos.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/creditos.tscn @@ -1,29 +1,29 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=10 format=3 uid="uid://csb7hwb1v016e"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/background.png" type="Texture2D" id=3] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn" type="PackedScene" id=4] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn" type="PackedScene" id=5] -[ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=6] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd" type="Script" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd" type="Script" id=8] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn" type="PackedScene" id=9] +[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://dc7j1xq3x7gwp" path="res://gymkhana/rooms/turno_cocina/creditos/assets/background.png" id="3"] +[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn" id="4"] +[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn" id="5"] +[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="6"] +[ext_resource type="Script" uid="uid://ib2j5oleakyb" path="res://gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd" id="7"] +[ext_resource type="Script" uid="uid://c6yobrdbei4d" path="res://gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd" id="8"] +[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn" id="9"] [node name="ESCRoom2" type="Node2D"] -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "turno_cocina_creditos" esc_script = "res://gymkhana/rooms/turno_cocina/creditos/esc/creditos.esc" -player_scene = ExtResource( 2 ) -camera_limits = [ Rect2( 0, 0, 1280, 577 ) ] +player_scene = ExtResource("2") +camera_limits = [Rect2(0, 0, 1280, 577)] editor_debug_mode = 1 [node name="background" type="Sprite2D" parent="."] -position = Vector2( 644.5, 372.812 ) -scale = Vector2( 1.01797, 1.29008 ) -texture = ExtResource( 3 ) +position = Vector2(644.5, 372.812) +scale = Vector2(1.01797, 1.29008) +texture = ExtResource("3") -[node name="scrollingText" parent="." instance=ExtResource( 4 )] +[node name="scrollingText" parent="." instance=ExtResource("4")] offset_left = 368.0 offset_top = 764.0 offset_right = 933.0 @@ -35,21 +35,21 @@ offset_top = 486.0 offset_right = 845.0 offset_bottom = 612.0 text = "Volver al menú" -script = ExtResource( 8 ) +script = ExtResource("8") [node name="Logo-small" type="Sprite2D" parent="Button"] -position = Vector2( 176.25, -190.5 ) -scale = Vector2( 1.01504, 1.00333 ) -texture = ExtResource( 6 ) +position = Vector2(176.25, -190.5) +scale = Vector2(1.01504, 1.00333) +texture = ExtResource("6") [node name="Node2D" type="Node2D" parent="."] -script = ExtResource( 7 ) +script = ExtResource("7") -[node name="OierDancing" parent="." instance=ExtResource( 9 )] -position = Vector2( 228, 376 ) +[node name="OierDancing" parent="." instance=ExtResource("9")] +position = Vector2(228, 376) -[node name="EnekoDancing" parent="." instance=ExtResource( 5 )] -position = Vector2( 1109, 372 ) +[node name="EnekoDancing" parent="." instance=ExtResource("5")] +position = Vector2(1109, 372) [connection signal="finished" from="scrollingText" to="Node2D" method="_on_scrollingText_finished"] [connection signal="button_up" from="Button" to="Node2D" method="_on_Button_button_up"] diff --git a/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd.uid b/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd.uid new file mode 100644 index 00000000..292e9564 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/scrollingText.gd.uid @@ -0,0 +1 @@ +uid://cobcmilgvn3j7 diff --git a/gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn b/gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn index 16acdaef..13578b89 100644 --- a/gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn @@ -1,21 +1,21 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://fgwob47tewuf"] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/uliwood-productions.png" type="Texture2D" id=1] -[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.gd" type="Script" id=2] +[ext_resource type="Texture2D" uid="uid://cb3kflkgoepre" path="res://gymkhana/rooms/turno_cocina/creditos/assets/uliwood-productions.png" id="1"] +[ext_resource type="Script" uid="uid://cobcmilgvn3j7" path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.gd" id="2"] -[sub_resource type="Theme" id=1] +[sub_resource type="Theme" id="1"] [node name="scrollingText" type="VBoxContainer"] offset_left = 357.0 offset_right = 922.0 offset_bottom = 744.0 grow_horizontal = 0 -script = ExtResource( 2 ) +script = ExtResource("2") [node name="RichTextLabel" type="RichTextLabel" parent="."] offset_right = 600.0 offset_bottom = 30.0 -theme = SubResource( 1 ) +theme = SubResource("1") bbcode_enabled = true text = "[center][u]Las Gymkhanicas de Uli[/u][/center] " @@ -118,4 +118,4 @@ por hacer posible este juego" offset_top = 511.0 offset_right = 600.0 offset_bottom = 806.0 -texture = ExtResource( 1 ) +texture = ExtResource("1") diff --git a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn index 196cc4ca..71348818 100644 --- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn +++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn @@ -1,50 +1,50 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=10 format=3 uid="uid://nwfqcmgsuh8w"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] -[ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" type="Texture2D" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" type="PackedScene" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" type="Texture2D" id=8] +[ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"] +[ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"] +[ext_resource type="Texture2D" uid="uid://blmv2ddwts1il" path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" id="3"] +[ext_resource type="Script" uid="uid://5pbcieq7gpdo" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"] +[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"] +[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] +[ext_resource type="PackedScene" uid="uid://b3owsy6kidijt" path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" id="7"] +[ext_resource type="Texture2D" uid="uid://bjt7tlgobhgo1" path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" id="8"] -[sub_resource type="NavigationPolygon" id=60] -vertices = PackedVector2Array( 1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628 ) -polygons = [ PackedInt32Array( 0, 1, 2, 3, 4 ), PackedInt32Array( 5, 4, 3, 6 ) ] -outlines = [ PackedVector2Array( 503, 650, 503, 628, 597, 610, 837, 624, 1137, 615, 1143, 660, 501, 666 ) ] +[sub_resource type="NavigationPolygon" id="60"] +vertices = PackedVector2Array(1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4), PackedInt32Array(5, 4, 3, 6)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(503, 650, 503, 628, 597, 610, 837, 624, 1137, 615, 1143, 660, 501, 666)]) [node name="ESCRoom2" type="Node2D"] -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "despensa" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/despensa.esc" -player_scene = ExtResource( 2 ) -camera_limits = [ Rect2( 0, 0, 1280, 577 ) ] +player_scene = ExtResource("2") +camera_limits = [Rect2(0, 0, 1280, 577)] editor_debug_mode = 1 [node name="background" type="Sprite2D" parent="."] -position = Vector2( 636, 289.125 ) -texture = ExtResource( 3 ) +position = Vector2(636, 289.125) +texture = ExtResource("3") [node name="ESCTerrain" type="Navigation2D" parent="."] -position = Vector2( 206, -4 ) -script = ExtResource( 4 ) +position = Vector2(206, -4) +script = ExtResource("4") scale_min = 1.0 scale_max = 1.5 player_speed_multiplier = 0.5 [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"] -position = Vector2( -272, 117 ) -navigation_polygon = SubResource( 60 ) +position = Vector2(-272, 117) +navigation_polygon = SubResource("60") [node name="puerta_exterior" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 863, 175 ) -script = ExtResource( 6 ) +position = Vector2(863, 175) +script = ExtResource("6") global_id = "turno_cocina_despensa_puerta_exterior" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc" is_exit = true -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_despensa_puerta_exterior" @@ -53,28 +53,28 @@ custom_data = { animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"] -position = Vector2( 161.721, -721 ) -scale = Vector2( 1.54174, 1.99167 ) -polygon = PackedVector2Array( 0.181213, 566.359, 5.19019, 273.946, 167.524, 274.142, 164.281, 563.848 ) +position = Vector2(161.721, -721) +scale = Vector2(1.54174, 1.99167) +polygon = PackedVector2Array(0.181213, 566.359, 5.19019, 273.946, 167.524, 274.142, 164.281, 563.848) [node name="ESCLocation" type="Marker2D" parent="puerta_exterior"] -position = Vector2( 151, 575 ) -script = ExtResource( 5 ) +position = Vector2(151, 575) +script = ExtResource("5") [node name="start" type="Marker2D" parent="."] -position = Vector2( 899, 758 ) -script = ExtResource( 5 ) +position = Vector2(899, 758) +script = ExtResource("5") global_id = "start" is_start_location = true player_orients_on_arrival = false [node name="cebolla izq" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 452, 192 ) -script = ExtResource( 6 ) +position = Vector2(452, 192) +script = ExtResource("6") global_id = "turno_cocina_despensa_cebolla_izq" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_turno_cocina_despensa_cebolla_action1", @@ -84,21 +84,21 @@ custom_data = { animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"] -position = Vector2( 60.6594, -46.582 ) -scale = Vector2( 0.865036, 0.883608 ) -polygon = PackedVector2Array( -37.755, 99.1186, -24, 109, 82, 109, 85, 19, 81.3152, -29.8979, 77.8471, -43.4786, -26.1948, -36.6882, -35, -27, -38.911, 31.2152 ) +position = Vector2(60.6594, -46.582) +scale = Vector2(0.865036, 0.883608) +polygon = PackedVector2Array(-37.755, 99.1186, -24, 109, 82, 109, 85, 19, 81.3152, -29.8979, 77.8471, -43.4786, -26.1948, -36.6882, -35, -27, -38.911, 31.2152) [node name="ESCLocation" type="Marker2D" parent="cebolla izq"] -position = Vector2( 56, 553 ) -script = ExtResource( 5 ) +position = Vector2(56, 553) +script = ExtResource("5") [node name="cebolla der" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 941, 385 ) -script = ExtResource( 6 ) +position = Vector2(941, 385) +script = ExtResource("6") global_id = "turno_cocina_despensa_cebolla_der" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/cebolla_der.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_turno_cocina_despensa_cebolla_action1", @@ -108,21 +108,21 @@ custom_data = { animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"] -position = Vector2( -305.617, -238.789 ) -scale = Vector2( 0.829392, 0.888258 ) -polygon = PackedVector2Array( -45, 103, -24, 109, 82, 109, 95, 16, 72, -39, 63, -54, -31, -56, -46, -53, -51, -31, -52.307, 11.0204 ) +position = Vector2(-305.617, -238.789) +scale = Vector2(0.829392, 0.888258) +polygon = PackedVector2Array(-45, 103, -24, 109, 82, 109, 95, 16, 72, -39, 63, -54, -31, -56, -46, -53, -51, -31, -52.307, 11.0204) [node name="ESCLocation" type="Marker2D" parent="cebolla der"] -position = Vector2( -337, 368 ) -script = ExtResource( 5 ) +position = Vector2(-337, 368) +script = ExtResource("5") [node name="bidon_der" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 941, 385 ) -script = ExtResource( 6 ) +position = Vector2(941, 385) +script = ExtResource("6") global_id = "turno_cocina_despensa_bidon_der" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_common_look_inside", @@ -132,21 +132,21 @@ custom_data = { animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"] -position = Vector2( -129, 84 ) -scale = Vector2( 0.9425, 0.837376 ) -polygon = PackedVector2Array( -42.4403, 130.169, -24.4032, 131.363, 57.2944, 130.169, 62.5995, 109.867, 64.7215, 78.8176, 67.9045, 17.9131, 62.5995, -9.55365, 67.9045, -20.3015, 63.6605, -37.0204, 56.2335, -51.3509, 20.1592, -59.7103, -6.36603, -59.7103, -29.7082, -53.7393, -36.0742, -44.1857, -38.1963, -26.2725, -31.8302, -10.7479, -35, 9, -39.2573, 37.0204 ) +position = Vector2(-129, 84) +scale = Vector2(0.9425, 0.837376) +polygon = PackedVector2Array(-42.4403, 130.169, -24.4032, 131.363, 57.2944, 130.169, 62.5995, 109.867, 64.7215, 78.8176, 67.9045, 17.9131, 62.5995, -9.55365, 67.9045, -20.3015, 63.6605, -37.0204, 56.2335, -51.3509, 20.1592, -59.7103, -6.36603, -59.7103, -29.7082, -53.7393, -36.0742, -44.1857, -38.1963, -26.2725, -31.8302, -10.7479, -35, 9, -39.2573, 37.0204) [node name="ESCLocation" type="Marker2D" parent="bidon_der"] -position = Vector2( -97, 370 ) -script = ExtResource( 5 ) +position = Vector2(-97, 370) +script = ExtResource("5") [node name="bidon_izq" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 941, 385 ) -script = ExtResource( 6 ) +position = Vector2(941, 385) +script = ExtResource("6") global_id = "turno_cocina_despensa_bidon_izq" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_izq.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_common_look_inside", @@ -156,17 +156,17 @@ custom_data = { animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"] -position = Vector2( -300, 61 ) -scale = Vector2( 0.836355, 1.05961 ) -polygon = PackedVector2Array( -38.2613, -9.43741, -11.9567, -14.1561, 17.935, -16.0436, 40.6526, -12.2686, 45.4352, -14.1561, 49.0222, -17.9311, 46.6309, -23.5936, 45.4352, -29.256, 41.8483, -33.9748, 35.8699, -36.806, 10.761, -40.581, -19.1306, -40.581, -37, -37, -51, -31, -52.6093, -25.481, -51.4136, -20.7623, -51.4136, -14.1561, -44.2396, -10.3812 ) +position = Vector2(-300, 61) +scale = Vector2(0.836355, 1.05961) +polygon = PackedVector2Array(-38.2613, -9.43741, -11.9567, -14.1561, 17.935, -16.0436, 40.6526, -12.2686, 45.4352, -14.1561, 49.0222, -17.9311, 46.6309, -23.5936, 45.4352, -29.256, 41.8483, -33.9748, 35.8699, -36.806, 10.761, -40.581, -19.1306, -40.581, -37, -37, -51, -31, -52.6093, -25.481, -51.4136, -20.7623, -51.4136, -14.1561, -44.2396, -10.3812) [node name="ESCLocation" type="Marker2D" parent="bidon_izq"] -position = Vector2( -270, 372 ) -script = ExtResource( 5 ) +position = Vector2(-270, 372) +script = ExtResource("5") -[node name="turno_cocina_patata_grande" parent="." instance=ExtResource( 7 )] -position = Vector2( 440, 161 ) -scale = Vector2( 0.880435, 0.88735 ) +[node name="turno_cocina_patata_grande" parent="." instance=ExtResource("7")] +position = Vector2(440, 161) +scale = Vector2(0.880435, 0.88735) custom_data = { "tooltips": { "action1": "tooltip_common_look", @@ -177,25 +177,25 @@ custom_data = { } [node name="ESCLocation2" type="Marker2D" parent="turno_cocina_patata_grande"] -position = Vector2( 40.8889, 672.79 ) -script = ExtResource( 5 ) +position = Vector2(40.8889, 672.79) +script = ExtResource("5") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_patata_grande"] -polygon = PackedVector2Array( 21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135 ) +polygon = PackedVector2Array(21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135) [node name="foreground" type="Sprite2D" parent="."] -position = Vector2( 304, 351 ) -scale = Vector2( 0.994367, 0.994367 ) +position = Vector2(304, 351) +scale = Vector2(0.994367, 0.994367) z_index = 4096 -texture = ExtResource( 8 ) +texture = ExtResource("8") [node name="bidon_cntr" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 941, 385 ) -script = ExtResource( 6 ) +position = Vector2(941, 385) +script = ExtResource("6") global_id = "turno_cocina_despensa_bidon_cntr" esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = [] custom_data = { "tooltips": { "action1": "tooltip_common_look_inside", @@ -206,14 +206,14 @@ action3_target_texts = { "turno_cocina_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_bol", "turno_cocina_peso_bol": "tooltip_turno_cocina_despensa_bidon_cntr_action3_turno_cocina_peso_bol" } -target_when_selected_action_is_in = [ "action3" ] +target_when_selected_action_is_in = ["action3"] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_cntr"] -position = Vector2( -245, 95 ) -scale = Vector2( 0.9425, 0.837376 ) -polygon = PackedVector2Array( -39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.226, 63.6605, 11.942, 57.2944, -7.16528, 59.4164, -13.1363, 60.4775, -23.8842, 59.4164, -32.2436, 54.1114, -42.9915, 45.6234, -50.1567, 30.7692, -56.1277, 13.7931, -58.5162, -4.24402, -58.5162, -21.2202, -53.7393, -33.9523, -47.7683, -44, -26, -43.5013, -17.9131, -40.3183, -10.7479, -42.4404, 9.55365, -41.3793, 50.1567 ) +position = Vector2(-245, 95) +scale = Vector2(0.9425, 0.837376) +polygon = PackedVector2Array(-39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.226, 63.6605, 11.942, 57.2944, -7.16528, 59.4164, -13.1363, 60.4775, -23.8842, 59.4164, -32.2436, 54.1114, -42.9915, 45.6234, -50.1567, 30.7692, -56.1277, 13.7931, -58.5162, -4.24402, -58.5162, -21.2202, -53.7393, -33.9523, -47.7683, -44, -26, -43.5013, -17.9131, -40.3183, -10.7479, -42.4404, 9.55365, -41.3793, 50.1567) [node name="ESCLocation" type="Marker2D" parent="bidon_cntr"] -position = Vector2( -189, 372 ) -script = ExtResource( 5 ) +position = Vector2(-189, 372) +script = ExtResource("5") diff --git a/gymkhana/videos/turno_cocina/cuerno_antes_de_tiempo.ogv.uid b/gymkhana/videos/turno_cocina/cuerno_antes_de_tiempo.ogv.uid new file mode 100644 index 00000000..fcb5aba3 --- /dev/null +++ b/gymkhana/videos/turno_cocina/cuerno_antes_de_tiempo.ogv.uid @@ -0,0 +1 @@ +uid://sjp53rfwfp54 diff --git a/gymkhana/videos/turno_cocina/cuerno_epico.ogv.uid b/gymkhana/videos/turno_cocina/cuerno_epico.ogv.uid new file mode 100644 index 00000000..ea2a9e2b --- /dev/null +++ b/gymkhana/videos/turno_cocina/cuerno_epico.ogv.uid @@ -0,0 +1 @@ +uid://dbiwhg81udi30 diff --git a/gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv.uid b/gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv.uid new file mode 100644 index 00000000..56a7aee0 --- /dev/null +++ b/gymkhana/videos/turno_cocina/eneko_entra_cocina.ogv.uid @@ -0,0 +1 @@ +uid://jhf7pgrstb06 diff --git a/gymkhana/videos/turno_cocina/eneko_sale_le_gusta.ogv.uid b/gymkhana/videos/turno_cocina/eneko_sale_le_gusta.ogv.uid new file mode 100644 index 00000000..70a779b5 --- /dev/null +++ b/gymkhana/videos/turno_cocina/eneko_sale_le_gusta.ogv.uid @@ -0,0 +1 @@ +uid://52yeg41olp4u diff --git a/gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv.uid b/gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv.uid new file mode 100644 index 00000000..f033c2b9 --- /dev/null +++ b/gymkhana/videos/turno_cocina/eneko_sale_le_gusta_muchisimo.ogv.uid @@ -0,0 +1 @@ +uid://dy7krpoejoaux diff --git a/gymkhana/videos/turno_cocina/eneko_sale_no_le_gusta.ogv.uid b/gymkhana/videos/turno_cocina/eneko_sale_no_le_gusta.ogv.uid new file mode 100644 index 00000000..e2704542 --- /dev/null +++ b/gymkhana/videos/turno_cocina/eneko_sale_no_le_gusta.ogv.uid @@ -0,0 +1 @@ +uid://ds40232fpwt01 diff --git a/gymkhana/videos/turno_cocina/intro.ogv.uid b/gymkhana/videos/turno_cocina/intro.ogv.uid new file mode 100644 index 00000000..327a5d23 --- /dev/null +++ b/gymkhana/videos/turno_cocina/intro.ogv.uid @@ -0,0 +1 @@ +uid://mlymhxpiqt5t diff --git a/gymkhana/videos/turno_cocina/intro_subs.ogv.uid b/gymkhana/videos/turno_cocina/intro_subs.ogv.uid new file mode 100644 index 00000000..2cbe969b --- /dev/null +++ b/gymkhana/videos/turno_cocina/intro_subs.ogv.uid @@ -0,0 +1 @@ +uid://k2q0o6vc54p7 diff --git a/gymkhana/videos/turno_cocina/oier_amenaza_con_cuchillo.ogv.uid b/gymkhana/videos/turno_cocina/oier_amenaza_con_cuchillo.ogv.uid new file mode 100644 index 00000000..915f951f --- /dev/null +++ b/gymkhana/videos/turno_cocina/oier_amenaza_con_cuchillo.ogv.uid @@ -0,0 +1 @@ +uid://dwd5l5sl1m82p diff --git a/gymkhana/videos/turno_cocina/oier_moja_el_pan.ogv.uid b/gymkhana/videos/turno_cocina/oier_moja_el_pan.ogv.uid new file mode 100644 index 00000000..a487a4c8 --- /dev/null +++ b/gymkhana/videos/turno_cocina/oier_moja_el_pan.ogv.uid @@ -0,0 +1 @@ +uid://iomokjrq1rwv diff --git a/project.godot b/project.godot index eee7f526..3e00c60d 100644 --- a/project.godot +++ b/project.godot @@ -13,11 +13,11 @@ config_version=5 config/name="Las gymkhanikas de Uli" config/description="¡Una emocionante y trepidante aventura!" run/main_scene="res://addons/escoria-core/game/main_scene.tscn" -config/features=PackedStringArray("4.3") +config/features=PackedStringArray("4.4") boot_splash/bg_color=Color(0, 0, 0, 1) -boot_splash/image="res://gymkhana-logo.png" boot_splash/fullsize=false boot_splash/use_filter=false +boot_splash/image="res://gymkhana-logo.png" config/icon="res://icon.png" [audio] diff --git a/saves/save_001.tres b/saves/save_001.tres index ebcc6674..a62aca59 100644 --- a/saves/save_001.tres +++ b/saves/save_001.tres @@ -1,9 +1,9 @@ -[gd_resource type="Resource" load_steps=2 format=2] +[gd_resource type="Resource" script_class="ESCSaveGame" load_steps=2 format=3 uid="uid://bd1ck4yailiip"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] +[ext_resource type="Script" uid="uid://blcoeovuyvld2" path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" id="1"] [resource] -script = ExtResource( 1 ) +script = ExtResource("1") escoria_version = "1.0.0" game_version = "0.1.0" name = "Post-intro" @@ -37,7 +37,7 @@ globals = { "turno_cocina_ingrediente_romero": false, "turno_cocina_libro_leido_count": 0 } -inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina" ] +inventory = ["turno_cocina_frontal", "turno_cocina_libro_de_cocina"] objects = { "_music": { "active": true, @@ -112,7 +112,7 @@ objects = { "action2": "cocina_delante_eneko_smoking_action2" } }, -"global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ), +"global_transform": Transform2D(1.23314, 0, 0, 1.23314, 813, 440), "interactive": true, "last_deg": 271, "last_dir": 0, @@ -125,9 +125,8 @@ objects = { }, "player": { "active": true, -"custom_data": { -}, -"global_transform": Transform2D( 0.971569, 0, 0, 0.971569, 758.729, 541.12 ), +"custom_data": {}, +"global_transform": Transform2D(0.971569, 0, 0, 0.971569, 758.729, 541.12), "interactive": false, "last_deg": 71, "last_dir": 4, @@ -213,11 +212,11 @@ objects = { } events = { "events_queue": { -"_front": [ ], -"intro_dialog2_channel": [ ], -"intro_dialog_channel": [ ] +"_front": [], +"intro_dialog2_channel": [], +"intro_dialog_channel": [] }, -"sched_events": [ ] +"sched_events": [] } terrain_navpolys = { "cocina_delante": { diff --git a/saves/save_002.tres b/saves/save_002.tres index b8cc21ea..3f93eab1 100644 --- a/saves/save_002.tres +++ b/saves/save_002.tres @@ -1,9 +1,9 @@ -[gd_resource type="Resource" load_steps=2 format=2] +[gd_resource type="Resource" script_class="ESCSaveGame" load_steps=2 format=3 uid="uid://mivwgmyp1bem"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] +[ext_resource type="Script" uid="uid://blcoeovuyvld2" path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" id="1"] [resource] -script = ExtResource( 1 ) +script = ExtResource("1") escoria_version = "1.0.0" game_version = "0.1.0" name = "bol+peso" @@ -37,7 +37,7 @@ globals = { "turno_cocina_ingrediente_romero": false, "turno_cocina_libro_leido_count": 0 } -inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_peso_bol" ] +inventory = ["turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_peso_bol"] objects = { "_music": { "active": true, @@ -132,7 +132,7 @@ objects = { "action2": "cocina_delante_eneko_smoking_action2" } }, -"global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ), +"global_transform": Transform2D(1.23314, 0, 0, 1.23314, 813, 440), "interactive": true, "last_deg": 271, "last_dir": 0, @@ -145,9 +145,8 @@ objects = { }, "player": { "active": true, -"custom_data": { -}, -"global_transform": Transform2D( 0.976078, 0, 0, 0.976078, 730.999, 546 ), +"custom_data": {}, +"global_transform": Transform2D(0.976078, 0, 0, 0.976078, 730.999, 546), "interactive": false, "last_deg": 71, "last_dir": 4, @@ -258,11 +257,11 @@ objects = { } events = { "events_queue": { -"_front": [ ], -"intro_dialog2_channel": [ ], -"intro_dialog_channel": [ ] +"_front": [], +"intro_dialog2_channel": [], +"intro_dialog_channel": [] }, -"sched_events": [ ] +"sched_events": [] } terrain_navpolys = { "cocina_delante": { diff --git a/saves/save_003.tres b/saves/save_003.tres index 9db47b63..8c678761 100644 --- a/saves/save_003.tres +++ b/saves/save_003.tres @@ -1,9 +1,9 @@ -[gd_resource type="Resource" load_steps=2 format=2] +[gd_resource type="Resource" script_class="ESCSaveGame" load_steps=2 format=3 uid="uid://cwghlyn206jvh"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] +[ext_resource type="Script" uid="uid://blcoeovuyvld2" path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" id="1"] [resource] -script = ExtResource( 1 ) +script = ExtResource("1") escoria_version = "1.0.0" game_version = "0.1.0" name = "cocina encendida con lentejas" @@ -41,7 +41,7 @@ globals = { "turno_cocina_ingrediente_romero": false, "turno_cocina_libro_leido_count": 0 } -inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_mechero" ] +inventory = ["turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_mechero"] objects = { "_music": { "active": true, @@ -114,7 +114,7 @@ objects = { "cocina_patata": { "active": true, "custom_data": { -"count_textures": [ { +"count_textures": [{ "start": 1, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" }, { @@ -126,7 +126,7 @@ objects = { }, { "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" -} ], +}], "tooltips": { "action1": "Admirar la patata", "action2": "Cogerla" @@ -157,9 +157,8 @@ objects = { }, "player": { "active": true, -"custom_data": { -}, -"global_transform": Transform2D( 1.1498, 0, 0, 1.1498, 2546, 547 ), +"custom_data": {}, +"global_transform": Transform2D(1.1498, 0, 0, 1.1498, 2546, 547), "interactive": false, "last_deg": 71, "last_dir": 4, @@ -427,9 +426,9 @@ objects = { } events = { "events_queue": { -"_front": [ ] +"_front": [] }, -"sched_events": [ ] +"sched_events": [] } terrain_navpolys = { "cocina": { diff --git a/saves/save_004.tres b/saves/save_004.tres index 25799fa4..760ed64a 100644 --- a/saves/save_004.tres +++ b/saves/save_004.tres @@ -1,9 +1,9 @@ -[gd_resource type="Resource" load_steps=2 format=2] +[gd_resource type="Resource" script_class="ESCSaveGame" load_steps=2 format=3 uid="uid://c2erng3vxxfuo"] -[ext_resource path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" type="Script" id=1] +[ext_resource type="Script" uid="uid://blcoeovuyvld2" path="res://addons/escoria-core/game/core-scripts/save_data/esc_savegame.gd" id="1"] [resource] -script = ExtResource( 1 ) +script = ExtResource("1") escoria_version = "1.0.0" game_version = "0.1.0" name = "creditos" @@ -30,15 +30,15 @@ globals = { "cocina_intro_played": true, "intro_dialog2_playing": false, "new_game": true, +"turno_cocina_eneko_cata_ok": true, "turno_cocina_eneko_catando": false, "turno_cocina_ingrediente_ajo_en_lentejas": true, "turno_cocina_ingrediente_lentejas": true, "turno_cocina_ingrediente_patatas": true, "turno_cocina_ingrediente_romero": true, -"turno_cocina_eneko_cata_ok": true, "turno_cocina_libro_leido_count": 0 } -inventory = [ "turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_cuerno" ] +inventory = ["turno_cocina_frontal", "turno_cocina_libro_de_cocina", "turno_cocina_cuerno"] objects = { "_music": { "active": true, @@ -120,7 +120,7 @@ objects = { "action2": "cocina_delante_eneko_smoking_action2" } }, -"global_transform": Transform2D( 1.23314, 0, 0, 1.23314, 813, 440 ), +"global_transform": Transform2D(1.23314, 0, 0, 1.23314, 813, 440), "interactive": true, "last_deg": 271, "last_dir": 0, @@ -133,9 +133,8 @@ objects = { }, "player": { "active": true, -"custom_data": { -}, -"global_transform": Transform2D( 0.93549, 0, 0, 0.93549, 749, 521 ), +"custom_data": {}, +"global_transform": Transform2D(0.93549, 0, 0, 0.93549, 749, 521), "interactive": false, "last_deg": 161, "last_dir": 6, @@ -234,9 +233,9 @@ objects = { } events = { "events_queue": { -"_front": [ ] +"_front": [] }, -"sched_events": [ ] +"sched_events": [] } terrain_navpolys = { "cocina_delante": { diff --git a/scripts/item-template.tscn b/scripts/item-template.tscn index 4edffc20..18c5d3bd 100644 --- a/scripts/item-template.tscn +++ b/scripts/item-template.tscn @@ -1,19 +1,24 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=3 uid="uid://b2oe12ld0d5jc"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/items/inventory/assets/BASENAME.png" type="Texture2D" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[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="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5, 12.5 ) +[sub_resource type="Resource" id="Resource_rnd3g"] +metadata/__load_path__ = "res://gymkhana/items/inventory/assets/BASENAME.png" + +[sub_resource type="Resource" id="Resource_h4634"] +metadata/__load_path__ = "res://gymkhana/items/inventory/assets/BASENAME.png" + +[sub_resource type="RectangleShape2D" id="1"] +size = Vector2(45, 25) [node name="BASENAME" type="Area2D"] process_mode = 1 -script = ExtResource( 1 ) +script = ExtResource("1") global_id = "BASENAME" esc_script = "res://gymkhana/items/inventory/BASENAME.esc" -inventory_texture = ExtResource( 2 ) -dialog_color = Color( 1, 1, 1, 1 ) +inventory_texture = SubResource("Resource_rnd3g") +dialog_color = Color(1, 1, 1, 1) action1_text = "¿Que es esto?" action2_text = "Coger" action3_text = "Mirar" @@ -21,14 +26,14 @@ action4_text = "Usar" animations = null [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = SubResource("Resource_h4634") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( -1.5, -0.5 ) -shape = SubResource( 1 ) +position = Vector2(-1.5, -0.5) +shape = SubResource("1") [node name="ESCLocation" type="Marker2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +position = Vector2(-51, 69) +script = ExtResource("3")