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 51209829..c9823d7b 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,6 +1,5 @@ -[gd_scene load_steps=3 format=3 uid="uid://dyi4lxm20wgne"] +[gd_scene load_steps=2 format=3 uid="uid://dyi4lxm20wgne"] -[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"] diff --git a/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn index 827fc26d..f3d5c77d 100644 --- a/addons/escoria-ui-return-monkey-island/game.tscn +++ b/addons/escoria-ui-return-monkey-island/game.tscn @@ -5,17 +5,17 @@ [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" uid="uid://lkc4isk3g0rj" path="res://addons/escoria-ui-return-monkey-island/game.gd" id="5"] -[ext_resource type="Texture2D" uid="uid://ce2rx8nm1s6gh" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"] +[ext_resource type="Texture2D" uid="uid://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/menu.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="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="9"] +[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://dghklsdy5nmcg" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"] +[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://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://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") @@ -72,9 +72,9 @@ grow_vertical = 2 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui/menu_button"] layout_mode = 0 offset_left = -135.0 -offset_top = 6.0 +offset_top = 32.0 offset_right = 21.0 -offset_bottom = 76.0 +offset_bottom = 102.0 alignment = 1 [node name="MusicButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"] diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 59a5d251..126b434b 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=3 uid="uid://dowbdjo7ka0sq"] +[gd_scene load_steps=34 format=3 uid="uid://dowbdjo7ka0sq"] [ext_resource type="Script" uid="uid://c7fcpp72w3dnj" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"] [ext_resource type="PackedScene" uid="uid://cjmsexhyhi4vs" path="res://gymkhana/characters/oier/oier.tscn" id="2"] @@ -11,21 +11,23 @@ [ext_resource type="Texture2D" uid="uid://bna12h746ucar" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"] [ext_resource type="PackedScene" uid="uid://cwlq5pqwktbul" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"] [ext_resource type="PackedScene" uid="uid://cpeqaymxabewi" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"] -[ext_resource type="Texture2D" uid="uid://bhomm5rmi8fnr" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="11_wxxpa"] +[ext_resource type="Texture2D" uid="uid://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="11_fji2i"] [ext_resource type="PackedScene" uid="uid://d1ust40cvfjtw" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"] [ext_resource type="Texture2D" uid="uid://djkmw4bj8siok" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"] +[ext_resource type="Texture2D" uid="uid://nktfki1vvj7h" path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" id="13_wnoqk"] [ext_resource type="PackedScene" uid="uid://bnf0ylqtnajms" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"] [ext_resource type="Texture2D" uid="uid://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://7hcp3g8e17po" path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" id="16_8heqv"] [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" 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="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="21_kafnq"] [ext_resource type="PackedScene" uid="uid://bthshk88n0ida" 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://d33c6oen4di3s" path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" id="23_fji2i"] +[ext_resource type="Texture2D" uid="uid://dhh7ya2ab1eax" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" id="23_td4ig"] [ext_resource type="Texture2D" uid="uid://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="24"] [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"] @@ -145,6 +147,7 @@ global_id = "puerta_delante_start" position = Vector2(2505, 160) scale = Vector2(0.880435, 0.88735) combine_when_selected_action_is_in = PackedStringArray("action4") +inventory_texture_hovered = ExtResource("11_fji2i") [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"] position = Vector2(15.9014, -11.2695) @@ -158,6 +161,7 @@ script = ExtResource("5") position = Vector2(1505, 160) scale = Vector2(0.880435, 0.88735) combine_when_selected_action_is_in = PackedStringArray("action4") +inventory_texture_hovered = ExtResource("13_wnoqk") [node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"] position = Vector2(169.235, 210.74) @@ -173,6 +177,7 @@ scale = Vector2(0.880435, 0.88735) global_id = "cocina_pan" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/pan.esc" combine_when_selected_action_is_in = PackedStringArray() +inventory_texture_hovered = ExtResource("13_wnoqk") custom_data = { "tooltips": { "action1": "tooltip_common_look", @@ -355,6 +360,7 @@ script = ExtResource("5") position = Vector2(2547, 244) scale = Vector2(1.06318, 1.06318) combine_when_selected_action_is_in = PackedStringArray() +inventory_texture_hovered = ExtResource("16_8heqv") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"] position = Vector2(-16.9304, 145.789) @@ -405,6 +411,7 @@ visible = false position = Vector2(1281, 491) scale = Vector2(1.06318, 1.06318) combine_when_selected_action_is_in = PackedStringArray("action4") +inventory_texture_hovered = ExtResource("23_td4ig") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"] position = Vector2(-160.838, 201.283) diff --git a/project.godot b/project.godot index 0e021d2d..a8cfe58e 100644 --- a/project.godot +++ b/project.godot @@ -32,8 +32,8 @@ gymkhana="*res://addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd" [display] window/size/viewport_width=1280 -window/size/viewport_height=750 -window/stretch/mode="2d" +window/size/viewport_height=720 +window/stretch/mode="canvas_items" [editor]