diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn index 339c98e..c766c0f 100644 --- a/prefabs/UI/Inventory/Inventory.tscn +++ b/prefabs/UI/Inventory/Inventory.tscn @@ -16,7 +16,7 @@ layer = 90 [node name="DialogicToggle" type="Node2D" parent="."] scale = Vector2(0.7, 0.7) -[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_headerSlots")] +[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_slotsParent", "_slotsMover", "_headerSlots", "_slotSelect")] layout_mode = 3 anchors_preset = 8 anchor_left = 0.5 @@ -25,10 +25,12 @@ 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") -_headerSlots = [] +_slotsParent = NodePath("SlotsContainer/SlotsMover/Slots") +_slotsMover = NodePath("SlotsContainer/SlotsMover") +_headerSlots = [NodePath("SlotsContainer/SlotsMover/Slots/Slot"), NodePath("SlotsContainer/SlotsMover/Slots/Slot2"), NodePath("SlotsContainer/SlotsMover/Slots/Slot3"), NodePath("SlotsContainer/SlotsMover/Slots/Slot4"), NodePath("SlotsContainer/SlotsMover/Slots/Slot5"), NodePath("SlotsContainer/SlotsMover/Slots/Slot6"), NodePath("SlotsContainer/SlotsMover/Slots/Slot7"), NodePath("SlotsContainer/SlotsMover/Slots/Slot8")] +_slotSelect = NodePath("SlotsContainer/SlotsMover/SlotSelectContainer/Selector") [node name="SlotsContainer" type="Control" parent="Inventory"] layout_mode = 1 diff --git a/project.godot b/project.godot index 66020d1..2d0336d 100644 --- a/project.godot +++ b/project.godot @@ -26,8 +26,8 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk" Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd" InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" -QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs" Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" +QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs" [dialogic] @@ -164,11 +164,6 @@ interact={ "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":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) ] } -ui_inventory_journal_open_close={ -"deadzone": 0.5, -"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":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null) -] -} ui_inventory_open_close={ "deadzone": 0.5, "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":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null) @@ -199,6 +194,11 @@ ui_inventory_close={ "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) ] } +ui_inventory_journal_open_close={ +"deadzone": 0.5, +"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":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null) +] +} [internationalization] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 6724364..c21a792 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -2094,7 +2094,6 @@ position = Vector2(1.75458, 76) shape = SubResource("RectangleShape2D_2vojv") [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] -follow_viewport_enabled = false [node name="Inventory" parent="CanvasLayer" index="1"] anchors_preset = 7