Browse Source

Renaming ItemResource to DBItemResource

pull/12/head
Ryan Reed 1 month ago
parent
commit
3911710aad
11 changed files with 14 additions and 14 deletions
  1. +2
    -2
      autoloads/inventory_manager.gd
  2. +1
    -1
      resources/block_resource.gd
  3. +1
    -1
      resources/db_item_resource.gd
  4. +0
    -0
      resources/db_item_resource.gd.uid
  5. +1
    -1
      resources/inventory/player_inventory_empty.tres
  6. +1
    -1
      resources/inventory/player_inventory_testing.tres
  7. +1
    -1
      resources/inventory_resource.gd
  8. +1
    -1
      scenes/blocks/dropped_block.gd
  9. +4
    -4
      scenes/ui/inventory/inventory.gd
  10. +1
    -1
      scenes/ui/inventory/item_rect.gd
  11. +1
    -1
      scenes/ui/waila.gd

+ 2
- 2
autoloads/inventory_manager.gd View File

@ -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


+ 1
- 1
resources/block_resource.gd View File

@ -1,5 +1,5 @@
class_name BlockResource
extends ItemResource
extends DBItemResource
@export var material_texture: StandardMaterial3D = null

resources/item_resource.gd → resources/db_item_resource.gd View File

@ -1,4 +1,4 @@
class_name ItemResource
class_name DBItemResource
extends Resource

resources/item_resource.gd.uid → resources/db_item_resource.gd.uid View File


+ 1
- 1
resources/inventory/player_inventory_empty.tres View File

@ -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")


+ 1
- 1
resources/inventory/player_inventory_testing.tres View File

@ -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"]


+ 1
- 1
resources/inventory_resource.gd View File

@ -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

+ 1
- 1
scenes/blocks/dropped_block.gd View File

@ -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()

+ 4
- 4
scenes/ui/inventory/inventory.gd View File

@ -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:


+ 1
- 1
scenes/ui/inventory/item_rect.gd View File

@ -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


+ 1
- 1
scenes/ui/waila.gd View File

@ -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)


Loading…
Cancel
Save