Skip to content

Commit fd56d06

Browse files
Refactor inventory tutorial scripts and update scene configurations
1 parent 48e30fd commit fd56d06

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed

addons/inventory-system-demos/tests/grid_inventory_test.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,4 +306,4 @@ func test_has_space_for() -> void:
306306
assert(inventory_8x5.has_space_for("workbench"))
307307

308308
inventory_8x1.free()
309-
inventory_8x5.free()
309+
inventory_8x5.free()
Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
extends Node3D
22

33
@onready var inventory : Inventory = $Inventory
4-
@onready var other_inventory: Inventory = $OtherInventory
5-
@onready var simple_inventory_ui: SimpleInventoryUI = $HBoxContainer/SimpleInventoryUI
6-
@onready var other_simple_inventory_ui: SimpleInventoryUI = $HBoxContainer/OtherSimpleInventoryUI
74

85
@export var item_id : String
96

@@ -23,28 +20,11 @@ func _process(delta):
2320
inventory.remove(item_id, 1)
2421
print_inventory()
2522

23+
2624
func print_inventory():
2725
print("Inventory Items:")
2826
for item in inventory.stacks:
2927
if item.item_id != "":
3028
print(item.item_id," x ", item.amount)
3129
else:
3230
print("Empty")
33-
34-
35-
func _on_button_left_button_down() -> void:
36-
var selected_items: Array[int] = simple_inventory_ui.get_selected_inventory_items()
37-
if selected_items.is_empty():
38-
return
39-
40-
for selected_item_index in selected_items:
41-
inventory.transfer(selected_item_index, other_inventory)
42-
43-
44-
func _on_button_right_button_down() -> void:
45-
var selected_items: Array[int] = other_simple_inventory_ui.get_selected_inventory_items()
46-
if selected_items.is_empty():
47-
return
48-
49-
for selected_item_index in selected_items:
50-
other_inventory.transfer(selected_item_index, inventory)
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://csvypwppcls1l"]
1+
[gd_scene load_steps=4 format=3 uid="uid://csvypwppcls1l"]
22

33
[ext_resource type="Script" uid="uid://kic1vda81phq" path="res://addons/inventory-system-demos/tutorials/tutorial_01_inventory/inventory_tutorial.gd" id="1_nssfi"]
4+
[ext_resource type="Script" uid="uid://bo10v3ducgixv" path="res://addons/inventory-system-demos/base/setup_keys.gd" id="3_y7yps"]
45
[ext_resource type="InventoryDatabase" uid="uid://de5qy8ycey7yn" path="res://addons/inventory-system-demos/database/database.tres" id="4_okmux"]
56

67
[node name="InventoryTutorial" type="Node3D"]
@@ -9,3 +10,6 @@ item_id = "wood"
910

1011
[node name="Inventory" type="Inventory" parent="."]
1112
database = ExtResource("4_okmux")
13+
14+
[node name="Setup Keys" type="Node" parent="."]
15+
script = ExtResource("3_y7yps")

addons/inventory-system-demos/tutorials/tutorial_03_transfer_inventories/inventory_tutorial.tscn

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://bsbba7hy8e501"]
1+
[gd_scene load_steps=5 format=3 uid="uid://bsbba7hy8e501"]
22

33
[ext_resource type="Script" uid="uid://xcmuo66eae7n" path="res://addons/inventory-system-demos/tutorials/tutorial_03_transfer_inventories/inventory_tutorial.gd" id="1_628rb"]
44
[ext_resource type="InventoryDatabase" uid="uid://de5qy8ycey7yn" path="res://addons/inventory-system-demos/database/database.tres" id="2_umqil"]
55
[ext_resource type="Script" uid="uid://du4odj2yajra2" path="res://addons/inventory-system-demos/simple-transfer/simple_inventory_ui.gd" id="3_xif71"]
6+
[ext_resource type="Script" uid="uid://bo10v3ducgixv" path="res://addons/inventory-system-demos/base/setup_keys.gd" id="4_umqil"]
67

78
[node name="InventoryTutorial" type="Node3D"]
89
script = ExtResource("1_628rb")
@@ -43,5 +44,8 @@ script = ExtResource("3_xif71")
4344
inventory = NodePath("../../OtherInventory")
4445
metadata/_custom_type_script = "uid://du4odj2yajra2"
4546

47+
[node name="Setup Keys" type="Node" parent="."]
48+
script = ExtResource("4_umqil")
49+
4650
[connection signal="button_down" from="HBoxContainer/ButtonLeft" to="." method="_on_button_left_button_down"]
4751
[connection signal="button_down" from="HBoxContainer/ButtonRight" to="." method="_on_button_right_button_down"]

0 commit comments

Comments
 (0)