wip improving inventory layout

dialog/NPC_narrative.tres

@@ -87,4 +87,4 @@ layer_info = {
 }
 base_overrides = {}
 layers = Array[ExtResource("1_0jwhi")]([])
-metadata/_latest_layer = ""
+metadata/_latest_layer = "13"

prefabs/UI/Inventory/Inventory.tscn

@@ -20,22 +20,28 @@ itemToToggle = NodePath("../Inventory")
 
 [node name="Inventory" type="Control" parent="."]
 layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
 grow_horizontal = 2
 grow_vertical = 2
 scale = Vector2(0.7, 0.7)
+size_flags_vertical = 8
 script = ExtResource("1_6wusm")
-metadata/_edit_use_anchors_ = true
+_inventoryOpenedOffset = -700.0
 
 [node name="SlotsContainer" type="Control" parent="Inventory"]
 custom_minimum_size = Vector2(500, 0)
 layout_mode = 1
-anchors_preset = 13
+anchors_preset = 8
 anchor_left = 0.5
+anchor_top = 0.5
 anchor_right = 0.5
-anchor_bottom = 1.0
+anchor_bottom = 0.5
+offset_left = -250.0
+offset_right = 250.0
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -58,9 +64,10 @@ grow_vertical = 0
 z_index = 10
 custom_minimum_size = Vector2(100, 100)
 layout_mode = 0
-offset_left = 1.0
-offset_right = 101.0
-offset_bottom = 100.0
+offset_left = -45.7143
+offset_top = -49.2857
+offset_right = 54.2857
+offset_bottom = 50.7143
 texture = ExtResource("4_tiss4")
 expand_mode = 1
 
@@ -176,53 +183,75 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 496.0
-offset_bottom = 496.0
+offset_left = -48.5714
+offset_top = 501.0
+offset_right = -48.5714
+offset_bottom = 501.0
 grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Slot" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
+offset_left = 2.85714
+offset_top = -54.2857
+offset_right = 102.857
+offset_bottom = 45.7143
 
 [node name="Slot2" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 100.0
-offset_right = 200.0
+offset_left = 102.857
+offset_top = -54.2857
+offset_right = 202.857
+offset_bottom = 45.7143
 
 [node name="Slot3" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 201.0
-offset_right = 301.0
+offset_left = 203.857
+offset_top = -54.2857
+offset_right = 303.857
+offset_bottom = 45.7143
 
 [node name="Slot4" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 301.0
-offset_right = 401.0
+offset_left = 303.857
+offset_top = -54.2857
+offset_right = 403.857
+offset_bottom = 45.7143
 
 [node name="Slot5" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 401.0
-offset_right = 501.0
+offset_left = 403.857
+offset_top = -54.2857
+offset_right = 503.857
+offset_bottom = 45.7143
 
 [node name="Slot6" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 501.0
-offset_right = 601.0
+offset_left = 503.857
+offset_top = -54.2857
+offset_right = 603.857
+offset_bottom = 45.7143
 
 [node name="Slot7" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 601.0
-offset_right = 701.0
+offset_left = 603.857
+offset_top = -54.2857
+offset_right = 703.857
+offset_bottom = 45.7143
 
 [node name="Slot8" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 702.0
-offset_right = 802.0
+offset_left = 704.857
+offset_top = -54.2857
+offset_right = 804.857
+offset_bottom = 45.7143
 
 [node name="Slot9" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1
-offset_left = 802.0
-offset_right = 902.0
+offset_left = 804.857
+offset_top = -54.2857
+offset_right = 904.857
+offset_bottom = 45.7143
 
 [node name="Slot10" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
 layout_mode = 1

project.godot

@@ -183,6 +183,11 @@ item={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
+ui_inventory_close={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
 
 [internationalization]
 

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=70 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=71 format=3 uid="uid://gigb28qk8t12"]
 
 [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
+[ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/IndoorTest2.tscn" id="2_taxvr"]
 [ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"]
 [ext_resource type="Texture2D" uid="uid://o6vnf7n7qp8o" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud6.png" id="4_xh22q"]
 [ext_resource type="Texture2D" uid="uid://cc0o84q5u437k" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud7.png" id="5_k3wpj"]
@@ -164,6 +165,7 @@ stream_1/stream = ExtResource("40_ceriq")
 
 [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
 script = ExtResource("34_e5b7x")
+_sceneToLoad = ExtResource("2_taxvr")
 
 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
 
@@ -924,7 +926,7 @@ position = Vector2(-252.56, 231.32)
 polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.123, -104.329, -55.2797, -154.107, -73.5347, -160.107, -380.38, -175.44, -400.783, -63.44, -512.461, 97.8934, -541.991, 261.671, -599.172, 374.782, -526.421, 502.338, -526.421, 637.893, -396.488, 598.56, -360.783, 596.338, -58.2327, 528.782, -58.2327, 501.449, 45.9283)
 
 [node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")]
-position = Vector2(5839, 2142)
+position = Vector2(5839, 2349)
 scale = Vector2(2.425, 2.425)
 
 [node name="bush" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
@@ -987,16 +989,15 @@ follow_viewport_enabled = false
 
 [node name="Inventory" parent="CanvasLayer" index="1"]
 anchors_preset = 7
-anchor_left = 0.5
 anchor_top = 1.0
-anchor_right = 0.5
-offset_left = -172.8
-offset_top = -194.4
-offset_right = 172.8
+anchor_bottom = 1.0
+offset_left = -126.0
+offset_top = -48.0
+offset_right = 221.82
+offset_bottom = 146.4
 grow_vertical = 0
-size_flags_horizontal = 4
-size_flags_vertical = 8
-_inventoryOpenedOffset = -600.0
+size_flags_horizontal = 6
+size_flags_vertical = 10
 
 [node name="Audio" type="Node" parent="."]
 

scripts/CSharp/Common/Inventory/InventoryUi.cs

@@ -143,6 +143,12 @@ public partial class InventoryUi : Control
         {
             InputInventoryOpenClose();
         }
+        
+        if (Input.IsActionJustPressed("ui_inventory_close"))
+        {
+            if(_inventoryExtended)
+                InputInventoryOpenClose();
+        }
 
         if (Input.IsActionJustPressed("ui_inventory_disadvance"))
         {