From 3911710aadd71d7924ff266c5713ee73c922a8b8 Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sun, 23 Mar 2025 20:23:35 -0400 Subject: [PATCH] Renaming ItemResource to DBItemResource --- autoloads/inventory_manager.gd | 4 ++-- resources/block_resource.gd | 2 +- resources/{item_resource.gd => db_item_resource.gd} | 2 +- .../{item_resource.gd.uid => db_item_resource.gd.uid} | 0 resources/inventory/player_inventory_empty.tres | 2 +- resources/inventory/player_inventory_testing.tres | 2 +- resources/inventory_resource.gd | 2 +- scenes/blocks/dropped_block.gd | 2 +- scenes/ui/inventory/inventory.gd | 8 ++++---- scenes/ui/inventory/item_rect.gd | 2 +- scenes/ui/waila.gd | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename resources/{item_resource.gd => db_item_resource.gd} (89%) rename resources/{item_resource.gd.uid => db_item_resource.gd.uid} (100%) diff --git a/autoloads/inventory_manager.gd b/autoloads/inventory_manager.gd index 9548fab..950a0cd 100644 --- a/autoloads/inventory_manager.gd +++ b/autoloads/inventory_manager.gd @@ -4,8 +4,8 @@ signal next_quick_slot signal previous_quick_slot signal select_quick_slot(slot_index: int) signal quick_slot_item_changed(item_id: String) -signal item_picked_up(item: ItemResource) -signal item_dropped(item: ItemResource) +signal item_picked_up(item: DBItemResource) +signal item_dropped(item: DBItemResource) signal inventory_opened signal inventory_closed diff --git a/resources/block_resource.gd b/resources/block_resource.gd index 1a1d36c..2e907fb 100644 --- a/resources/block_resource.gd +++ b/resources/block_resource.gd @@ -1,5 +1,5 @@ class_name BlockResource -extends ItemResource +extends DBItemResource @export var material_texture: StandardMaterial3D = null diff --git a/resources/item_resource.gd b/resources/db_item_resource.gd similarity index 89% rename from resources/item_resource.gd rename to resources/db_item_resource.gd index a481462..86d5035 100644 --- a/resources/item_resource.gd +++ b/resources/db_item_resource.gd @@ -1,4 +1,4 @@ -class_name ItemResource +class_name DBItemResource extends Resource diff --git a/resources/item_resource.gd.uid b/resources/db_item_resource.gd.uid similarity index 100% rename from resources/item_resource.gd.uid rename to resources/db_item_resource.gd.uid diff --git a/resources/inventory/player_inventory_empty.tres b/resources/inventory/player_inventory_empty.tres index 36e5ed7..3c0026b 100644 --- a/resources/inventory/player_inventory_empty.tres +++ b/resources/inventory/player_inventory_empty.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="InventoryResource" load_steps=3 format=3 uid="uid://cnpw7y1csu774"] [ext_resource type="Script" uid="uid://becun6dj78v8d" path="res://resources/inventory_resource.gd" id="1_o2th4"] -[ext_resource type="Script" uid="uid://bdx4q355l5ugl" path="res://resources/item_resource.gd" id="1_udg6i"] +[ext_resource type="Script" uid="uid://bdx4q355l5ugl" path="res://resources/db_item_resource.gd" id="1_udg6i"] [resource] script = ExtResource("1_o2th4") diff --git a/resources/inventory/player_inventory_testing.tres b/resources/inventory/player_inventory_testing.tres index 041b1d2..b36ba8c 100644 --- a/resources/inventory/player_inventory_testing.tres +++ b/resources/inventory/player_inventory_testing.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="InventoryResource" load_steps=12 format=3 uid="uid://blfp6tiir282o"] [ext_resource type="Script" uid="uid://becun6dj78v8d" path="res://resources/inventory_resource.gd" id="1_4v6mg"] -[ext_resource type="Script" uid="uid://bdx4q355l5ugl" path="res://resources/item_resource.gd" id="1_gg8jx"] +[ext_resource type="Script" uid="uid://bdx4q355l5ugl" path="res://resources/db_item_resource.gd" id="1_gg8jx"] [ext_resource type="Material" uid="uid://uex0dq00xomt" path="res://assets/materials/dirt.tres" id="2_8w148"] [ext_resource type="Script" uid="uid://dwrmy4mx0mw18" path="res://resources/block_resource.gd" id="3_vgvac"] [ext_resource type="Material" uid="uid://cx7m27qa4ds4s" path="res://assets/materials/stone.tres" id="4_7yuhn"] diff --git a/resources/inventory_resource.gd b/resources/inventory_resource.gd index 4f7a6de..1d8712e 100644 --- a/resources/inventory_resource.gd +++ b/resources/inventory_resource.gd @@ -2,5 +2,5 @@ class_name InventoryResource extends Resource -@export var inventory: Array[ItemResource] = [] +@export var inventory: Array[DBItemResource] = [] @export var max_stack_size: int = 999 diff --git a/scenes/blocks/dropped_block.gd b/scenes/blocks/dropped_block.gd index a82a456..29ecfc4 100644 --- a/scenes/blocks/dropped_block.gd +++ b/scenes/blocks/dropped_block.gd @@ -24,7 +24,7 @@ func _on_pickup_area_body_entered(body: Node3D) -> void: # TODO: Update stack count dynamically var stack_count: int = 1 - var item: ItemResource = (DBItems.data[block.get_id()] as Resource).duplicate() + var item: DBItemResource = (DBItems.data[block.get_id()] as Resource).duplicate() item.amount = stack_count InventoryManager.item_picked_up.emit(item) queue_free() diff --git a/scenes/ui/inventory/inventory.gd b/scenes/ui/inventory/inventory.gd index 017079f..9b2de1d 100644 --- a/scenes/ui/inventory/inventory.gd +++ b/scenes/ui/inventory/inventory.gd @@ -14,11 +14,11 @@ func _input(event: InputEvent) -> void: func _ready() -> void: InventoryManager.item_picked_up.connect(add_item.bind()) InventoryManager.item_dropped.connect(subtract_item.bind()) - for item_resource: ItemResource in inventory_resource.inventory: + for item_resource: DBItemResource in inventory_resource.inventory: add_item(item_resource) -func add_item(item_resource: ItemResource, amount: int = 1) -> void: +func add_item(item_resource: DBItemResource, amount: int = 1) -> void: var item_rect: InventoryItemRect = find_item_rect(item_resource) if item_rect != null: if item_rect.item_resource.amount + item_resource.amount >= inventory_resource.max_stack_size: @@ -32,7 +32,7 @@ func add_item(item_resource: ItemResource, amount: int = 1) -> void: item_rect.item_resource = item_resource item_rect.update_rect() -func find_item_rect(item_resource: ItemResource) -> InventoryItemRect: +func find_item_rect(item_resource: DBItemResource) -> InventoryItemRect: var rect: InventoryItemRect = null for container: InventoryItemRect in grid_container.get_children(): @@ -42,7 +42,7 @@ func find_item_rect(item_resource: ItemResource) -> InventoryItemRect: return rect -func subtract_item(item_resource: ItemResource) -> void: +func subtract_item(item_resource: DBItemResource) -> void: var item_rect: InventoryItemRect = find_item_rect(item_resource) if item_rect != null: diff --git a/scenes/ui/inventory/item_rect.gd b/scenes/ui/inventory/item_rect.gd index f6d1199..be07ddc 100644 --- a/scenes/ui/inventory/item_rect.gd +++ b/scenes/ui/inventory/item_rect.gd @@ -3,7 +3,7 @@ extends Panel @export var amount_label: Label -@export var item_resource: ItemResource +@export var item_resource: DBItemResource @export var item_texture: TextureRect diff --git a/scenes/ui/waila.gd b/scenes/ui/waila.gd index cb9b19b..10d4d66 100644 --- a/scenes/ui/waila.gd +++ b/scenes/ui/waila.gd @@ -32,7 +32,7 @@ func hook_target(id: String) -> void: if not GameSettingsManager.settings.game_options.enable_waila: return if not id: return - var item: ItemResource = DBItems.data[id] + var item: DBItemResource = DBItems.data[id] name_label.text = item.name + " (" + id + ")" description_label.text = item.description position_label.text = str(_target.position)