diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn index 9990fe27..d6478ac1 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn @@ -41,12 +41,13 @@ theme = ExtResource( 9 ) [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"] anchor_right = 1.0 anchor_bottom = 1.0 +margin_top = 18.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/ui/HBoxContainer"] margin_right = 58.0 -margin_bottom = 101.0 +margin_bottom = 83.0 [node name="MenuButton" type="Button" parent="CanvasLayer/ui/HBoxContainer/VBoxContainer"] margin_right = 58.0 @@ -56,7 +57,7 @@ text = "Menu" [node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"] margin_left = 62.0 margin_right = 1280.0 -margin_bottom = 101.0 +margin_bottom = 83.0 size_flags_horizontal = 3 [node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )] @@ -83,7 +84,6 @@ bbcode_text = "[center][color=#000000][/color][/center]" fit_content_height = true offset_from_cursor = Vector2( -5, -50 ) - [node name="tooltip2" parent="tooltip_layer" instance=ExtResource( 10 )] mouse_filter = 2 bbcode_text = "[center][color=#000000][/color][/center]" diff --git a/gymkhana/rooms/interior_cocina/assets/grey.png b/gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png similarity index 100% rename from gymkhana/rooms/interior_cocina/assets/grey.png rename to gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index 8869c906..e4547da5 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_bg.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/frame.png" type="Texture" id=5] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png" type="Texture" id=6] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png" type="Texture" id=11] [node name="inventory_ui" type="Control"] visible = false @@ -48,6 +49,15 @@ stretch_mode = 1 [node name="FloatingInventory" type="CanvasLayer" parent="."] +[node name="grey" type="TextureRect" parent="FloatingInventory"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = 577.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +texture = ExtResource( 11 ) +stretch_mode = 1 + [node name="panel" type="TextureRect" parent="FloatingInventory"] anchor_left = 1.0 anchor_top = 1.0 diff --git a/project.godot b/project.godot index d71dc266..20218d38 100644 --- a/project.godot +++ b/project.godot @@ -204,7 +204,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd" }, { -"base": "Node", +"base": "StateMachine", "class": "ESCDialogPlayer", "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" @@ -344,7 +344,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/esc_project_settings_manager.gd" }, { -"base": "Node", +"base": "Reference", "class": "ESCResourceCache", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"